[SCM] qtdeclarative packaging branch, master, updated. 5bd788c0137244630f9439c3301e3b780ce05bba

[Fathi Boudra]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=5bd788c

The following commit has been merged in the master branch:
commit 5bd788c0137244630f9439c3301e3b780ce05bba
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Sep 4 19:25:53 2012 +0300

    Use a single debug package.
    Re-order packages.
---
 debian/control |   63 +++++++++++++++++++++++--------------------------------
 debian/rules   |    6 +----
 2 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/debian/control b/debian/control
index fb9a5f2..bff3dd8 100644
--- a/debian/control
+++ b/debian/control
@@ -162,16 +162,20 @@ Description: Qt 5 declarative development files
  This package contains the header development files for building some
  Qt 5 applications using Qt 5 declarative headers.
 
-Package: qmlscene
+Package: qtdeclarative5-private-dev
 Architecture: any
-Multi-Arch: foreign
-Section: devel
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 QML scene viewer
+Section: libdevel
+Depends: qtdeclarative5-dev (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Qt 5 declarative private development files
  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 QML viewer for Qt Quick 2.
+ This package contains the private header development files for building some
+ Qt 5 applications using Qt 5 declarative private headers.
+ .
+ Use at your own risk.
 
 Package: qtdeclarative5-dev-tools
 Architecture: any
@@ -185,20 +189,26 @@ Description: Qt 5 declarative development programs
  This package contains the development programs used for building Qt 5
  declarative applications.
 
-Package: qtdeclarative5-private-dev
+Package: qmlscene
 Architecture: any
-Section: libdevel
-Depends: qtdeclarative5-dev (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: Qt 5 declarative private development files
+Multi-Arch: foreign
+Section: devel
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Qt 5 QML scene viewer
  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 private header development files for building some
- Qt 5 applications using Qt 5 declarative private headers.
+ This package contains the QML viewer for Qt Quick 2.
+
+Package: qtdeclarative5-examples
+Architecture: any
+Section: x11
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Qt 5 declarative examples
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
  .
- Use at your own risk.
+ This package contains Qt 5 declarative examples.
 
 Package: qtdeclarative5-dbg
 Priority: extra
@@ -208,31 +218,10 @@ Depends: libqtqml5 (= ${binary:Version}),
          libqtquick5 (= ${binary:Version}),
          libqtquickparticles5 (= ${binary:Version}),
          libqtquicktest5 (= ${binary:Version}),
+         qtdeclarative5-examples (= ${binary:Version}),
          ${misc:Depends}
 Description: Qt 5 declarative libraries 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 declarative libraries.
-
-Package: qtdeclarative5-examples-dbg
-Priority: extra
-Architecture: any
-Section: debug
-Depends: qtdeclarative5-examples (= ${binary:Version}), ${misc:Depends}
-Recommends: qtbase5-dbg
-Description: Qt 5 declarative 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 declarative examples.
-
-Package: qtdeclarative5-examples
-Architecture: any
-Section: x11
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 declarative 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 Qt 5 declarative examples.
diff --git a/debian/rules b/debian/rules
index 510fa5e..8e683b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,13 +8,9 @@ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildfla
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 %:
-	dh $@ --list-missing --parallel --with pkgkde_symbolshelper
+	dh $@ --list-missing --parallel --with pkgkde_symbolshelper --dbg-package=qtdeclarative5-dbg
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
-override_dh_strip:
-	dh_strip -pqtdeclarative5-examples --dbg-package=qtdeclarative5-examples-dbg
-	dh_strip --remaining-packages --dbg-package=qtdeclarative5-dbg
-
 override_dh_auto_test:

-- 
qtdeclarative packaging