[Pkg-kde-commits] rev 705 - in branches/kde-3.4.0: . packages/kdegraphics/debian

Christopher Martin chrsmrtn-guest@costa.debian.org
Sat, 05 Mar 2005 23:48:17 +0100


Author: chrsmrtn-guest
Date: 2005-03-05 23:48:16 +0100 (Sat, 05 Mar 2005)
New Revision: 705

Modified:
   branches/kde-3.4.0/TODO
   branches/kde-3.4.0/packages/kdegraphics/debian/rules
Log:
Update kdegraphics shlibs generation, giving fine-grained
control.

Also add a few missing items to the TODO.


Modified: branches/kde-3.4.0/TODO
===================================================================
--- branches/kde-3.4.0/TODO	2005-03-05 22:30:13 UTC (rev 704)
+++ branches/kde-3.4.0/TODO	2005-03-05 22:48:16 UTC (rev 705)
@@ -13,7 +13,7 @@
 					  need to be bumped
   + consistenly use frob's script to detect missing soname changes?
 
-======================================
+========================================
 
 arts:
 
@@ -24,6 +24,14 @@
 
 ========================================
 
+kdebase:
+
+  - kdm needs work on smooth upgrades from 3.3.x.
+    Xservers should be removed only if is untouched by the user,
+    and they opted to install the new kdmrc (ConfigVersion=2.3).
+
+========================================
+
 kdelibs:
 
   - not merged changes from Christopher
@@ -45,6 +53,13 @@
 
 =========================================
 
+kdegames:
+
+  - patching of .desktop files to use absolute paths
+    no longer necessary.
+
+=========================================
+
 kdegraphics:
 
   - uhm, libkscan-dev has lost all its .h files (the upstream cvs commit
@@ -61,5 +76,3 @@
 
   - and this (but libphotobook has no soname):
     E: kview: shlib-missing-in-control-file libphotobook.so usr/lib/libphotobook.so
-
-  - I haven't put any dh_makeshlibs -V argument

Modified: branches/kde-3.4.0/packages/kdegraphics/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/rules	2005-03-05 22:30:13 UTC (rev 704)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/rules	2005-03-05 22:48:16 UTC (rev 705)
@@ -8,15 +8,10 @@
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
 
-# shlibs_ver=4:3.3.99
-# DEB_DH_MAKESHLIBS_ARGS_kdelibs4 := -V'kdelibs4 (>= $(shlibs_ver))'
-
+shlibs_ver=4:3.4.0
 PACKAGES_WITH_LIBS := kghostview kmrml kpovmodeler ksvg \
 			kuickshow kview kviewshell libkscan1
 
 DEB_SHLIBDEPS_INCLUDE := $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
 
-$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V))
-
-# Overrides for DEB_DH_MAKESHLIBS_ARGS_foo can go here
-# shlibs_ver=4:3.3.99
+$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))