debian: Re-enable the debug packages

Remove the .dirs/.install as things will go wrong then. debhelper
will try to install the debug symbols before they were created. Thanks
to Jan for pointing that out.

5 files changed, 11 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index e6e44c76..c75070e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libosmocore (0.5.3+git1-6) UNRELEASED; urgency=low
   * Build new package with the new API required for osmo-bts/openbsc
   * Package the arfcn utility.
   * Add the SOCK_RAW work-around for glibc.
+  * Re-enable the debug packages thanks to Jan.
 
  -- Holger Hans Peter Freyther <holger@freyther.de>  Fri, 04 Jan 2013 09:54:55 +0100
 
diff --git a/debian/control b/debian/control
index c3ce4629..05635601 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: libosmocore
 Section: libs
 Priority: optional
 Maintainer: Harald Welte <laforge@gnumonks.org>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen
+Standards-Version: 3.9.2
 Homepage: http://bb.osmocom.org/trac/wiki/libosmocore
 Vcs-Git: git://git.osmocom.org/libosmocore.git
 Vcs-Browser: http://git.osmocom.org/gitweb?p=libosmocore.git;a=summary
@@ -25,9 +25,9 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore
 Description: Utilities for gsm
 
-
-#Package: libosmocore-dbg
-#Section: libdevel
-#Architecture: any
-#Depends: ${shlibs:Depends}, ${misc:Depends}
-#Description: Debug symbols for Open Source MObile COMmunications CORE library
+Package: libosmocore-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: libosmocore (= ${binary:Version}), ${misc:Depends}
+Description: Debug symbols for Open Source MObile COMmunications CORE library
diff --git a/debian/libosmocore-dbg.dirs b/debian/libosmocore-dbg.dirs
deleted file mode 100644
index af59b0a9..00000000
--- a/debian/libosmocore-dbg.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/debug/lib
diff --git a/debian/libosmocore-dbg.install b/debian/libosmocore-dbg.install
deleted file mode 100644
index 7ce02127..00000000
--- a/debian/libosmocore-dbg.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/debug/lib/*
diff --git a/debian/rules b/debian/rules
index f97995d5..a60ca7ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,10 +16,9 @@ VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
 %:
 	dh --with autoreconf $@ --fail-missing
 
-#override_dh_strip:
-#	dh_strip --dbg-package=libosmocore-dbg
+override_dh_strip:
+	dh_strip --dbg-package=libosmocore-dbg
 
 override_dh_autoreconf:
 	echo $(VERSION) > .tarball-version
 	dh_autoreconf
-