rev 9332 - branches/kde4/packages/kdelibs/debian

Armin Berres trigger-guest at alioth.debian.org
Wed Feb 6 22:31:00 UTC 2008


Author: trigger-guest
Date: 2008-02-06 22:31:00 +0000 (Wed, 06 Feb 2008)
New Revision: 9332

Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/control
   branches/kde4/packages/kdelibs/debian/rules
Log:
+  * Don't bump shlibs version automatically on every upload. Bumping on new
+    upstream versions is enough now that the libs are stable.
+  * Add strict dependency of kdelibs-bin on kdelibs5 and use a more obvious
+    way to remove the dependency on kdebase-runtime. shlibs.local is no more
+    needed now.

Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-02-06 21:56:31 UTC (rev 9331)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-02-06 22:31:00 UTC (rev 9332)
@@ -1,8 +1,13 @@
 kde4libs (4:4.0.1-2) UNRELEASED; urgency=low
 
+  * Don't bump shlibs version automatically on every upload. Bumping on new
+    upstream versions is enough now that the libs are stable.
   * Add versioned shlibs to libphonon4.
   * Remove kde-icons-oxygen and kdebase-runtime-data from the shlibs file of
     kdelibs5. kdebase-runtime depends on them anyway.
+  * Add strict dependency of kdelibs-bin on kdelibs5 and use a more obvious
+    way to remove the dependency on kdebase-runtime. shlibs.local is no more
+    needed now.
 
  -- Armin Berres <trigger+debian at space-based.de>  Tue, 05 Feb 2008 15:14:30 +0100
 

Modified: branches/kde4/packages/kdelibs/debian/control
===================================================================
--- branches/kde4/packages/kdelibs/debian/control	2008-02-06 21:56:31 UTC (rev 9331)
+++ branches/kde4/packages/kdelibs/debian/control	2008-02-06 22:31:00 UTC (rev 9332)
@@ -64,7 +64,7 @@
 
 Package: kdelibs-bin
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, kdelibs5 (= ${binary:Version})
 Conflicts: kjscmd
 Description: executables for all KDE 4 core applications
  This package contains common executables used by all KDE 4 applications.

Modified: branches/kde4/packages/kdelibs/debian/rules
===================================================================
--- branches/kde4/packages/kdelibs/debian/rules	2008-02-06 21:56:31 UTC (rev 9331)
+++ branches/kde4/packages/kdelibs/debian/rules	2008-02-06 22:31:00 UTC (rev 9332)
@@ -3,20 +3,18 @@
 THIS_SHOULD_GO_TO_UNSTABLE := 1
 
 RUNTIME_DEPS := kdebase-runtime
-CURRENTVERSION := $(shell head -1 debian/changelog  | sed 's/[^(]*(\([^)]*\)).*/\1/')
+UPSTREAMVERSION := 4:4.0.1-1
 
 DEB_DBG_PACKAGE_kdelibs5 := kdelibs5-dbg
 DEB_DBG_PACKAGE_kdelibs-bin := kdelibs5-dbg
 DEB_DBG_PACKAGE_libphonon4 := kdelibs5-dbg
 
-#In general we shouldn't bump on each upload, but in the beta cycles,
-#it is probably good. Else on upstream versions it is probably a good thing.
-DEB_DH_MAKESHLIBS_ARGS_kdelibs5 := -V'kdelibs5 (>= $(CURRENTVERSION)), $(RUNTIME_DEPS)'  
-DEB_DH_MAKESHLIBS_ARGS_libphonon4 := -V'libphonon4 (>= $(CURRENTVERSION))'
+#bump version for every new upstream version!
+DEB_DH_MAKESHLIBS_ARGS_kdelibs5 := -V'kdelibs5 (>= $(UPSTREAMVERSION)), $(RUNTIME_DEPS)'
+DEB_DH_MAKESHLIBS_ARGS_libphonon4 := -V'libphonon4 (>= $(UPSTREAMVERSION))'
 
+# remove the dependency on kdebase-runtime
+DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xkdebase-runtime
+
 include debian/cdbs/kde.mk
 
-# Generate shlibs local files
-common-binary-fixup-arch :: 
-	sed 's/>=[^)]*/= $(CURRENTVERSION)/;s/, $(RUNTIME_DEPS)//' debian/kdelibs5/DEBIAN/shlibs > debian/shlibs.local ;\
-




More information about the pkg-kde-commits mailing list