rev 17023 - trunk/packages/kdepimlibs/debian

Modestas Vainius modax at alioth.debian.org
Sat Feb 20 03:04:09 UTC 2010


Author: modax
Date: 2010-02-20 03:03:57 +0000 (Sat, 20 Feb 2010)
New Revision: 17023

Removed:
   trunk/packages/kdepimlibs/debian/kdepimlibs5-dev.bug-presubj
Modified:
   trunk/packages/kdepimlibs/debian/changelog
   trunk/packages/kdepimlibs/debian/control
   trunk/packages/kdepimlibs/debian/rules
Log:
Some kdepimlibs changes.

* Bump Standards-Version to 3.8.4: no changes needed.
* Use ${allLibraries} and ${kde43Libraries} substs provided by
  library-packages.mk in debian/control.
* Use strict (=) interdependencies between local library packages.
* Build depend on pkg-kde-tools 0.6.4: needed for symbols files and
  library-packages.mk.
* Clean up debian/rules a bit.
* Drop obsolete kdepimlibs5-dev presubj.
* Add ${perl:Depends} subst to libmailtransport4 Depends.

Modified: trunk/packages/kdepimlibs/debian/changelog
===================================================================
--- trunk/packages/kdepimlibs/debian/changelog	2010-02-19 22:58:47 UTC (rev 17022)
+++ trunk/packages/kdepimlibs/debian/changelog	2010-02-20 03:03:57 UTC (rev 17023)
@@ -1,7 +1,11 @@
-kdepimlibs (4:4.4.0-0r1) UNRELEASED; urgency=low
+kdepimlibs (4:4.4.0-0r2) UNRELEASED; urgency=low
 
   * New upstream release.
- 
+
+  * TODO: find out what else needs to depend on the kioslaves
+    apart from the transitional package.
+  * TODO: symbol files.
+
   [ George Kiagiadakis ]
   * Bump kdelibs5-dev build-dependency to >= 4:4.4.0.
   * Bump libakonadi-dev build-dependency to >= 1.3.0.
@@ -18,8 +22,16 @@
   [ Changes by Ana Beatriz Guerrero Lopez ]
   * Add build depends on shared-mime-info.
 
-  * TODO: find out what else needs to depend on the kioslaves
-    apart from the transitional package.
+  [ Modestas Vainius ]
+  * Bump Standards-Version to 3.8.4: no changes needed.
+  * Use ${allLibraries} and ${kde43Libraries} substs provided by
+    library-packages.mk in debian/control.
+  * Use strict (=) interdependencies between local library packages.
+  * Build depend on pkg-kde-tools 0.6.4: needed for symbols files and
+    library-packages.mk.
+  * Clean up debian/rules a bit.
+  * Drop obsolete kdepimlibs5-dev presubj.
+  * Add ${perl:Depends} subst to libmailtransport4 Depends.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 19 Feb 2010 23:58:23 +0100
 

Modified: trunk/packages/kdepimlibs/debian/control
===================================================================
--- trunk/packages/kdepimlibs/debian/control	2010-02-19 22:58:47 UTC (rev 17022)
+++ trunk/packages/kdepimlibs/debian/control	2010-02-20 03:03:57 UTC (rev 17023)
@@ -4,41 +4,19 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
  Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>, George Kiagiadakis <gkiagiad at csd.uoc.gr>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7.2.3), quilt, pkg-kde-tools (>= 0.4.2),
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7.2.3), quilt, pkg-kde-tools (>= 0.6.4),
  kdelibs5-dev (>= 4:4.4.0), libgpgme11-dev, libldap2-dev, libsasl2-dev,
  libboost-dev, libboost-graph-dev, shared-mime-info,
  libakonadi-dev (>= 1.3.0), libical-dev (>= 0.42)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://pim.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdepimlibs/#_trunk_packages_kdepimlibs_
 Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/kdepimlibs
 
 Package: kdepimlibs5
 Section: libs
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends},
- kdepimlibs-kio-plugins (= ${binary:Version}),
- libakonadi-kabc4 (= ${binary:Version}),
- libakonadi-kde4 (= ${binary:Version}),
- libakonadi-kmime4 (= ${binary:Version}),
- libgpgme++2 (= ${binary:Version}),
- libkabc4 (= ${binary:Version}),
- libkblog4 (= ${binary:Version}),
- libkcal4 (= ${binary:Version}),
- libkholidays4 (= ${binary:Version}),
- libkimap4 (= ${binary:Version}),
- libkldap4 (= ${binary:Version}),
- libkmime4 (= ${binary:Version}),
- libkpimidentities4 (= ${binary:Version}),
- libkpimtextedit4 (= ${binary:Version}),
- libkpimutils4 (= ${binary:Version}),
- libkresources4 (= ${binary:Version}),
- libktnef4 (= ${binary:Version}),
- libkxmlrpcclient4 (= ${binary:Version}),
- libmailtransport4 (= ${binary:Version}),
- libmicroblog4 (= ${binary:Version}),
- libqgpgme1 (= ${binary:Version}),
- libsyndication4 (= ${binary:Version})
+Architecture: any
+Depends: ${misc:Depends}, ${kde43Libraries}, kdepimlibs-kio-plugins (= ${binary:Version})
 Description: the KDE Development Platform PIM libraries (transitional package)
  This is a dummy package to ease transition to the new library packages.
  .
@@ -47,31 +25,7 @@
 Package: kdepimlibs5-dev
 Section: libdevel
 Architecture: any
-Depends: ${sameVersionDep:kdelibs5-dev:libakonadi-kde4},
- libakonadi-contact4 (= ${binary:Version}),
- libakonadi-kabc4 (= ${binary:Version}),
- libakonadi-kcal4 (= ${binary:Version}),
- libakonadi-kde4 (= ${binary:Version}),
- libakonadi-kmime4 (= ${binary:Version}),
- libgpgme++2 (= ${binary:Version}),
- libkabc4 (= ${binary:Version}),
- libkblog4 (= ${binary:Version}),
- libkcal4 (= ${binary:Version}),
- libkholidays4 (= ${binary:Version}),
- libkimap4 (= ${binary:Version}),
- libkldap4 (= ${binary:Version}),
- libkmime4 (= ${binary:Version}),
- libkontactinterface4 (= ${binary:Version}),
- libkpimidentities4 (= ${binary:Version}),
- libkpimtextedit4 (= ${binary:Version}),
- libkpimutils4 (= ${binary:Version}),
- libkresources4 (= ${binary:Version}),
- libktnef4 (= ${binary:Version}),
- libkxmlrpcclient4 (= ${binary:Version}),
- libmailtransport4 (= ${binary:Version}),
- libmicroblog4 (= ${binary:Version}),
- libqgpgme1 (= ${binary:Version}),
- libsyndication4 (= ${binary:Version})
+Depends: ${sameVersionDep:kdelibs5-dev:libakonadi-kde4}, ${allLibraries}
 Replaces: kdepimlibs-data (<< 4:4.1.80)
 Conflicts: libkleopatra1-dev
 Description: development files for the KDE Development Platform PIM libraries
@@ -345,7 +299,7 @@
 Package: libmailtransport4
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 Replaces: kdepimlibs5 (<< 4:4.4.0), kdepimlibs-data
 Conflicts: kdepimlibs-data
 Description: mail transport service library
@@ -398,31 +352,8 @@
 Section: debug
 Architecture: any
 Priority: extra
-Depends: kdelibs5-dbg, libc6-dbg [amd64],
- libakonadi-contact4 (= ${binary:Version}),
- libakonadi-kabc4 (= ${binary:Version}),
- libakonadi-kcal4 (= ${binary:Version}),
- libakonadi-kde4 (= ${binary:Version}),
- libakonadi-kmime4 (= ${binary:Version}),
- libgpgme++2 (= ${binary:Version}),
- libkabc4 (= ${binary:Version}),
- libkblog4 (= ${binary:Version}),
- libkcal4 (= ${binary:Version}),
- libkholidays4 (= ${binary:Version}),
- libkimap4 (= ${binary:Version}),
- libkldap4 (= ${binary:Version}),
- libkmime4 (= ${binary:Version}),
- libkontactinterface4 (= ${binary:Version}),
- libkpimidentities4 (= ${binary:Version}),
- libkpimtextedit4 (= ${binary:Version}),
- libkpimutils4 (= ${binary:Version}),
- libkresources4 (= ${binary:Version}),
- libktnef4 (= ${binary:Version}),
- libkxmlrpcclient4 (= ${binary:Version}),
- libmailtransport4 (= ${binary:Version}),
- libmicroblog4 (= ${binary:Version}),
- libqgpgme1 (= ${binary:Version}),
- libsyndication4 (= ${binary:Version})
+Depends: kdelibs5-dbg, ${allLibraries}, libc6-dbg [amd64]
+Recommends: kdepimlibs-kio-plugins (= ${binary:Version})
 Description: debugging symbols for the KDE Development Platform PIM libraries
  This package contains debugging files used to investigate problems with
  binaries included in the KDE Development Platform PIM libraries module.

Modified: trunk/packages/kdepimlibs/debian/rules
===================================================================
--- trunk/packages/kdepimlibs/debian/rules	2010-02-19 22:58:47 UTC (rev 17022)
+++ trunk/packages/kdepimlibs/debian/rules	2010-02-20 03:03:57 UTC (rev 17023)
@@ -1,12 +1,18 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
+DEB_DH_MAKESHLIBS_ARGS_ALL = -V
 
-#UPSTREAMVERSION := 4:4.1.3
+# Get rid of the dependency on kdebase-runtime
+DEB_DH_SHLIBDEPS_ARGS_ALL:=-- -xkdebase-runtime
 
-DEB_CMAKE_EXTRA_FLAGS += -DKDE4_ENABLE_EXPERIMENTAL_LIB_EXPORT=on
+DEB_KDE43_LIBRARY_PACKAGES = libakonadi-kabc4 libakonadi-kde4 libakonadi-kmime4 libgpgme++2 \
+ libkabc4 libkblog4 libkcal4 libkholidays4 libkimap4 libkldap4 libkmime4 libkpimidentities4 \
+ libkpimtextedit4 libkpimutils4 libkresources4 libktnef4 libkxmlrpcclient4 libmailtransport4 \
+ libmicroblog4 libqgpgme1 libsyndication4
+DEB_ALL_LIBRARIES_SUBST_PACKAGES = kdepimlibs5-dev kdepimlibs-dbg
+DEB_KDE43_LIBRARIES_SUBST_PACKAGES = kdepimlibs5
+DEB_STRICT_LOCAL_SHLIBS_PACKAGES = $(DEB_LIBRARY_PACKAGES)
 
-$(foreach p,$(filter lib%, $(DEB_ARCH_PACKAGES)),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V$(if $(UPSTREAMVERSION),'$(p) (>= $(UPSTREAMVERSION))',)))
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/library-packages.mk
 
-# get rid of the dependency on kdebase-runtime
-DEB_DH_SHLIBDEPS_ARGS_ALL:=-- -xkdebase-runtime




More information about the pkg-kde-commits mailing list