[Pkg-kde-commits] rev 1169 - in branches/kde-3.4.0/packages: arts/debian kdeaccessibility/debian kdebase/debian kdegraphics/debian kdelibs/debian kdemultimedia/debian kdenetwork/debian kdeutils/debian kdewebdev/debian

Christopher Martin chrsmrtn-guest@costa.debian.org
Tue, 31 May 2005 16:41:57 +0000


Author: chrsmrtn-guest
Date: 2005-05-31 16:41:56 +0000 (Tue, 31 May 2005)
New Revision: 1169

Modified:
   branches/kde-3.4.0/packages/arts/debian/rules
   branches/kde-3.4.0/packages/kdeaccessibility/debian/rules
   branches/kde-3.4.0/packages/kdebase/debian/rules
   branches/kde-3.4.0/packages/kdegraphics/debian/rules
   branches/kde-3.4.0/packages/kdelibs/debian/rules
   branches/kde-3.4.0/packages/kdemultimedia/debian/rules
   branches/kde-3.4.0/packages/kdenetwork/debian/rules
   branches/kde-3.4.0/packages/kdeutils/debian/rules
   branches/kde-3.4.0/packages/kdewebdev/debian/rules
Log:
Update debian/rules for individual package shlibs. For now, we
start with 3.4.1-1, but in future we'll only bump when needed
(pending a good, reliable system to determine these things).


Modified: branches/kde-3.4.0/packages/arts/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/arts/debian/rules	2005-05-31 15:55:38 UTC (rev 1168)
+++ branches/kde-3.4.0/packages/arts/debian/rules	2005-05-31 16:41:56 UTC (rev 1169)
@@ -9,10 +9,8 @@
 
 PACKAGES_WITH_LIBS := libarts1 libartsc0
 
-# package	last neq.	first eq.
-# ----------------------------------------
-# libarts1	1.2.3-1		1.3.0-1
-# libartsc0	1.1.4-2		1.1.4-3
+DEB_DH_MAKESHLIBS_ARGS_libarts1		:= -V'libarts1 (>= 1.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_libartsc0	:= -V'libartsc0 (>= 1.4.1-1)'
 
-#shlibs_ver = 1.4.0-1 
+#shlibs_ver = 1.4.1-1 
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))

Modified: branches/kde-3.4.0/packages/kdeaccessibility/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdeaccessibility/debian/rules	2005-05-31 15:55:38 UTC (rev 1168)
+++ branches/kde-3.4.0/packages/kdeaccessibility/debian/rules	2005-05-31 16:41:56 UTC (rev 1169)
@@ -10,10 +10,8 @@
 
 PACKAGES_WITH_LIBS := kttsd ksayit
 
-# package	last neq.	first eq.
-# ----------------------------------------
-# kttsd		3.3.2-1		now
-# libartsc0	3.3.2-1		now
+DEB_DH_MAKESHLIBS_ARGS_kttsd	:= -V'kttsd (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_ksayit	:= -V'ksayit (>= 4:3.4.1-1)'
 
-#shlibs_ver = 4:3.4.0-1
+#shlibs_ver = 4:3.4.1-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))

Modified: branches/kde-3.4.0/packages/kdebase/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/rules	2005-05-31 15:55:38 UTC (rev 1168)
+++ branches/kde-3.4.0/packages/kdebase/debian/rules	2005-05-31 16:41:56 UTC (rev 1169)
@@ -13,23 +13,21 @@
 
 DEB_FIXPERMS_EXCLUDE := usr/bin/kdesud
 
+DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter kdesu knetattach kioslave kxkb kdebugdialog kdcop
+
 PACKAGES_WITH_LIBS := kate kcontrol kicker konqueror ksplash \
 			ksysguard kwin libkonq4
 
-DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter kdesu knetattach kioslave kxkb kdebugdialog kdcop
+DEB_DH_MAKESHLIBS_ARGS_kate		:= -V'kate (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kcontrol		:= -V'kcontrol (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kicker		:= -V'kicker (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_konqueror	:= -V'konqueror (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_ksplash		:= -V'ksplash (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_ksysguard	:= -V'ksysguard (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kwin		:= -V'kwin (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_libkonq4		:= -V'libkonq4 (>= 4:3.4.1-1)'
 
-# package	last neq.	first eq.
-# ----------------------------------------
-# kate		3.3.2-1		now
-# kcontrol	3.3.2-1		now
-# kicker	3.3.2-1		now
-# konqueror	3.2.3-1		3.3.1-2
-# ksplash	3.3.2-1		now
-# ksysguard	3.3.2-1		now
-# kwin		3.3.2-1		now
-# libkonq4	3.3.2-1		now
-
-#shlibs_ver = 4:3.4.0-1
+#shlibs_ver = 4:3.4.1-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
 binary-install/kdebase-bin::

Modified: branches/kde-3.4.0/packages/kdegraphics/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/rules	2005-05-31 15:55:38 UTC (rev 1168)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/rules	2005-05-31 16:41:56 UTC (rev 1169)
@@ -10,17 +10,12 @@
 PACKAGES_WITH_LIBS := kghostview kmrml kpovmodeler ksvg \
 			kuickshow kview kviewshell libkscan1
 
-# package	last neq.	first eq.
-# ----------------------------------------
-# kghostview	3.3.2-2		now
-# kpovmodeler	3.3.2-2		now
-# ksvg		3.2.3-1		3.3.0-1
-# kview		3.1.5-1		3.2.1-1
-# kviewshell	3.3.2-2		now
-# libkscan1	3.3.2-2		now
-# ----------------------------------------
-# kmrml		NO SONAMES
-# kuickshow	NO SONAMES
+DEB_DH_MAKESHLIBS_ARGS_kghostview	:= -V'kghostview (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kpovmodeler	:= -V'kpovmodeler (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_ksvg		:= -V'ksvg (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kview		:= -V'kview (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kviewshell	:= -V'kviewshell (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_libkscan1	:= -V'libkscan1 (>= 4:3.4.1-1)'
 
-#shlibs_ver = 4:3.4.0-1
+#shlibs_ver = 4:3.4.1-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))

Modified: branches/kde-3.4.0/packages/kdelibs/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/rules	2005-05-31 15:55:38 UTC (rev 1168)
+++ branches/kde-3.4.0/packages/kdelibs/debian/rules	2005-05-31 16:41:56 UTC (rev 1169)
@@ -19,14 +19,13 @@
 	usr/bin/kgrantpty	\
 	usr/bin/kpac_dhcp_helper
 
-PACKAGES_WITH_LIBS := kdelibs4
 DEB_DH_STRIP_ARGS  := --dbg-package=kdelibs4
 
-# package	last neq.	first eq.
-# ----------------------------------------
-# kdelibs4	3.3.2-6		now
+PACKAGES_WITH_LIBS := kdelibs4
 
-#shlibs_ver = 4:3.4.0-1
+DEB_DH_MAKESHLIBS_ARGS_kdelibs4 := -V'kdelibs4 (>= 4:3.4.1-1)'
+
+#shlibs_ver = 4:3.4.1-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
 binary-install/kdelibs-data::

Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/rules	2005-05-31 15:55:38 UTC (rev 1168)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/rules	2005-05-31 16:41:56 UTC (rev 1169)
@@ -11,26 +11,19 @@
 	# The include/kde/arts one should be temporary. See
 	# "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk.
 
+DOC_HTML_PRUNE := kcontrol
+
 PACKAGES_WITH_LIBS := akode artsbuilder kdemultimedia-kio-plugins kmid kmix krec \
 	libarts1-audiofile libarts1-mpeglib libarts1-xine libkcddb1 mpeglib noatun
 
-DOC_HTML_PRUNE := kcontrol
+DEB_DH_MAKESHLIBS_ARGS_akode		:= -V'akode (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_artsbuilder	:= -V'artsbuilder (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kmid		:= -V'kmid (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_libkcddb1	:= -V'libkcddb1 (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_mpeglib		:= -V'mpeglib (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_noatun		:= -V'noatun (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_libarts1-mpeglib	:= -V'libarts1-mpeglib (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kdemultimedia-kio-plugins := -V'kdemultimedia-kio-plugins (>= 4:3.4.1-1)'
 
-# package	last neq.	first eq.
-# ----------------------------------------
-# akode		3.3.2-1		now
-# artsbuilder	3.3.2-1		now
-# -kio-plugins	3.2.3-1		3.3.0-1
-# kmid		3.2.3-1		3.3.0-1
-# -mpeglib	3.3.2-1		now
-# libkcddb1	3.3.2-1		now
-# mpeglib	3.1.2-1		3.2.5-1
-# noatun	3.3.2-1		now
-# ----------------------------------------
-# kmix		NO SONAME
-# krec		NO SONAME
-# -audiofile	NO SONAME
-# -xine		NO SONAME
-
-#shlibs_ver = 4:3.4.0-1
+#shlibs_ver = 4:3.4.1-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))

Modified: branches/kde-3.4.0/packages/kdenetwork/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/rules	2005-05-31 15:55:38 UTC (rev 1168)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/rules	2005-05-31 16:41:56 UTC (rev 1169)
@@ -7,15 +7,10 @@
 
 PACKAGES_WITH_LIBS := librss1 kopete ksirc kwifimanager
 
-# package	last neq.	first eq.
-# ----------------------------------------
-# librss1	3.3.2-1		3.3.0-1
-# kopete	3.3.2-5		now
-# ----------------------------------------
-# ksirc		NO SONAMES
-# kwifimanager	NO SONAMES
+DEB_DH_MAKESHLIBS_ARGS_librss1	:= -V'librss1 (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kopete	:= -V'kopete (>= 4:3.4.1-1)'
 
-#shlibs_ver = 4:3.4.0-1
+#shlibs_ver = 4:3.4.1-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
 DEB_FIXPERMS_EXCLUDE := usr/bin/kppp usr/bin/kppplogview \

Modified: branches/kde-3.4.0/packages/kdeutils/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdeutils/debian/rules	2005-05-31 15:55:38 UTC (rev 1168)
+++ branches/kde-3.4.0/packages/kdeutils/debian/rules	2005-05-31 16:41:56 UTC (rev 1169)
@@ -5,17 +5,15 @@
 include debian/cdbs/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-PACKAGES_WITH_LIBS := khexedit klaptopdaemon kmilo kregexpeditor ksim
-
 DOC_HTML_PRUNE := kcontrol kinfocenter ktimer kcharselect ksim
 
-# package	last neq.	first eq.
-# ----------------------------------------
-# khexedit	3.3.2-1		now
-# klaptopdaemon	3.3.2-1		now
-# kmilo		3.2.1-1		3.2.2-1
-# kregexpeditor	3.3.2-1		now
-# ksim		3.2.3-1		3.3.0-1
+PACKAGES_WITH_LIBS := khexedit klaptopdaemon kmilo kregexpeditor ksim
 
-#shlibs_ver = 4:3.4.0-1
+DEB_DH_MAKESHLIBS_ARGS_khexedit		:= -V'khexedit (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_klaptopdaemon	:= -V'klaptopdaemon (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kmilo		:= -V'kmilo (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kregexpeditor	:= -V'kregexpeditor (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_ksim		:= -V'ksim (>= 4:3.4.1-1)'
+
+#shlibs_ver = 4:3.4.1-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))

Modified: branches/kde-3.4.0/packages/kdewebdev/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdewebdev/debian/rules	2005-05-31 15:55:38 UTC (rev 1168)
+++ branches/kde-3.4.0/packages/kdewebdev/debian/rules	2005-05-31 16:41:56 UTC (rev 1169)
@@ -13,11 +13,7 @@
 
 PACKAGES_WITH_LIBS := kommander kxsldbg
 
-# package	last neq.	first eq.
-# ----------------------------------------
-# kommander	3.3.2-6		now
-# ----------------------------------------
-# kxsldbg	NO SONAMES
+DEB_DH_MAKESHLIBS_ARGS_kommander := -V'kommander (>= 4:3.4.1-1)'
 
-#shlibs_ver = 4:3.4.0-1
+#shlibs_ver = 4:3.4.1-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))