debian: Add dbg packages which contain the stripped out debuging symbols

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

2 files changed, 155 insertions, 5 deletions

diff --git a/debian/control b/debian/control
index c3ceda41..6aa37f21 100644
--- a/debian/control
+++ b/debian/control
@@ -225,3 +225,75 @@ Description: ext2/ext3/ext4 file system utilities
  .
  This package contains programs for creating, checking, and maintaining
  ext-based file systems, and the generic fsck wrapper.
+
+Package: e2fsprogs-dbg
+Section: admin
+Priority: extra
+Depends: e2fsprogs (= ${binary:Version})
+Architecture: any
+Description: Debugging information for e2fsprogs
+ This package includes the debug information useful for debugging e2fsprogs
+ and its libraries, contained in the e2fsprogs and e2fsck-static packages.
+ The debug information is used for execution tracing and core
+ dump analysis. 
+
+Package: uuid-runtime-dbg
+Section: libs
+Priority: extra
+Depends: uuid-runtime (= ${binary:Version})
+Architecture: any
+Description: Debugging information for uuid-runtime
+ This package includes the debug information useful for debugging the
+ uuid runtime programs, contained in the uuid-runtime package.
+ The debugging information is used for execution tracing and core
+ dump analysis.
+
+Package: e2fslibs-dbg
+Section: libs
+Priority: extra
+Depends: e2fslibs (= ${binary:Version})
+Architecture: any
+Description: Debugging information for e2fslibs
+ This package includes the debug information useful for debugging the
+ ext2fs and e2p libraries, contained in the e2fslibs package.  The debug
+ information is used for execution tracing and core dump analysis.
+
+Package: libcomerr2-dbg
+Section: libs
+Priority: extra
+Depends: libcomerr2 (= ${binary:Version})
+Architecture: any
+Description: Debugging information for libcomerr2
+ This package includes the debug information useful for debugging the
+ com_err library, contained in the libcomerr2 package.  The debugging
+ information is used for execution tracing and core dump analysis.
+
+Package: libss2-dbg
+Section: libs
+Priority: extra
+Depends: libss2 (= ${binary:Version})
+Architecture: any
+Description: Debugging information for libss2
+ This package includes the debug information useful for debugging the
+ ss library, contained in the libss2 package.  The debug information
+ is used for execution tracing and core dump analysis.
+
+Package: libblkid1-dbg
+Section: libs
+Priority: extra
+Depends: libblkid1 (= ${binary:Version})
+Architecture: any
+Description: Debugging information for libblkid1
+ This package includes the debug information useful for debugging the
+ blkid library, contained in the libblkid1 package.  The debug
+ information is used for execution tracing and core dump analysis.
+
+Package: libuuid1-dbg
+Section: libs
+Priority: extra
+Depends: libuuid1 (= ${binary:Version})
+Architecture: any
+Description: Debugging information for libuuid1
+ This package includes the debug information useful for debugging the
+ UUID library, contained in the libuuid1 package.  The debug
+ information is used for execution tracing and core dump analysis.
diff --git a/debian/rules b/debian/rules
index 4ba301c2..6c85ca52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,26 @@ tmpdir=${debdir}/tmp
 udebdir=${debdir}/e2fsprogs-udeb
 blkidudebdir=${debdir}/libblkid1-udeb
 uuidudebdir=${debdir}/libuuid1-udeb
+libcomerrdir=${debdir}/libcomerr${COMERR_SOVERSION}
+comerrdevdir=${debdir}/comerr-dev
+libcomerrdbgdir=${debdir}/libcomerr2-dbg
+libssdir=${debdir}/libss${SS_SOVERSION}
+ssdevdir=${debdir}/ss-dev
+libssdbgdir=${debdir}/libss2-dbg
+libblkiddir=${debdir}/libblkid${BLKID_SOVERSION}
+libblkiddevdir=${debdir}/libblkid-dev
+libblkiddbgdir=${debdir}/libblkid1-dbg
+libuuiddir=${debdir}/libuuid${UUID_SOVERSION}
+uuiddevdir=${debdir}/uuid-dev
+libuuiddbgdir=${debdir}/libuuid1-dbg
+uuidruntimedir=${debdir}/uuid-runtime
+uuidruntimedbgdir=${debdir}/uuid-runtime-dbg
+libext2dir=${debdir}/e2fslibs
+libext2devdir=${debdir}/e2fslibs-dev
+libext2dbgdir=${debdir}/e2fslibs-dbg
 maindir=${debdir}/e2fsprogs
+e2fsckstaticdir=${debdir}/e2fsck-static
+debugdir=${debdir}/e2fsprogs-dbg
 stdbuilddir=${debdir}/BUILD-STD
 bfbuilddir=${debdir}/BUILD-BF
 staticbuilddir=${debdir}/BUILD-STATIC
@@ -76,9 +95,9 @@ INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 0755
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 CCOPTS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-INSTALL_PROGRAM += -s
-endif
+#ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+#INSTALL_PROGRAM += -s
+#endif
 
 ifeq (${DEB_HOST_ARCH},alpha)
 CCOPTS += -DHAVE_NETINET_IN_H
@@ -398,15 +417,74 @@ binary-arch: install install-udeb
 	DH_OPTIONS= dh_installchangelogs -pe2fsprogs \
 		-plibblkid${BLKID_SOVERSION} -plibcomerr${COMERR_SOVERSION} \
 		-plibss${SS_SOVERSION} -plibuuid${UUID_SOVERSION} \
-		-pe2fslibs -puuid-dev -puuid-runtime -pe2fsck-static
+		-pe2fslibs -puuid-dev -puuid-runtime -pe2fsck-static \
+		-pe2fsprogs-dbg -puuid-runtime-dbg -pe2fslibs-dbg \
+		-plibcomerr2-dbg -plibss2-dbg -plibblkid1-dbg -plibuuid1-dbg
 
 	dh_fixperms
 ifneq ($(ismips),)
 	dh_strip -Xlib64ext2fs-nopic.a
 else
-	dh_strip
+	dh_strip -k
 endif
 
+	# debug package stuff
+	rm -rf ${udebdir}/usr
+	rm -rf ${blkidudebdir}/usr
+	rm -rf ${uuidudebdir}/usr
+
+	mkdir -p ${debugdir}/usr/lib
+	mv ${maindir}/usr/lib/debug ${debugdir}/usr/lib
+	rm -rf ${maindir}/usr/lib/debug
+	mv ${e2fsckstaticdir}/usr/lib/debug/sbin/* \
+		${debugdir}/usr/lib/debug
+	rm -rf ${e2fsckstaticdir}/usr/lib
+
+	mkdir -p ${uuidruntimedbgdir}/usr/lib
+	mv ${uuidruntimedir}/usr/lib/debug ${uuidruntimedbgdir}/usr/lib
+	rmdir ${uuidruntimedir}/usr/lib
+
+	mkdir -p ${libext2dbgdir}/usr/lib
+	mv ${libext2dir}/usr/lib/debug ${libext2dbgdir}/usr/lib
+	rmdir ${libext2dir}/usr/lib
+
+	mkdir -p ${libcomerrdbgdir}/usr/lib
+	mv ${libcomerrdir}/usr/lib/debug ${libcomerrdbgdir}/usr/lib
+	rmdir ${libcomerrdir}/usr/lib
+
+	mkdir -p ${libssdbgdir}/usr/lib
+	mv ${libssdir}/usr/lib/debug ${libssdbgdir}/usr/lib
+	rmdir ${libssdir}/usr/lib
+
+	mkdir -p ${libuuiddbgdir}/usr/lib
+	mv ${libuuiddir}/usr/lib/debug ${libuuiddbgdir}/usr/lib
+	rmdir ${libuuiddir}/usr/lib
+
+	mkdir -p ${libblkiddbgdir}/usr/lib
+	mv ${libblkiddir}/usr/lib/debug ${libblkiddbgdir}/usr/lib
+	rmdir ${libblkiddir}/usr/lib
+
+	$(INSTALL) -p -m 0644 debian/e2fsprogs.copyright \
+		${debugdir}/usr/share/doc/e2fsprogs-dbg/copyright
+
+	$(INSTALL) -p -m 0644 debian/uuid-runtime.copyright \
+		${uuidruntimedbgdir}/usr/share/doc/uuid-runtime-dbg/copyright
+
+	$(INSTALL) -p -m 0644 debian/e2fslibs.copyright \
+		${libext2dbgdir}/usr/share/doc/e2fslibs-dbg/copyright
+
+	$(INSTALL) -p -m 0644 debian/libcomerr2.copyright \
+		${libcomerrdbgdir}/usr/share/doc/libcomerr2-dbg/copyright
+
+	$(INSTALL) -p -m 0644 debian/libss2.copyright \
+		${libssdbgdir}/usr/share/doc/libss2-dbg/copyright
+
+	$(INSTALL) -p -m 0644 debian/libblkid.copyright \
+		${libblkiddbgdir}/usr/share/doc/libblkid1-dbg/copyright
+
+	$(INSTALL) -p -m 0644 debian/libuuid1.copyright \
+		${libuuiddbgdir}/usr/share/doc/libuuid1-dbg/copyright
+
 	dh_compress
 
 	dh_makeshlibs -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb