[SCM] qtbase packaging branch, master, updated. fd1eaacd9f6b8bf42922f4b16c264613da2a753d
Fathi Boudra
fabo at alioth.debian.org
Tue Sep 4 18:26:15 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=fd1eaac
The following commit has been merged in the master branch:
commit fd1eaacd9f6b8bf42922f4b16c264613da2a753d
Author: Fathi Boudra <fabo at debian.org>
Date: Tue Sep 4 21:25:55 2012 +0300
Fix debug packages on Qt base
---
debian/control | 88 ++++++++++---------
.../patches/add_nostrip_for_debug_packages.patch | 21 +++++
debian/patches/series | 2 +
debian/rules | 13 +--
4 files changed, 74 insertions(+), 50 deletions(-)
diff --git a/debian/control b/debian/control
index d8e11b7..8d3ff8e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 9),
dpkg-dev (>= 1.16.1),
firebird-dev [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc],
freetds-dev,
+ gdb,
libatspi2.0-dev,
libcups2-dev,
libdbus-1-dev,
@@ -289,19 +290,6 @@ Description: Qt 5 base development files
This package contains the header development files used for building Qt 5
applications.
-Package: qtbase5-dev-tools
-Architecture: any
-Multi-Arch: foreign
-Section: devel
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 base 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 used for building Qt 5
- applications, such as moc, qdbuscpp2xml, qdbusxml2cpp, qdoc, rcc,
- syncqt and uic.
-
Package: qtbase5-private-dev
Architecture: any
Section: libdevel
@@ -329,39 +317,18 @@ Description: Qt 5 OpenGL library development files
This package contains the development files needed to build Qt 5 applications
using QtOpenGL library.
-Package: qtbase5-dbg
-Priority: extra
-Architecture: any
-Section: debug
-Depends: libqtcore5 (= ${binary:Version}), ${misc:Depends}
-Description: Qt 5 base 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 the debugging symbols for the Qt 5 base libraries.
-
-Package: qtbase5-bin-dbg
-Priority: extra
-Architecture: any
-Section: debug
-Depends: qtbase5-dbg (= ${binary:Version}), ${misc:Depends}
-Description: Qt 5 base binaries 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 binaries.
-
-Package: qtbase5-examples-dbg
-Priority: extra
+Package: qtbase5-dev-tools
Architecture: any
-Section: debug
-Depends: qtbase5-examples (= ${binary:Version}), ${misc:Depends}
-Recommends: qtbase5-dbg
-Description: Qt 5 base examples debugging symbols
+Multi-Arch: foreign
+Section: devel
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Qt 5 base 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 examples.
+ This package contains the development programs used for building Qt 5
+ applications, such as moc, qdbuscpp2xml, qdbusxml2cpp, qdoc, rcc,
+ syncqt and uic.
Package: qt5-qmake
Architecture: any
@@ -392,3 +359,40 @@ Description: Qt 5 base examples
is its rich set of widgets that provide standard GUI functionality.
.
This package contains Qt base 5 examples.
+
+Package: qtbase5-dbg
+Priority: extra
+Architecture: any
+Section: debug
+Depends: libqtcore5 (= ${binary:Version}), ${misc:Depends}
+Description: Qt 5 base 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 the debugging symbols for the Qt 5 base libraries.
+
+Package: qtbase5-dev-tools-dbg
+Priority: extra
+Architecture: any
+Section: debug
+Depends: qt5-qmake (= ${binary:Version}),
+ qtbase5-dev-tools (= ${binary:Version}),
+ ${misc:Depends}
+Recommends: qtbase5-dbg
+Description: Qt 5 base binaries 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 binaries.
+
+Package: qtbase5-examples-dbg
+Priority: extra
+Architecture: any
+Section: debug
+Depends: qtbase5-examples (= ${binary:Version}), ${misc:Depends}
+Recommends: qtbase5-dbg
+Description: Qt 5 base 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 examples.
diff --git a/debian/patches/add_nostrip_for_debug_packages.patch b/debian/patches/add_nostrip_for_debug_packages.patch
new file mode 100644
index 0000000..b1444de
--- /dev/null
+++ b/debian/patches/add_nostrip_for_debug_packages.patch
@@ -0,0 +1,21 @@
+author: Fathi Boudra <fabo at debian.org>
+
+Qt is built in release mode and strip files by default.
+Set CONFIG+=nostrip to avoid the stripping and
+let dh_strip do it to generate debug packages.
+
+---
+ configure | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/configure
++++ b/configure
+@@ -777,6 +777,8 @@ mkdir -p "$outpath/config.tests"
+ rm -f "$outpath/config.tests/.qmake.cache"
+ cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
+
++QMakeVar add CONFIG nostrip
++
+ QMakeVar add styles "cde mac motif plastique cleanlooks windows"
+
+ # QTDIR may be set and point to an old or system-wide Qt installation
diff --git a/debian/patches/series b/debian/patches/series
index bed19eb..7b88cc3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+# debian patches
append_qt_version_suffix.patch
+add_nostrip_for_debug_packages.patch
diff --git a/debian/rules b/debian/rules
index 457e990..c5b56b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,12 +10,8 @@ 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 '/qtbase5-dbg/d; s|-dbg||')
-# Packages whose debug symbols belong to qtbase5-bin-dbg
-pkgs_dbgbin := qtbase5-dev-bin $(filter-out %-dbg lib% $(pkgs_dbg),$(shell dh_listpackages))
-# Library package list for override_dh_makeshlibs, excludes -dev -dbg -bin
-pkgs_lib := $(filter-out %-dev %-dbg %-bin,$(filter lib%,$(shell dh_listpackages)))
+# Library package list for override_dh_makeshlibs, excludes -dev -dbg
+pkgs_lib := $(filter-out %-dev %-dbg,$(filter lib%,$(shell dh_listpackages)))
# Upstream changelog
upstream_changes := $(wildcard dist/changes-*)
# Current debian version (e.g.: 4:4.5.2-1)
@@ -251,8 +247,9 @@ override_dh_installchangelogs:
dh_installchangelogs $(upstream_changes)
override_dh_strip:
- $(foreach pkg,$(pkgs_dbg),dh_strip -p$(pkg) --dbg-package=$(pkg)-dbg;)
- dh_strip $(foreach pkg,$(pkgs_dbgbin),-p$(pkg)) --dbg-package=qtbase5-bin-dbg
+ dh_strip -pqtbase5-examples --dbg-package=qtbase5-examples-dbg
+ dh_strip -pqtbase5-dev-tools --dbg-package=qtbase5-dev-tools-dbg
+ dh_strip -pqt5-qmake --dbg-package=qtbase5-dev-tools-dbg
dh_strip --remaining-packages --dbg-package=qtbase5-dbg
override_dh_makeshlibs:
--
qtbase packaging
More information about the pkg-kde-commits
mailing list