rev 16881 - trunk/packages/kdelibs/debian

Modestas Vainius modax at alioth.debian.org
Fri Feb 12 00:29:25 UTC 2010 

Author: modax
Date: 2010-02-12 00:29:24 +0000 (Fri, 12 Feb 2010)
New Revision: 16881

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
   trunk/packages/kdelibs/debian/kdelibs5-data.install
   trunk/packages/kdelibs/debian/kdelibs5-plugins.install
   trunk/packages/kdelibs/debian/libkfile4.install
   trunk/packages/kdelibs/debian/libkio5.install
   trunk/packages/kdelibs/debian/libplasma3.install
   trunk/packages/kdelibs/debian/rules
Log:
Finish split (tested), fixes there and there.

* TODO: Move kdelibs5 templates to another package that previously existed
  (kdelibs5-data?).
  - bind kdebase-runtime to libkdecore5 for now;
  - generate strict local library interdependencies by stealing
    debian/shlibs.local generation code from qt4-x11;
* Add control substs ${allLibraryPackages} and ${kde43LibraryPackages}
  for use in kdelibs5-{dev,dbg} and kdelibs5 metapackage despectively.
* Add ${perl:Depends} to Depends of kdelibs5-plugins, kdelibs5-data and
  kdoctools.

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2010-02-12 00:26:02 UTC (rev 16880)
+++ trunk/packages/kdelibs/debian/changelog	2010-02-12 00:29:24 UTC (rev 16881)
@@ -2,6 +2,9 @@
 
   * New upstream release. The „Kalastria Highborn“ release.
 
+  * TODO: Move kdelibs5 templates to another package that previously existed
+    (kdelibs5-data?).
+
   [ Modestas Vainius ]
   * Change my email address to modax at debian.org in Uploaders field.
   * Fix Vcs-Browser URL.
@@ -14,9 +17,15 @@
     - new kdoctools binary package with files installed from kdoctools/
       directory in the source tree;
     - add package splitting rules to README.source;
+    - bind kdebase-runtime to libkdecore5 for now;
+    - generate strict local library interdependencies by stealing
+      debian/shlibs.local generation code from qt4-x11;
+  * Add control substs ${allLibraryPackages} and ${kde43LibraryPackages}
+    for use in kdelibs5-{dev,dbg} and kdelibs5 metapackage despectively.
+  * Add ${perl:Depends} to Depends of kdelibs5-plugins, kdelibs5-data and
+    kdoctools.
 
   [ Kai Wasserbäch ]
-  * Synced to latest upstream SVN revision of the 4.4 branch (r1083043).
   * debian/patches:
     - Dropped backported patches:
       + 00_1034808_4.4_backport_rtldglobal.diff

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2010-02-12 00:26:02 UTC (rev 16880)
+++ trunk/packages/kdelibs/debian/control	2010-02-12 00:29:24 UTC (rev 16881)
@@ -24,7 +24,6 @@
 Package: libkdecore5
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: debconf | debconf-2.0
 Replaces: kdelibs5 (<< 4:4.4.0), kdelibs5-data (<< 4:4.4.0)
 Description: the KDE Platform Core Library
  All KDE Applications use this library to provide basic functionality such as
@@ -417,7 +416,7 @@
 
 Package: kdelibs5-plugins
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kdelibs5-data (= ${source:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, kdelibs5-data (= ${source:Version}),
  dbus-x11, shared-mime-info, xdg-utils
 Recommends: ttf-dejavu, kdebase-runtime (>= 4:4.4.0), kaboom (>= 1.0.5)
 Replaces: kdelibs5 (<< 4:4.4.0), kdelibs-bin (<< 4:4.1.74)
@@ -430,7 +429,7 @@
 
 Package: kdelibs5-data
 Architecture: all
-Depends: hicolor-icon-theme
+Depends: ${perl:Depends}, ${misc:Depends}, hicolor-icon-theme
 Replaces: kdebase-workspace-data (<< 4:4.1.66), libplasma2, kjscmd (<< 4:3.5.10-1)
 Conflicts: kjscmd (<< 4:3.5.10-1)
 Description: core shared data for all KDE Applications
@@ -452,8 +451,8 @@
 Package: kdelibs5-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${allLibraryPackages}, kdoctools (= ${binary:Version}),
- kdelibs-bin (= ${binary:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${allLibraryPackages},
+ kdoctools (= ${binary:Version}), kdelibs-bin (= ${binary:Version}),
  cmake (>= 2.6.3), automoc (>= 1.0~version-0.9.88), pkg-kde-tools (>= 0.6),
  ${sameVersionDep:libqt4-dev:kdelibs5-plugins}, ${sameVersionDep:libsoprano-dev:libnepomuk4},
  ${sameVersionDep:libphonon-dev:libkhtml5}
@@ -469,18 +468,9 @@
  .
  This package is part of the KDE Development Platform libraries module.
 
-Package: kdelibs5-apidocs
-Section: doc
-Architecture: all
-Recommends: www-browser
-Description: developer documentation for the KDE Development Platform libraries
- This package contains the API documentation for the KDE Development Platform
- libraries, for use by KDE application developers.
- .
- This package is part of the KDE Development Platform libraries module.
-
 Package: kdelibs5
 Architecture: any
+Pre-Depends: debconf | debconf-2.0
 Depends: ${misc:Depends}, ${kde43LibraryPackages}, kdoctools (= ${binary:Version}),
  kdelibs5-plugins (= ${binary:Version}), kdelibs-bin (= ${binary:Version})
 Description: transitional package for the KDE Development Platform libraries
@@ -494,7 +484,7 @@
 Section: debug
 Architecture: any
 Priority: extra
-Depends: ${sameVersionDep:libqt4-dbg:kdelibs-plugins}, libc6-dbg [amd64]
+Depends: libqt4-dbg (>= 4:4.6), libc6-dbg [amd64]
 Recommends: ${allLibraryPackages}, kdelibs-bin (= ${binary:Version})
 Description: debugging symbols for the KDE Development Platform libraries
  This package contains debugging files used to investigate problems with

Modified: trunk/packages/kdelibs/debian/kdelibs5-data.install
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs5-data.install	2010-02-12 00:26:02 UTC (rev 16880)
+++ trunk/packages/kdelibs/debian/kdelibs5-data.install	2010-02-12 00:29:24 UTC (rev 16881)
@@ -455,7 +455,6 @@
 usr/share/kde4/servicetypes/kbytesedit.desktop
 usr/share/kde4/servicetypes/kdedmodule.desktop
 usr/share/kde4/servicetypes/kemoticonsTheme.desktop
-usr/share/kde4/servicetypes/kiofilemodule.desktop
 usr/share/kde4/servicetypes/kregexpeditor.desktop
 usr/share/kde4/servicetypes/qimageio_plugin.desktop
 usr/share/man/man1/kde4-config.1

Modified: trunk/packages/kdelibs/debian/kdelibs5-plugins.install
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs5-plugins.install	2010-02-12 00:26:02 UTC (rev 16880)
+++ trunk/packages/kdelibs/debian/kdelibs5-plugins.install	2010-02-12 00:29:24 UTC (rev 16881)
@@ -7,7 +7,6 @@
 usr/lib/kde4/kded_kssld.so
 usr/lib/kde4/kded_proxyscout.so
 usr/lib/kde4/kfileaudiopreview.so
-usr/lib/kde4/kfilemodule.so
 usr/lib/kde4/khtmladaptorpart.so
 usr/lib/kde4/khtmlimagepart.so
 usr/lib/kde4/kio_file.so
@@ -30,7 +29,6 @@
 usr/lib/kde4/ktranscript.so
 usr/lib/kde4/libexec/filesharelist
 usr/lib/kde4/libexec/fileshareset
-usr/lib/kde4/libexec/kauth-policy-gen
 usr/lib/kde4/libexec/kcmremotewidgetshelper
 usr/lib/kde4/libexec/kconf_update
 usr/lib/kde4/libexec/kdontchangethehostname

Modified: trunk/packages/kdelibs/debian/libkfile4.install
===================================================================
--- trunk/packages/kdelibs/debian/libkfile4.install	2010-02-12 00:26:02 UTC (rev 16880)
+++ trunk/packages/kdelibs/debian/libkfile4.install	2010-02-12 00:29:24 UTC (rev 16881)
@@ -1,4 +1,3 @@
-usr/lib/kde4/libkfilemodule.so
+usr/lib/kde4/kfilemodule.so
 usr/lib/libkfile.so.4
 usr/lib/libkfile.so.4.4.0
-usr/share/kde4/servicetypes/kfileplugin.desktop

Modified: trunk/packages/kdelibs/debian/libkio5.install
===================================================================
--- trunk/packages/kdelibs/debian/libkio5.install	2010-02-12 00:26:02 UTC (rev 16880)
+++ trunk/packages/kdelibs/debian/libkio5.install	2010-02-12 00:29:24 UTC (rev 16881)
@@ -6,7 +6,7 @@
 usr/share/kde4/servicetypes/kdatatool.desktop
 usr/share/kde4/servicetypes/kfileplugin.desktop
 usr/share/kde4/servicetypes/kfilewrite.desktop
-usr/share/kde4/servicetypes/kiofilemodule.deskto
+usr/share/kde4/servicetypes/kiofilemodule.desktop
 usr/share/kde4/servicetypes/kpropertiesdialogplugin.desktop
 usr/share/kde4/servicetypes/kscan.desktop
 usr/share/kde4/servicetypes/kurifilterplugin.desktop

Modified: trunk/packages/kdelibs/debian/libplasma3.install
===================================================================
--- trunk/packages/kdelibs/debian/libplasma3.install	2010-02-12 00:26:02 UTC (rev 16880)
+++ trunk/packages/kdelibs/debian/libplasma3.install	2010-02-12 00:29:24 UTC (rev 16881)
@@ -1,2 +1,12 @@
 usr/lib/libplasma.so.3
 usr/lib/libplasma.so.3.0.0
+usr/share/kde4/servicetypes/plasma-animator.desktop
+usr/share/kde4/servicetypes/plasma-applet-popupapplet.desktop
+usr/share/kde4/servicetypes/plasma-applet.desktop
+usr/share/kde4/servicetypes/plasma-containment.desktop
+usr/share/kde4/servicetypes/plasma-containmentactions.desktop
+usr/share/kde4/servicetypes/plasma-dataengine.desktop
+usr/share/kde4/servicetypes/plasma-packagestructure.desktop
+usr/share/kde4/servicetypes/plasma-runner.desktop
+usr/share/kde4/servicetypes/plasma-scriptengine.desktop
+usr/share/kde4/servicetypes/plasma-wallpaper.desktop

Modified: trunk/packages/kdelibs/debian/rules
===================================================================
--- trunk/packages/kdelibs/debian/rules	2010-02-12 00:26:02 UTC (rev 16880)
+++ trunk/packages/kdelibs/debian/rules	2010-02-12 00:29:24 UTC (rev 16881)
@@ -1,20 +1,18 @@
 #!/usr/bin/make -f
 
-UPSTREAMVERSION ?= $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(.*\)-.*/\1/')
+BINARYVERSION ?= $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: //')
+UPSTREAMVERSION ?= $(shell echo '$(BINARYVERSION)' | sed 's/^\(.*\)-.*/\1/')
+BINARYVERSION := $(BINARYVERSION)
+UPSTREAMVERSION := $(UPSTREAMVERSION)
 #UPSTREAMVERSION ?= 4:4.2.0
 #PLASMA_ABI=$(shell grep 'plasma-abi-' debian/libplasma3.symbols.in | head -n1 | sed 's/^.*\(plasma-abi-\S\+\).*/\1/')
 RUNTIME_DEPS := kdebase-runtime (>= 4:4.4.0)
 
-DEB_DBG_PACKAGE_kdelibs5 := kdelibs5-dbg
-DEB_DBG_PACKAGE_kdelibs-bin := kdelibs5-dbg
-DEB_DBG_PACKAGE_libplasma3 := kdelibs5-dbg
-DEB_DBG_PACKAGE_libkdewebkit5 := kdelibs5-dbg
-DEB_DBG_PACKAGE_libknewstuff3-4 := kdelibs5-dbg
-DEB_DBG_PACKAGE_libkunitconversion4 := kdelibs5-dbg
-DEB_DBG_PACKAGE_libnepomukquery4 := kdelibs5-dbg
+DEB_DBG_PACKAGE_ALL := kdelibs5-dbg
 
 #bump version for every new upstream version!
-DEB_DH_MAKESHLIBS_ARGS_kdelibs5 := -V'kdelibs5 (>= $(UPSTREAMVERSION)), $(RUNTIME_DEPS)'
+DEB_DH_MAKESHLIBS_ARGS_libkdecore5 := -V'libkdecore5 (>= $(UPSTREAMVERSION)), $(RUNTIME_DEPS)'
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 #DEB_DH_MAKESHLIBS_ARGS_libplasma3 := -V'libplasma3 (>= $(UPSTREAMVERSION)), $(PLASMA_ABI)'
 
 # remove dependencies on kdebase-runtime and phonon (the metapackage)
@@ -22,5 +20,31 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
+# Generate dpkg-gencontrol substs
+DEB_LIBRARY_PACKAGES := $(filter-out %-dev,$(filter lib%,$(DEB_ARCH_PACKAGES)))
+DEB_KDE43_LIBRARY_PACKAGES := libkde3support4 libkdecore5 libkdesu5 libkdeui5 libkdnssd4 \
+    libkfile4 libkhtml5 libkimproxy4 libkio5 libkjsapi4 libkjsembed4 libkmediaplayer4 \
+    libknewstuff2-4 libknotifyconfig4 libkntlm4 libkparts4 libkpty4 libkrosscore4 libkrossui4 \
+    libktexteditor4 libkutils4 libnepomuk4 libsolid4 libthreadweaver4
+DEB_LIBRARY_PACKAGES_SUBST := $(foreach pkg,$(DEB_LIBRARY_PACKAGES),$(patsubst %,% (= $(BINARYVERSION)),,$(pkg)))
+DEB_KDE43_LIBRARY_PACKAGES_SUBST := $(foreach pkg,$(DEB_KDE43_LIBRARY_PACKAGES),$(patsubst %,% (= $(BINARYVERSION)),,$(pkg)))
+
+$(patsubst %,binary-predeb/%,kdelibs5-dev kdelibs5-dbg):: binary-predeb/%:
+	test -f debian/$(cdbs_curpkg).substvars || touch debian/$(cdbs_curpkg).substvars
+	echo 'allLibraryPackages=$(DEB_LIBRARY_PACKAGES_SUBST)' >> debian/$(cdbs_curpkg).substvars
+
+$(patsubst %,binary-predeb/%,kdelibs5):: binary-predeb/%:
+	test -f debian/$(cdbs_curpkg).substvars || touch debian/$(cdbs_curpkg).substvars
+	echo 'kde43LibraryPackages=$(DEB_KDE43_LIBRARY_PACKAGES_SUBST)' >> debian/$(cdbs_curpkg).substvars
+
+# Generate shlibs local files
+$(patsubst %,binary-fixup/%,$(DEB_ARCH_PACKAGES)) :: binary-fixup/%: binary-strip/%
+	if test -e debian/$(cdbs_curpkg)/DEBIAN/shlibs ; then \
+		sed 's/>=[^)]*/= $(BINARYVERSION)/' debian/$(cdbs_curpkg)/DEBIAN/shlibs >> debian/shlibs.local ;\
+	fi
+
+clean::
+	rm -f debian/shlibs.local
+
 #binary-predeb/libplasma3::
 #	echo plasma:abi-provides=$(PLASMA_ABI) >> debian/libplasma3.substvars

More information about the pkg-kde-commits mailing list