[SCM] qtxmlpatterns packaging branch, master, updated. 486c771014e27044c2be9ea2e9536e9c1293bbcb

[Fathi Boudra]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtxmlpatterns.git;a=commitdiff;h=486c771

The following commit has been merged in the master branch:
commit 486c771014e27044c2be9ea2e9536e9c1293bbcb
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Sep 4 19:28:10 2012 +0300

    Use a single debug package and re-order packages.
---
 debian/control |   80 +++++++++++++++++++++-----------------------------------
 debian/rules   |    8 +-----
 2 files changed, 31 insertions(+), 57 deletions(-)

diff --git a/debian/control b/debian/control
index 3c14fb7..e56b2bc 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,17 @@ Homepage: http://qt-project.org/
 Vcs-Git: git://git.debian.org/pkg-kde/qt/qtxmlpatterns.git
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt/qtxmlpatterns.git;a=summary
 
+Package: libqtxmlpatterns5
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Qt 5 XML patterns module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ QtXmlPatterns is a XQuery and XPath engine for XML and custom data models.
+
 Package: libqtxmlpatterns5-dev
 Section: libdevel
 Architecture: any
@@ -27,18 +38,6 @@ Description: Qt 5 XML patterns development files
  This package contains the header development files used for building Qt 5
  applications using QtXmlPatterns library.
 
-Package: qtxmlpatterns5-dev-tools
-Architecture: any
-Multi-Arch: foreign
-Section: devel
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 XML patterns development programs
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the development programs such as xmlpatterns and
- xmlpatternsvalidator.
-
 Package: libqtxmlpatterns5-private-dev
 Architecture: any
 Section: libdevel
@@ -54,58 +53,39 @@ Description: Qt 5 XML patterns private development files
  .
  Use at your own risk.
 
-Package: libqtxmlpatterns5
+Package: qtxmlpatterns5-dev-tools
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: foreign
+Section: devel
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 XML patterns module
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- QtXmlPatterns is a XQuery and XPath engine for XML and custom data models.
-
-Package: libqtxmlpatterns5-dbg
-Priority: extra
-Architecture: any
-Section: debug
-Depends: libqtxmlpatterns5 (= ${binary:Version}), ${misc:Depends}
-Description: Qt 5 XML patterns library debugging symbols
+Description: Qt 5 XML patterns development programs
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This package contains the debugging symbols for the Qt 5 XML patterns
- libraries.
+ This package contains the development programs such as xmlpatterns and
+ xmlpatternsvalidator.
 
-Package: qtxmlpatterns5-dev-tools-dbg
-Priority: extra
+Package: qtxmlpatterns5-examples
 Architecture: any
-Section: debug
-Depends: qtxmlpatterns5-dev-bin (= ${binary:Version}), ${misc:Depends}
-Description: Qt 5 XML patterns binaries debugging symbols
+Section: x11
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Qt 5 XML patterns examples
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This package contains the debugging symbols for the Qt 5 binaries.
+ This package contains Qt 5 XML patterns examples.
 
-Package: qtxmlpatterns5-examples-dbg
+Package: qtxmlpatterns5-dbg
 Priority: extra
 Architecture: any
 Section: debug
-Depends: qtxmlpatterns5-examples (= ${binary:Version}), ${misc:Depends}
-Recommends: qtbase5-dbg
-Description: Qt 5 XML patterns examples debugging symbols
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the debugging symbols for the Qt 5 XML patterns examples.
-
-Package: qtxmlpatterns5-examples
-Architecture: any
-Section: x11
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 XML patterns examples
+Depends: libqtxmlpatterns5 (= ${binary:Version}),
+         qtxmlpatterns5-dev-tools (= ${binary:Version}),
+         qtxmlpatterns5-examples (= ${binary:Version}),
+         ${misc:Depends}
+Description: Qt 5 XML patterns library debugging symbols
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This package contains Qt 5 XML patterns examples.
+ This package contains the debugging symbols for the Qt 5 XML patterns
+ libraries.
diff --git a/debian/rules b/debian/rules
index 36c9b34..25b239d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,16 +7,10 @@ export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags -
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
-# Packages with own debug package
-pkgs_dbg := $(shell dh_listpackages | grep dbg | sed -e 's|-dbg||')
-
 %:
-	dh $@ --list-missing --parallel --with pkgkde_symbolshelper
+	dh $@ --list-missing --parallel --with pkgkde_symbolshelper --dbg-package=qtxmlpatterns5-dbg
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
-override_dh_strip:
-	$(foreach pkg,$(pkgs_dbg),dh_strip -p$(pkg) --dbg-package=$(pkg)-dbg;)
-
 override_dh_auto_test:

-- 
qtxmlpatterns packaging