← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kdenetwork/oneiric-proposed

« back to all changes in this revision

Viewing changes to kopete/protocols/skype/skypebuttons/CMakeLists.txt

  • Committer: Package Import Robot
  • Author(s): Romain Perier, Romain Perier, Philip Muškovac, Tarun Kumar Mall, Jonathan Thomas, Felix Geyer
  • Date: 2011-06-02 22:31:33 UTC
  • mfrom: (0.1.17 sid)
  • Revision ID: package-import@ubuntu.com-20110602223133-4yn8hax58hzwweu1
Tags: 4:4.6.3-1ubuntu1
[ Romain Perier ]
* Merge with Debian unstable, remaining changes:
  - debian/control:
    - Build against libboost1.46-dev
    - Build against libexpat1-dev instead of libexpat-dev
    - Drop from build-deps: libmediastreamer-dev, libortp-dev (in universe)
    - kopete recommends kopete-message-indicator
  - debian/rules:
    - chown kppp to root:dialout instead of root:dip
  - debian/kopete.install: don't add usr/bin/googletalk-call

[ Philip Muškovac ]
* Update Vcs links as the branch is owned by kubuntu-packagers now

[ Tarun Kumar Mall ]
* Removed patch kubuntu_08_kget_metalinker.diff, applied upstream

[ Jonathan Thomas ]
* Update kubuntu_05_samba_sharing.diff to use qapt-batch to install
  samba, now that it has replaced PackageKit in Kubuntu.
* Make kdenetwork-filesharing recommend qapt-batch

[ Felix Geyer ]
* Drop kubuntu_07_kopete_libjasper_optional.diff, not needed anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
kopete/protocols/skype/skypebuttons/CMakeLists.txt
2
2
 
3
3
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default" )
4
4
 
5
 
string( REGEX MATCHALL ^$ENV{HOME}.*$ IS_HOME ${CMAKE_INSTALL_PREFIX} )
 
5
string( LENGTH "$ENV{HOME}" LENGTH_OF_HOME )
 
6
if( LENGTH_OF_HOME GREATER 0 )
 
7
        string( REGEX MATCHALL ^$ENV{HOME}.*$ IS_HOME ${CMAKE_INSTALL_PREFIX} )
 
8
else( LENGTH_OF_HOME GREATER 0 )
 
9
        set( IS_HOME FALSE )
 
10
endif( LENGTH_OF_HOME GREATER 0 )
6
11
string( COMPARE EQUAL /usr ${CMAKE_INSTALL_PREFIX} IS_USR )
7
12
string( COMPARE EQUAL /usr/local ${CMAKE_INSTALL_PREFIX} IS_LOCAL )
8
13