[merkaartor] 02/03: Add debug package for merkaartor.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository merkaartor.

commit 1250cc5c4ae791cdf95cbcd2d278f6f43ae6c1d1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 25 00:06:42 2015 +0200

    Add debug package for merkaartor.
---
 debian/changelog                          |  2 ++
 debian/control                            | 11 +++++++
 debian/merkaartor.install                 |  3 ++
 debian/patches/qmake-config-nostrip.patch | 54 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 debian/rules                              | 25 +++-----------
 6 files changed, 76 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d2066ea..2995859 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 merkaartor (0.18.2-1~exp2) UNRELEASED; urgency=medium
 
   * Add patches for improved GDAL 2.0 support, and debug build fix.
+  * Add debug package for merkaartor.
+    (closes: #692524)
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 24 Sep 2015 23:36:05 +0200
 
diff --git a/debian/control b/debian/control
index 704b32b..98a5e94 100644
--- a/debian/control
+++ b/debian/control
@@ -47,3 +47,14 @@ Description: map editor for OpenStreetMap.org
   * visualize some leisure/landuse areas and road types
   * displaying GPS information
 
+Package: merkaartor-dbg
+Architecture: any
+Section: debug
+Depends: merkaartor (= ${binary:Version}),
+         ${misc:Depends}
+Description: Debug symbols for merkaartor
+ Merkaartor is a map editor for OpenStreetMap.org, the free editable map of the
+ whole world.
+ .
+ This package contains debug symbols for merkaartor.
+
diff --git a/debian/merkaartor.install b/debian/merkaartor.install
new file mode 100644
index 0000000..d8f8488
--- /dev/null
+++ b/debian/merkaartor.install
@@ -0,0 +1,3 @@
+usr/bin
+usr/lib/merkaartor
+usr/share
diff --git a/debian/patches/qmake-config-nostrip.patch b/debian/patches/qmake-config-nostrip.patch
new file mode 100644
index 0000000..229767f
--- /dev/null
+++ b/debian/patches/qmake-config-nostrip.patch
@@ -0,0 +1,54 @@
+Description: Add nostrip to CONFIG for debug package.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/Merkaartor.pro
++++ b/Merkaartor.pro
+@@ -1,4 +1,4 @@
+-CONFIG += debug_and_release
++CONFIG += debug_and_release nostrip
+ TEMPLATE = subdirs
+ SUBDIRS += src \
+     plugins
+--- a/plugins/background/background.pro
++++ b/plugins/background/background.pro
+@@ -1,6 +1,6 @@
+ TEMPLATE = subdirs
+ 
+-CONFIG += debug_and_release
++CONFIG += debug_and_release nostrip
+ 
+ #Qt Version
+ QT_VERSION = $$[QT_VERSION]
+--- a/plugins/common.pri
++++ b/plugins/common.pri
+@@ -10,7 +10,7 @@ QT_VER_MIN = $$member(QT_VERSION, 1)
+ 
+ MERKAARTOR_SRC_DIR = $$PWD/..
+ 
+-CONFIG += debug_and_release
++CONFIG += debug_and_release nostrip
+ 
+ #Static config
+ include ($$MERKAARTOR_SRC_DIR/src/Config.pri)
+--- a/plugins/plugins.pro
++++ b/plugins/plugins.pro
+@@ -1,6 +1,6 @@
+ TEMPLATE = subdirs
+ 
+-CONFIG += debug_and_release
++CONFIG += debug_and_release nostrip
+ 
+ SUBDIRS += background
+ # qtstyle
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -6,7 +6,7 @@ include (Config.pri)
+ #Custom config
+ include(Custom.pri)
+ 
+-CONFIG += debug_and_release
++CONFIG += debug_and_release nostrip
+ 
+ isEmpty(SYSTEM_QTSA) {
+   include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
diff --git a/debian/patches/series b/debian/patches/series
index 0dbad92..6bfadc5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ quazip-qt5.patch
 various-typos.patch
 hardening-buildflags.patch
 desktop-keywords.patch
+qmake-config-nostrip.patch
diff --git a/debian/rules b/debian/rules
index 280d76e..350db2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,27 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DISTRIBUTION = $(shell dpkg-parsechangelog | grep '^Distribution:')
-ifneq (,$(findstring experimental,$(DISTRIBUTION)))
-RELEASEFLAGS = NODEBUG=0 RELEASE=0
-DEB_BUILD_OPTIONS += ,nostrip,noopt
-else
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-RELEASEFLAGS = NODEBUG=0 RELEASE=1
-else
-RELEASEFLAGS = NODEBUG=1 RELEASE=1
-endif
-endif
-
 SVNREV = $(shell dpkg-parsechangelog | grep '^Version' | sed 's,Version:,Debian,')
 
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
 # Use Qt5
 export QT_SELECT=5
 
@@ -53,7 +34,8 @@ override_dh_auto_configure:
 		SPATIALITE=0 \
 		SYSTEM_QUAZIP=1 \
 		ZBAR=0 \
-		$(RELEASEFLAGS)
+		NODEBUG=1 \
+		RELEASE=1
 
 override_dh_auto_build:
 	dh_auto_build
@@ -74,3 +56,6 @@ override_dh_installchangelogs:
 override_dh_installman:
 	dh_installman debian/merkaartor.1
 
+override_dh_strip:
+	dh_strip --dbg-package=merkaartor-dbg
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git