rev 11019 - in branches/kde4/packages: kdebase-runtime/debian kdegraphics/debian/patches kdelibs/debian kdepimlibs/debian

Modestas Vainius modax-guest at alioth.debian.org
Fri Jun 13 21:04:17 UTC 2008 

Author: modax-guest
Date: 2008-06-13 21:04:16 +0000 (Fri, 13 Jun 2008)
New Revision: 11019

Modified:
   branches/kde4/packages/kdebase-runtime/debian/changelog
   branches/kde4/packages/kdebase-runtime/debian/rules
   branches/kde4/packages/kdegraphics/debian/patches/97_fix_target_link_libraries.diff
   branches/kde4/packages/kdelibs/debian/rules
   branches/kde4/packages/kdepimlibs/debian/changelog
   branches/kde4/packages/kdepimlibs/debian/control
   branches/kde4/packages/kdepimlibs/debian/rules
Log:
Exclude phonon metapackage and some other changes

Modified: branches/kde4/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/changelog	2008-06-13 20:19:16 UTC (rev 11018)
+++ branches/kde4/packages/kdebase-runtime/debian/changelog	2008-06-13 21:04:16 UTC (rev 11019)
@@ -11,6 +11,7 @@
     implied via kdelibs5-dev dependency.
   * Update 97_fix_target_link_libraries.diff.
   * Add myself to Uploaders.
+  * Exclude dependecy on phonon metapackage.
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
@@ -19,8 +20,9 @@
   +++ Changes by Pino Toscano:
 
   * Split the Xine backend of Phonon in an own phonon-backend-xine.
+  * Install phonon-backend-xine by default.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 13 Jun 2008 17:34:18 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 14 Jun 2008 00:01:34 +0300
 
 kdebase-runtime (4:4.0.80-2) experimental; urgency=low
 

Modified: branches/kde4/packages/kdebase-runtime/debian/rules
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/rules	2008-06-13 20:19:16 UTC (rev 11018)
+++ branches/kde4/packages/kdebase-runtime/debian/rules	2008-06-13 21:04:16 UTC (rev 11019)
@@ -3,5 +3,8 @@
 # don'tuse the debugging symbols from kdebase-runtime-kde4. othwerwise we have a conflict with kdebase-dbg from KDE 3
 DEB_DBG_PACKAGE_kdebase-runtime := kdebase-runtime-dbg
 
+# exclude dependency on phonon metapackage. KDE4 does its own phonon setup
+DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xphonon
+
 include debian/cdbs/kde.mk
 

Modified: branches/kde4/packages/kdegraphics/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdegraphics/debian/patches/97_fix_target_link_libraries.diff	2008-06-13 20:19:16 UTC (rev 11018)
+++ branches/kde4/packages/kdegraphics/debian/patches/97_fix_target_link_libraries.diff	2008-06-13 21:04:16 UTC (rev 11019)
@@ -16,7 +16,7 @@
  ENDIF(APPLE)
  
 -target_link_libraries(okularcore  ${OKULAR_IOKIT} ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBRARY} ${KDE4_KJSAPI_LIBRARY} ${MATH_LIB} ${KDE4_THREADWEAVER_LIBRARY} )
-+target_link_libraries(okularcore  ${OKULAR_IOKIT} ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBRARY} ${KDE4_KJSAPI_LIBRARY} ${MATH_LIB} ${KDE4_THREADWEAVER_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} )
++target_link_libraries(okularcore  ${OKULAR_IOKIT} ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBRARY} ${KDE4_KJSAPI_LIBRARY} ${MATH_LIB} ${KDE4_THREADWEAVER_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTNETWORK_LIBRARY} )
  
  set_target_properties(okularcore PROPERTIES VERSION 1.1.0 SOVERSION 1 )
  

Modified: branches/kde4/packages/kdelibs/debian/rules
===================================================================
--- branches/kde4/packages/kdelibs/debian/rules	2008-06-13 20:19:16 UTC (rev 11018)
+++ branches/kde4/packages/kdelibs/debian/rules	2008-06-13 21:04:16 UTC (rev 11019)
@@ -12,7 +12,7 @@
 #bump version for every new upstream version!
 DEB_DH_MAKESHLIBS_ARGS_kdelibs5 := -V'kdelibs5 (>= $(UPSTREAMVERSION)), $(RUNTIME_DEPS)'
 
-# remove the dependency on kdebase-runtime
-DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xkdebase-runtime
+# remove dependencies on kdebase-runtime and phonon (the metapackage)
+DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xkdebase-runtime -xphonon
 
 include debian/cdbs/kde.mk

Modified: branches/kde4/packages/kdepimlibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/changelog	2008-06-13 20:19:16 UTC (rev 11018)
+++ branches/kde4/packages/kdepimlibs/debian/changelog	2008-06-13 21:04:16 UTC (rev 11019)
@@ -1,4 +1,4 @@
-kdepimlibs (4:4.0.81+svn818565-1~pre1) UNRELEASED; urgency=low
+kdepimlibs (4:4.0.82+svn818565-1~pre1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
   * Update install files:
@@ -7,11 +7,12 @@
 
   +++ Changes by Modestas Vainius:
 
-  * Bump kdelibs5-dev build dependency to 4.0.81, bump akonadi build
+  * Bump kdelibs5-dev build dependency to 4.0.82, bump akonadi build
     dependency to 0.81.0 (Closes: #483114). Bump shlibs.
   * Refresh 97_fix_target_link_libraries.diff.
+  * Add myself to Uploaders.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 09 Jun 2008 15:51:42 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 10 Jun 2008 21:14:00 +0300
 
 kdepimlibs (4:4.0.80-1) experimental; urgency=low
 

Modified: branches/kde4/packages/kdepimlibs/debian/control
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/control	2008-06-13 20:19:16 UTC (rev 11018)
+++ branches/kde4/packages/kdepimlibs/debian/control	2008-06-13 21:04:16 UTC (rev 11019)
@@ -2,8 +2,9 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.4.5), kdelibs5-dev (>= 4:4.0.81),
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
+ Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.4.5), kdelibs5-dev (>= 4:4.0.82),
  libboost-dev, libgpgme11-dev, libldap2-dev, libsasl2-dev, libakonadi-dev (>= 0.81.0)
 Standards-Version: 3.7.3
 Homepage: http://pim.kde.org/

Modified: branches/kde4/packages/kdepimlibs/debian/rules
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/rules	2008-06-13 20:19:16 UTC (rev 11018)
+++ branches/kde4/packages/kdepimlibs/debian/rules	2008-06-13 21:04:16 UTC (rev 11019)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-UPSTREAMVERSION := 4:4.0.81
+UPSTREAMVERSION := 4:4.0.82
 
 DEB_CMAKE_EXTRA_FLAGS += -DKDE4_ENABLE_EXPERIMENTAL_LIB_EXPORT=on

More information about the pkg-kde-commits mailing list