[openarena] 04/05: Revert "Remove openarena-dbg, rely on automatic dbgsym packages instead"

[Simon McVittie]

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

smcv pushed a commit to branch debian/master
in repository openarena.

commit 72b2c2c6514d90ad6ef781b5c47289832c949dfe
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Sep 21 20:20:26 2016 +0100

    Revert "Remove openarena-dbg, rely on automatic dbgsym packages instead"
    
    This reverts commit 37a4478fdd2a8e687d56209b9d2b346365ab1218.
    Automatic dbgsym packages create conflicts when two packages contain
    an identical library, which openarena and openarena-server currently do.
---
 debian/changelog |  1 -
 debian/control   | 18 ++++++++++++++++++
 debian/rules     |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5384c99..e9383b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ openarena (0.8.8-17) UNRELEASED; urgency=medium
 
   * Move to debhelper compat level 10
     - don't build in parallel explicitly, it is now the default
-  * Remove openarena-dbg, rely on automatic dbgsym packages instead
   * debian/rules: align with ioquake3's
     - enable full compiler handling, but disable -fPIE -pie because this
       source package only compiles PIC shared objects
diff --git a/debian/control b/debian/control
index 0e1d13a..bb8dc3f 100644
--- a/debian/control
+++ b/debian/control
@@ -42,6 +42,24 @@ Description: fast-paced 3D first-person shooter
  .
  This package installs the OpenArena client.
 
+Package: openarena-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends:
+ openarena (= ${binary:Version}) | openarena-server (= ${binary:Version}),
+ ${misc:Depends},
+Recommends:
+ ioquake3-dbg,
+Description: debug symbols for OpenArena's game logic
+ OpenArena is an open-source content package for ioQuake3 licensed under the
+ GPL, effectively creating a free stand-alone game. Though OpenArena is a free
+ replacement for id Software Inc.'s Quake 3 Arena, it is NOT compatible with
+ the proprietary game!
+ .
+ This package contains debug symbols which can be used to debug crashes in
+ OpenArena's game logic.
+
 Package: openarena-server
 Architecture: any
 Depends:
diff --git a/debian/rules b/debian/rules
index 01de1bc..3f0eed0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,7 +115,7 @@ override_dh_auto_install:
 		$(DESTDIR)/usr/lib/openarena-server/missionpack/
 
 override_dh_strip:
-	dh_strip --ddeb-migration='openarena-dbg (<< 0.8.8-17~)'
+	dh_strip --dbg-package=openarena-dbg
 
 # ---------------------------------------------------------------------------
 

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