[Pkg-kde-commits] rev 747 - 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, 08 Mar 2005 17:26:31 +0100
Author: chrsmrtn-guest
Date: 2005-03-08 17:26:30 +0100 (Tue, 08 Mar 2005)
New Revision: 747
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:
Updated debian/rules to accomodate new kde.mk.
Note that by default, all libs will be given an shlibs value equal to the
upstream version, assuming that PACKAGES_WITH_LIBS is correct and complete.
If you need finer control, i.e. branch pulls add new symbols, then uncomment
the lines:
#shlibs_ver = 4:3.4.0-1
#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
and specify the new shlibs manually.
Modified: branches/kde-3.4.0/packages/arts/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/arts/debian/rules 2005-03-08 16:14:52 UTC (rev 746)
+++ branches/kde-3.4.0/packages/arts/debian/rules 2005-03-08 16:26:30 UTC (rev 747)
@@ -5,10 +5,7 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-shlibs_ver = 1.3.2
-DEB_DH_MAKESHLIBS_ARGS_libartsc0 := -V'libartsc0 (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_libarts1 := -V'libarts1 (>= $(shlibs_ver))'
+PACKAGES_WITH_LIBS := libarts1 libartsc0
-DEB_SHLIBDEPS_INCLUDE := \
- debian/libartsc0/usr/lib \
- debian/libarts1/usr/lib
+#shlibs_ver = 1.4.0-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-03-08 16:14:52 UTC (rev 746)
+++ branches/kde-3.4.0/packages/kdeaccessibility/debian/rules 2005-03-08 16:26:30 UTC (rev 747)
@@ -10,7 +10,6 @@
common-build-arch:: debian/stamp-man-pages
debian/stamp-man-pages:
-# Generate man pages for the programs
[ -d debian/man/out ] || mkdir debian/man/out
set -e; while read package binary; do \
soelim -Idebian/man debian/man/$$binary.man \
@@ -18,11 +17,7 @@
done <debian/man/manpages.in
touch debian/stamp-man-pages
-shlibs_ver=4:3.4.0
-DEB_DH_MAKESHLIBS_ARGS_kttsd := -V'kttsd (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_ksayit := -V'ksayit (>= $(shlibs_ver))'
+PACKAGES_WITH_LIBS := kttsd ksayit
-DEB_SHLIBDEPS_INCLUDE := \
- debian/kttsd/usr/lib \
- debian/ksayit/usr/lib
-
+#shlibs_ver = 4:3.4.0-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-03-08 16:14:52 UTC (rev 746)
+++ branches/kde-3.4.0/packages/kdebase/debian/rules 2005-03-08 16:26:30 UTC (rev 747)
@@ -13,20 +13,11 @@
DEB_FIXPERMS_EXCLUDE := usr/bin/kdesud
-shlibs_ver=4:3.4.0
-DEB_DH_MAKESHLIBS_ARGS_kate := -V'kate (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_kcontrol := -V'kcontrol (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_kicker := -V'kicker (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_konqueror := -V'konqueror (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_ksplash := -V'ksplash (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_ksysguard := -V'ksysguard (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_kwin := -V'kwin (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_libkonq4 := -V'libkonq4 (>= $(shlibs_ver))'
+PACKAGES_WITH_LIBS := kate kcontrol kicker konqueror ksplash \
+ ksysguard kwin libkonq4
-DEB_SHLIBDEPS_INCLUDE := debian/kate/usr/lib debian/kcontrol/usr/lib \
- debian/kicker/usr/lib debian/konqueror/usr/lib \
- debian/ksplash/usr/lib debian/ksysguard/usr/lib \
- debian/kwin/usr/lib debian/libkonq4/usr/lib
+#shlibs_ver = 4:3.4.0-1
+#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
binary-install/kdebase-bin::
install -p -D -m644 debian/kcheckpass.pam debian/kdebase-bin/etc/pam.d/kcheckpass
Modified: branches/kde-3.4.0/packages/kdegraphics/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/rules 2005-03-08 16:14:52 UTC (rev 746)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/rules 2005-03-08 16:26:30 UTC (rev 747)
@@ -5,10 +5,8 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-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'$(p) (>= $(shlibs_ver))'))
+#shlibs_ver = 4:3.4.0-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-03-08 16:14:52 UTC (rev 746)
+++ branches/kde-3.4.0/packages/kdelibs/debian/rules 2005-03-08 16:26:30 UTC (rev 747)
@@ -18,8 +18,7 @@
usr/bin/kgrantpty \
usr/bin/kpac_dhcp_helper
-shlibs_ver=4:3.4.0
-DEB_DH_MAKESHLIBS_ARGS_kdelibs4 := -V'kdelibs4 (>= $(shlibs_ver))'
+PACKAGES_WITH_LIBS := kkdelibs4
-DEB_SHLIBDEPS_INCLUDE := \
- debian/kdelibs4/usr/lib
+#shlibs_ver = 4:3.4.0-1
+#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/rules 2005-03-08 16:14:52 UTC (rev 746)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/rules 2005-03-08 16:26:30 UTC (rev 747)
@@ -14,9 +14,5 @@
PACKAGES_WITH_LIBS := akode artsbuilder kdemultimedia-kio-plugins kmid kmix krec \
libarts1-audiofile libarts1-mpeglib libarts1-xine libkcddb1 mpeglib noatun
-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
+#shlibs_ver = 4:3.4.0-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-03-08 16:14:52 UTC (rev 746)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/rules 2005-03-08 16:26:30 UTC (rev 747)
@@ -7,15 +7,11 @@
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-# shlibs_ver=4:3.3.99
-# DEB_DH_MAKESHLIBS_ARGS_kdelibs4 := -V'kdelibs4 (>= $(shlibs_ver))'
-
PACKAGES_WITH_LIBS := librss1 kopete ksirc kwifimanager
-DEB_SHLIBDEPS_INCLUDE := $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+#shlibs_ver = 4:3.4.0-1
+#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
-$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V))
-
DEB_FIXPERMS_EXCLUDE := usr/bin/kppp usr/bin/kppplogview \
etc/ppp/peers/kppp-options
Modified: branches/kde-3.4.0/packages/kdeutils/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdeutils/debian/rules 2005-03-08 16:14:52 UTC (rev 746)
+++ branches/kde-3.4.0/packages/kdeutils/debian/rules 2005-03-08 16:26:30 UTC (rev 747)
@@ -5,9 +5,7 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-shlibs_ver=4:3.4.0
-DEB_DH_MAKESHLIBS_ARGS_khexedit := -V'khexedit (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_klaptopdaemon := -V'klaptopdaemon (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_kmilo := -V'kmilo (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_kregexpeditor := -V'kregexpeditor (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_ksim := -V'ksim (>= $(shlibs_ver))'
+PACKAGES_WITH_LIBS := khexedit klaptopdaemon kmilo kregexpeditor ksim
+
+#shlibs_ver = 4:3.4.0-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-03-08 16:14:52 UTC (rev 746)
+++ branches/kde-3.4.0/packages/kdewebdev/debian/rules 2005-03-08 16:26:30 UTC (rev 747)
@@ -11,10 +11,7 @@
DEB_INSTALL_CHANGELOGS_kommander := kommander/ChangeLog
DEB_INSTALL_CHANGELOGS_quanta := quanta/ChangeLog
-shlibs_ver=4:3.4.0
-DEB_DH_MAKESHLIBS_ARGS_kommander := -V'kommander (>= $(shlibs_ver))'
+PACKAGES_WITH_LIBS := kommander libkommander0 kxsldbg
-DEB_SHLIBDEPS_INCLUDE := \
- debian/kommander/usr/lib \
- debian/libkommander0/usr/lib \
- debian/kxsldbg/usr/lib
+#shlibs_ver = 4:3.4.0-1
+#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))