From 2545f8aa4f11a97e76cfb3d51a7bf4d7809a597f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Tue, 26 Feb 2013 13:43:50 +0000
Subject: [PATCH] Debugging packages of subpackages in Debian.

---
 emi.canl.canl-c/project/debian.control                    | 14 +++++++++++---
 emi.canl.canl-c/project/debian.rules                      | 10 ++++++----
 org.glite.jobid.api-c/project/debian.control              |  4 ++--
 org.glite.jobid.api-c/project/debian.rules                |  2 +-
 org.glite.lb.client/project/debian.control                | 12 ++++++++++--
 org.glite.lb.client/project/debian.rules                  | 10 ++++++----
 org.glite.lb.common/project/debian.control                |  4 ++--
 org.glite.lb.common/project/debian.rules                  |  2 +-
 org.glite.lb.harvester/project/debian.control             |  2 +-
 org.glite.lb.harvester/project/debian.rules               |  2 ++
 org.glite.lb.logger-msg/project/debian.control            |  2 +-
 org.glite.lb.logger/project/debian.control                |  2 +-
 org.glite.lb.server/project/debian.control                |  2 +-
 org.glite.lb.server/project/debian.rules                  |  2 +-
 org.glite.lb.state-machine/project/debian.control         | 12 ++++++++++--
 org.glite.lb.state-machine/project/debian.rules           | 10 ++++++----
 org.glite.lb.utils/project/debian.control                 |  2 +-
 org.glite.lb.ws-test/project/debian.control               |  2 +-
 org.glite.lbjp-common.db/project/debian.control           |  4 ++--
 org.glite.lbjp-common.db/project/debian.rules             |  2 +-
 org.glite.lbjp-common.gsoap-plugin/project/debian.control |  4 ++--
 org.glite.lbjp-common.gsoap-plugin/project/debian.rules   |  2 +-
 org.glite.lbjp-common.gss/project/debian.control          |  4 ++--
 org.glite.lbjp-common.gss/project/debian.rules            |  2 +-
 org.glite.lbjp-common.jp-interface/project/debian.control |  4 ++--
 org.glite.lbjp-common.jp-interface/project/debian.rules   |  2 +-
 org.glite.lbjp-common.log/project/debian.control          |  4 ++--
 org.glite.lbjp-common.log/project/debian.rules            |  2 +-
 org.glite.lbjp-common.maildir/project/debian.control      |  4 ++--
 org.glite.lbjp-common.maildir/project/debian.rules        |  2 +-
 org.glite.lbjp-common.server-bones/project/debian.control |  4 ++--
 org.glite.lbjp-common.server-bones/project/debian.rules   |  2 +-
 org.glite.lbjp-common.trio/project/debian.control         |  4 ++--
 org.glite.lbjp-common.trio/project/debian.rules           |  2 +-
 org.glite.px.proxyrenewal/project/debian.control          | 14 +++++++++++---
 org.glite.px.proxyrenewal/project/debian.rules            | 10 ++++++----
 36 files changed, 105 insertions(+), 63 deletions(-)

diff --git a/emi.canl.canl-c/project/debian.control b/emi.canl.canl-c/project/debian.control
index f4963b7..f561ada 100644
--- a/emi.canl.canl-c/project/debian.control
+++ b/emi.canl.canl-c/project/debian.control
@@ -30,10 +30,18 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Example programs of EMI caNl
  This package contains client and server examples of EMI caNl.
 
-Package: canl-c-dbg
+Package: libcanl-c2-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: libcanl-c2 (= ${binary:Version}), ${misc:Depends}
-Description: EMI caNl debugging symbols
- This package contains debugging symbols for EMI caNl.
+Description: Debugging symbols for EMI caNl library
+ This package contains debugging symbols for EMI caNl library.
+
+Package: libcanl-c-examples-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: libcanl-c-examples (= ${binary:Version}), ${misc:Depends}
+Description: Debugging symbols for EMI caNl examples
+ This package contains debugging symbols for EMI caNl client and server examples.
diff --git a/emi.canl.canl-c/project/debian.rules b/emi.canl.canl-c/project/debian.rules
index c189c58..9e97e0a 100644
--- a/emi.canl.canl-c/project/debian.rules
+++ b/emi.canl.canl-c/project/debian.rules
@@ -3,7 +3,6 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
-p_dbg=canl-c-dbg
 p_dev=libcanl-c-dev
 p_examples=libcanl-c-examples
 p_lib=libcanl-c2
@@ -42,12 +41,14 @@ install: build-stamp
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	rm -vf debian/tmp/usr/lib/*.la
-	mkdir -p debian/$(p_dbg)/usr/share/doc
 	mkdir -p debian/$(p_dev)/usr/share/doc
 	mkdir -p debian/$(p_examples)/usr/share/doc
+	mkdir -p debian/$(p_examples)-dbg/usr/share/doc
+	mkdir -p debian/$(p_lib)-dbg/usr/share/doc
 	mv debian/tmp/usr/share/doc/canl-c-@MAJOR@.@MINOR@.@REVISION@ debian/$(p_dev)/usr/share/doc/$(p_dev)
-	ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
 	ln -s $(p_lib) debian/$(p_examples)/usr/share/doc/$(p_examples)
+	ln -s $(p_lib) debian/$(p_examples)-dbg/usr/share/doc/$(p_examples)-dbg
+	ln -s $(p_lib) debian/$(p_lib)-dbg/usr/share/doc/$(p_lib)-dbg
 
 binary-indep:
 
@@ -62,7 +63,8 @@ binary-arch: install
 	dh_installcron
 	dh_install --fail-missing
 	dh_link
-	dh_strip --dbg-package=$(p_dbg)
+	dh_strip -p$(p_examples) --dbg-package=$(p_examples)-dbg
+	dh_strip -p$(p_lib) --dbg-package=$(p_lib)-dbg
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs
diff --git a/org.glite.jobid.api-c/project/debian.control b/org.glite.jobid.api-c/project/debian.control
index ead1c24..94143d5 100644
--- a/org.glite.jobid.api-c/project/debian.control
+++ b/org.glite.jobid.api-c/project/debian.control
@@ -25,10 +25,10 @@ Description: Development files for gLite jobid C library
  This package contains development libraries and header files for gLite jobid
  C library.
 
-Package: glite-jobid-api-c-dbg
+Package: libglite-jobid2-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: libglite-jobid2 (= ${binary:Version}), ${misc:Depends}
-Description: gLite jobid library debugging symbols
+Description: Debugging symbols for gLite jobid library
  This package contains debugging symbols for gLite jobid library.
diff --git a/org.glite.jobid.api-c/project/debian.rules b/org.glite.jobid.api-c/project/debian.rules
index 74c9e60..1334447 100644
--- a/org.glite.jobid.api-c/project/debian.rules
+++ b/org.glite.jobid.api-c/project/debian.rules
@@ -3,7 +3,7 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
-p_dbg=glite-jobid-api-c-dbg
+p_dbg=libglite-jobid2-dbg
 p_dev=libglite-jobid-api-c-dev
 p_lib=libglite-jobid2
 
diff --git a/org.glite.lb.client/project/debian.control b/org.glite.lb.client/project/debian.control
index 863c873..1c10c26 100644
--- a/org.glite.lb.client/project/debian.control
+++ b/org.glite.lb.client/project/debian.control
@@ -32,10 +32,18 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: gLite L&B client programs and examples
  This package contains client programs and examples for gLite L&B.
 
-Package: glite-lb-client-dbg
+Package: libglite-lb-client14-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: libglite-lb-client14 (= ${binary:Version}), ${misc:Depends}
-Description: gLite L&B client library debugging symbols
+Description: Debugging symbols for gLite L&B client library
  This package contains debugging symbols for gLite L&B client library.
+
+Package: glite-lb-client-progs-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: glite-lb-client-progs (= ${binary:Version}), ${misc:Depends}
+Description: Debugging symbols for gLite L&B client tools
+ This package contains debugging symbols for gLite L&B client tools.
diff --git a/org.glite.lb.client/project/debian.rules b/org.glite.lb.client/project/debian.rules
index 06e4b6c..9c6e913 100644
--- a/org.glite.lb.client/project/debian.rules
+++ b/org.glite.lb.client/project/debian.rules
@@ -3,7 +3,6 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
-p_dbg=glite-lb-client-dbg
 p_dev=libglite-lb-client-dev
 p_lib=libglite-lb-client14
 p_progs=glite-lb-client-progs
@@ -43,10 +42,12 @@ install: build-stamp
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	rm -vf debian/tmp/usr/lib/*.la
 	find debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
-	mkdir -p debian/$(p_dbg)/usr/share/doc/$(p_dbg)
 	mkdir -p debian/$(p_dev)/usr/share/doc/$(p_dev)
 	mkdir -p debian/$(p_progs)/usr/share/doc/$(p_progs)
-	ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
+	mkdir -p debian/$(p_lib)-dbg/usr/share/doc
+	mkdir -p debian/$(p_progs)-dbg/usr/share/doc
+	ln -s $(p_lib) debian/$(p_lib)-dbg/usr/share/doc/$(p_lib)-dbg
+	ln -s $(p_lib) debian/$(p_progs)-dbg/usr/share/doc/$(p_progs)-dbg
 	mv debian/tmp/usr/share/doc/glite-lb-client-@MAJOR@.@MINOR@.@REVISION@/examples debian/$(p_dev)/usr/share/doc/$(p_dev)
 	mv debian/tmp/usr/share/doc/glite-lb-client-@MAJOR@.@MINOR@.@REVISION@/README-notify debian/$(p_progs)/usr/share/doc/$(p_progs)
 	rm -rf debian/tmp/usr/share/doc/glite-lb-client-@MAJOR@.@MINOR@.@REVISION@
@@ -64,7 +65,8 @@ binary-arch: install
 	dh_installcron
 	dh_install --fail-missing
 	dh_link
-	dh_strip --dbg-package=$(p_dbg)
+	dh_strip -p$(p_lib) --dbg-package=$(p_lib)-dbg
+	dh_strip -p$(p_progs) --dbg-package=$(p_progs)-dbg
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs
diff --git a/org.glite.lb.common/project/debian.control b/org.glite.lb.common/project/debian.control
index 035a3c0..ac617f8 100644
--- a/org.glite.lb.common/project/debian.control
+++ b/org.glite.lb.common/project/debian.control
@@ -25,10 +25,10 @@ Description: Development files for gLite L&B common library
  This package contains development libraries and header files for gLite L&B
  common library.
 
-Package: glite-lb-common-dbg
+Package: libglite-lb-common16-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: libglite-lb-common16 (= ${binary:Version}), ${misc:Depends}
-Description: gLite L&B common library debugging symbols
+Description: Debugging symbols for gLite L&B common library
  This package contains debugging symbols for gLite L&B common library.
diff --git a/org.glite.lb.common/project/debian.rules b/org.glite.lb.common/project/debian.rules
index a9c25ab..c4548db 100644
--- a/org.glite.lb.common/project/debian.rules
+++ b/org.glite.lb.common/project/debian.rules
@@ -3,7 +3,7 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
-p_dbg=glite-lb-common-dbg
+p_dbg=libglite-lb-common16-dbg
 p_lib=libglite-lb-common16
 p_dev=libglite-lb-common-dev
 
diff --git a/org.glite.lb.harvester/project/debian.control b/org.glite.lb.harvester/project/debian.control
index d1be2fe..c5e8b8a 100644
--- a/org.glite.lb.harvester/project/debian.control
+++ b/org.glite.lb.harvester/project/debian.control
@@ -21,5 +21,5 @@ Section: debug
 Architecture: any
 Priority: extra
 Depends: glite-lb-harvester (= ${binary:Version}), ${misc:Depends}
-Description: gLite L&B harvester debugging symbols
+Description: Debugging symbols for gLite L&B harvester
  This package contains debugging symbols for gLite L&B harvester.
diff --git a/org.glite.lb.harvester/project/debian.rules b/org.glite.lb.harvester/project/debian.rules
index 2e190d5..043e7d9 100644
--- a/org.glite.lb.harvester/project/debian.rules
+++ b/org.glite.lb.harvester/project/debian.rules
@@ -40,6 +40,8 @@ install: build-stamp
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	mkdir -p debian/$(p_base)/usr/share/doc
+	mkdir -p debian/$(p_dbg)/usr/share/doc
+	ln -s $(p_base) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
 	mv debian/tmp/usr/share/doc/glite-lb-harvester-@MAJOR@.@MINOR@.@REVISION@ debian/$(p_base)/usr/share/doc/$(p_base)
 
 binary-indep:
diff --git a/org.glite.lb.logger-msg/project/debian.control b/org.glite.lb.logger-msg/project/debian.control
index 555866e..ce55f2b 100644
--- a/org.glite.lb.logger-msg/project/debian.control
+++ b/org.glite.lb.logger-msg/project/debian.control
@@ -21,5 +21,5 @@ Section: debug
 Architecture: any
 Priority: extra
 Depends: glite-lb-logger-msg (= ${binary:Version}), ${misc:Depends}
-Description: gLite L&B logger MSG plugin debugging symbols
+Description: Debugging symbols for gLite L&B logger MSG plugin
  This package contains debugging symbols for gLite L&B logger MSG plugin.
diff --git a/org.glite.lb.logger/project/debian.control b/org.glite.lb.logger/project/debian.control
index 4da8ce7..03dbd08 100644
--- a/org.glite.lb.logger/project/debian.control
+++ b/org.glite.lb.logger/project/debian.control
@@ -28,5 +28,5 @@ Section: debug
 Architecture: any
 Priority: extra
 Depends: glite-lb-logger (= ${binary:Version}), ${misc:Depends}
-Description: gLite L&B logger debugging symbols
+Description: Debugging symbols for gLite L&B logger
  This package contains debugging symbols for gLite L&B logger.
diff --git a/org.glite.lb.server/project/debian.control b/org.glite.lb.server/project/debian.control
index 01bb5eb..cbba1a4 100644
--- a/org.glite.lb.server/project/debian.control
+++ b/org.glite.lb.server/project/debian.control
@@ -27,5 +27,5 @@ Section: debug
 Architecture: any
 Priority: extra
 Depends: glite-lb-server (= ${binary:Version}), ${misc:Depends}
-Description: gLite L&B server debugging symbols
+Description: Debugging symbols for gLite L&B server
  This package contains debugging symbols for gLite L&B server.
diff --git a/org.glite.lb.server/project/debian.rules b/org.glite.lb.server/project/debian.rules
index c49b5bb..dae9154 100644
--- a/org.glite.lb.server/project/debian.rules
+++ b/org.glite.lb.server/project/debian.rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-b_base=glite-lb-server
+p_base=glite-lb-server
 p_dbg=glite-lb-server-dbg
 
 -include /usr/share/dpkg/buildflags.mk
diff --git a/org.glite.lb.state-machine/project/debian.control b/org.glite.lb.state-machine/project/debian.control
index 55fdf3b..78e3e57 100644
--- a/org.glite.lb.state-machine/project/debian.control
+++ b/org.glite.lb.state-machine/project/debian.control
@@ -32,10 +32,18 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: L&B state machine plugins
  This package contains L&B state machine plugins for Job Provenance.
 
-Package: glite-lb-state-machine-dbg
+Package: libglite-lb-state-machine6-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: libglite-lb-state-machine6 (= ${binary:Version}), ${misc:Depends}, libglite-jobid-api-c-dev
-Description: gLite L&B state-machine debugging symbols
+Description: Debugging symbols for gLite L&B state-machine
  This package contains debugging symbols for gLite L&B state machine.
+
+Package: glite-lb-state-machine-plugins-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: glite-lb-state-machine-plugins (= ${binary:Version}), ${misc:Depends}, libglite-jobid-api-c-dev
+Description: Debugging symbols for gLite L&B state-machine plugins
+ This package contains debugging symbols for gLite L&B state machine plugins.
diff --git a/org.glite.lb.state-machine/project/debian.rules b/org.glite.lb.state-machine/project/debian.rules
index 311a078..d05a239 100644
--- a/org.glite.lb.state-machine/project/debian.rules
+++ b/org.glite.lb.state-machine/project/debian.rules
@@ -3,7 +3,6 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
-p_dbg=glite-lb-state-machine-dbg
 p_dev=libglite-lb-state-machine-dev
 p_lib=libglite-lb-state-machine6
 p_plugs=glite-lb-state-machine-plugins
@@ -44,12 +43,14 @@ install: build-stamp
 	rm -vf debian/tmp/usr/lib/*.la
 	rm -vf debian/tmp/usr/lib/glite*.a
 	find debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
-	mkdir -p debian/$(p_dbg)/usr/share/doc
 	mkdir -p debian/$(p_dev)/usr/share/doc
 	mkdir -p debian/$(p_plugs)/usr/share/doc
-	ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
+	mkdir -p debian/$(p_lib)-dbg/usr/share/doc
+	mkdir -p debian/$(p_plugs)-dbg/usr/share/doc
 	ln -s $(p_lib) debian/$(p_dev)/usr/share/doc/$(p_dev)
 	ln -s $(p_lib) debian/$(p_plugs)/usr/share/doc/$(p_plugs)
+	ln -s $(p_lib) debian/$(p_lib)-dbg/usr/share/doc/$(p_lib)-dbg
+	ln -s $(p_lib) debian/$(p_plugs)-dbg/usr/share/doc/$(p_plugs)-dbg
 
 binary-indep:
 
@@ -64,7 +65,8 @@ binary-arch: install
 	dh_installcron
 	dh_install --fail-missing
 	dh_link
-	dh_strip --dbg-package=$(p_dbg)
+	dh_strip -p$(p_lib) --dbg-package=$(p_lib)-dbg
+	dh_strip -p$(p_plugs) --dbg-package=$(p_plugs)-dbg
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs
diff --git a/org.glite.lb.utils/project/debian.control b/org.glite.lb.utils/project/debian.control
index ea32ae2..a8e3f9c 100644
--- a/org.glite.lb.utils/project/debian.control
+++ b/org.glite.lb.utils/project/debian.control
@@ -21,5 +21,5 @@ Section: debug
 Architecture: any
 Priority: extra
 Depends: glite-lb-utils (= ${binary:Version}), ${misc:Depends}
-Description: gLite L&B utils debugging symbols
+Description: Debugging symbols for gLite L&B utils
  This package contains debugging symbols for gLite L&B utils.
diff --git a/org.glite.lb.ws-test/project/debian.control b/org.glite.lb.ws-test/project/debian.control
index 899a39a..4c899f7 100644
--- a/org.glite.lb.ws-test/project/debian.control
+++ b/org.glite.lb.ws-test/project/debian.control
@@ -21,5 +21,5 @@ Section: debug
 Architecture: any
 Priority: extra
 Depends: glite-lb-ws-test (= ${binary:Version}), ${misc:Depends}
-Description: gLite L&B Web Service tests debugging symbols
+Description: Debugging symbols for gLite L&B Web Service tests
  This package contains debugging symbols for gLite L&B Web Service tests.
diff --git a/org.glite.lbjp-common.db/project/debian.control b/org.glite.lbjp-common.db/project/debian.control
index cfb6329..c539b30 100644
--- a/org.glite.lbjp-common.db/project/debian.control
+++ b/org.glite.lbjp-common.db/project/debian.control
@@ -25,10 +25,10 @@ Description: Development files for gLite L&B/JP common db module
  This package contains development libraries and header files for gLite L&B/JP
  common db module.
 
-Package: glite-lbjp-common-db-dbg
+Package: libglite-lbu-db3-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: libglite-lbu-db3 (= ${binary:Version}), ${misc:Depends}
-Description: gLite L&B/JP common db module debugging symbols
+Description: Debugging symbols for gLite L&B/JP common db module
  This package contains debugging symbols for gLite L&B/JP common db module.
diff --git a/org.glite.lbjp-common.db/project/debian.rules b/org.glite.lbjp-common.db/project/debian.rules
index c0a4af7..053bb80 100644
--- a/org.glite.lbjp-common.db/project/debian.rules
+++ b/org.glite.lbjp-common.db/project/debian.rules
@@ -3,7 +3,7 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
-p_dbg=glite-lbjp-common-db-dbg
+p_dbg=libglite-lbu-db3-dbg
 p_dev=libglite-lbjp-common-db-dev
 p_lib=libglite-lbu-db3
 
diff --git a/org.glite.lbjp-common.gsoap-plugin/project/debian.control b/org.glite.lbjp-common.gsoap-plugin/project/debian.control
index b5c1992..09202cf 100644
--- a/org.glite.lbjp-common.gsoap-plugin/project/debian.control
+++ b/org.glite.lbjp-common.gsoap-plugin/project/debian.control
@@ -31,10 +31,10 @@ Description: Development files for gLite gsoap-plugin
  This package contains development libraries and header files for gLite
  gsoap-plugin.
 
-Package: glite-lbjp-common-gsoap-plugin-dbg
+Package: libglite-lbjp-common-gsoap-plugin-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: libglite-lbjp-common-gsoap-plugin (= ${binary:Version}), ${misc:Depends}
-Description: gLite gsoap-plugin library debugging symbols
+Description: Debugging symbols for gLite gsoap-plugin library
  This package contains debugging symbols for gLite gsoap-plugin library.
diff --git a/org.glite.lbjp-common.gsoap-plugin/project/debian.rules b/org.glite.lbjp-common.gsoap-plugin/project/debian.rules
index fb46124..cc52d3e 100644
--- a/org.glite.lbjp-common.gsoap-plugin/project/debian.rules
+++ b/org.glite.lbjp-common.gsoap-plugin/project/debian.rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-p_dbg=glite-lbjp-common-gsoap-plugin-dbg
+p_dbg=libglite-lbjp-common-gsoap-plugin-dbg
 p_dev=libglite-lbjp-common-gsoap-plugin-dev
 p_lib=libglite-lbjp-common-gsoap-plugin
 
diff --git a/org.glite.lbjp-common.gss/project/debian.control b/org.glite.lbjp-common.gss/project/debian.control
index 4c16415..93dc472 100644
--- a/org.glite.lbjp-common.gss/project/debian.control
+++ b/org.glite.lbjp-common.gss/project/debian.control
@@ -25,10 +25,10 @@ Description: Development files for gLite L&B/JP common gss library
  This package contains development libraries and header files for gLite gss
  library.
 
-Package: glite-lbjp-common-gss-dbg
+Package: libglite-security-gss9-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: libglite-security-gss9 (= ${binary:Version}), ${misc:Depends}
-Description: gLite gss library debugging symbols
+Description: Debugging symbols for gLite gss library
  This package contains debugging symbols for gLite gss library.
diff --git a/org.glite.lbjp-common.gss/project/debian.rules b/org.glite.lbjp-common.gss/project/debian.rules
index 0c15a42..feaf03d 100644
--- a/org.glite.lbjp-common.gss/project/debian.rules
+++ b/org.glite.lbjp-common.gss/project/debian.rules
@@ -3,7 +3,7 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
-p_dbg=glite-lbjp-common-gss-dbg
+p_dbg=libglite-security-gss9-dbg
 p_dev=libglite-lbjp-common-gss-dev
 p_lib=libglite-security-gss9
 
diff --git a/org.glite.lbjp-common.jp-interface/project/debian.control b/org.glite.lbjp-common.jp-interface/project/debian.control
index 47dfd90..cc459d7 100644
--- a/org.glite.lbjp-common.jp-interface/project/debian.control
+++ b/org.glite.lbjp-common.jp-interface/project/debian.control
@@ -25,10 +25,10 @@ Description: Development files for gLite L&B/JP interface library
  This package contains development libraries and header files for gLite L&B/JP
  interface library.
 
-Package: glite-lbjp-common-jp-interface-dbg
+Package: libglite-jp-common2-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: libglite-jp-common2 (= ${binary:Version}), ${misc:Depends}
-Description: gLite L&B/JP interface library debugging symbols
+Description: Debugging symbols for gLite L&B/JP interface library
  This package contains debugging symbols for gLite L&B/JP interface library.
diff --git a/org.glite.lbjp-common.jp-interface/project/debian.rules b/org.glite.lbjp-common.jp-interface/project/debian.rules
index ae6fc1d..d05685c 100644
--- a/org.glite.lbjp-common.jp-interface/project/debian.rules
+++ b/org.glite.lbjp-common.jp-interface/project/debian.rules
@@ -3,7 +3,7 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
-p_dbg=glite-lbjp-common-jp-interface-dbg
+p_dbg=libglite-jp-common2-dbg
 p_dev=libglite-lbjp-common-jp-interface-dev
 p_lib=libglite-jp-common2
 
diff --git a/org.glite.lbjp-common.log/project/debian.control b/org.glite.lbjp-common.log/project/debian.control
index 3e0b60f..b77ff73 100644
--- a/org.glite.lbjp-common.log/project/debian.control
+++ b/org.glite.lbjp-common.log/project/debian.control
@@ -33,10 +33,10 @@ Description: Development files for gLite L&B/JP common log module
  This package contains development libraries and header files for gLite L&B/JP
  common log module.
 
-Package: glite-lbjp-common-log-dbg
+Package: libglite-lbu-log1-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: libglite-lbu-log1 (= ${binary:Version}), ${misc:Depends}
-Description: gLite L&B/JP common log module debugging symbols
+Description: Debugging symbols for gLite L&B/JP common log module
  This package contains debugging symbols for gLite L&B/JP common log module.
diff --git a/org.glite.lbjp-common.log/project/debian.rules b/org.glite.lbjp-common.log/project/debian.rules
index 26716fc..f33cd9a 100644
--- a/org.glite.lbjp-common.log/project/debian.rules
+++ b/org.glite.lbjp-common.log/project/debian.rules
@@ -4,7 +4,7 @@
 -include /usr/share/dpkg/buildflags.mk
 
 p_base=glite-lbjp-common-log
-p_dbg=glite-lbjp-common-log-dbg
+p_dbg=libglite-lbu-log1-dbg
 p_lib=libglite-lbu-log1
 p_dev=libglite-lbjp-common-log-dev
 
diff --git a/org.glite.lbjp-common.maildir/project/debian.control b/org.glite.lbjp-common.maildir/project/debian.control
index 5144e20..0c72ae3 100644
--- a/org.glite.lbjp-common.maildir/project/debian.control
+++ b/org.glite.lbjp-common.maildir/project/debian.control
@@ -25,11 +25,11 @@ Description: Development files for gLite L&B/JP common maildir library
  This package contains development libraries and header files for gLite L&B/JP
  common maildir library.
 
-Package: glite-lbjp-common-maildir-dbg
+Package: libglite-lbu-maildir2-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: libglite-lbu-maildir2 (= ${binary:Version}), ${misc:Depends}
-Description: gLite L&B/JP common maildir library debugging symbols
+Description: Debugging symbols for gLite L&B/JP common maildir library
  This package contains debugging symbols for gLite L&B/JP common maildir
  library.
diff --git a/org.glite.lbjp-common.maildir/project/debian.rules b/org.glite.lbjp-common.maildir/project/debian.rules
index 926c363..05b21de 100644
--- a/org.glite.lbjp-common.maildir/project/debian.rules
+++ b/org.glite.lbjp-common.maildir/project/debian.rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-p_dbg=glite-lbjp-common-maildir-dbg
+p_dbg=libglite-lbu-maildir2-dbg
 p_dev=libglite-lbjp-common-maildir-dev
 p_lib=libglite-lbu-maildir2
 
diff --git a/org.glite.lbjp-common.server-bones/project/debian.control b/org.glite.lbjp-common.server-bones/project/debian.control
index 2537f5e..1a1f976 100644
--- a/org.glite.lbjp-common.server-bones/project/debian.control
+++ b/org.glite.lbjp-common.server-bones/project/debian.control
@@ -25,10 +25,10 @@ Description: Development files for gLite L&B/JP common server bones
  This package contains development libraries and header files for gLite L&B/JP
  common server-bones.
 
-Package: glite-lbjp-common-server-bones-dbg
+Package: libglite-lbu-server-bones2-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: libglite-lbu-server-bones2 (= ${binary:Version}), ${misc:Depends}
-Description: gLite L&B/JP common server bones debugging symbols
+Description: Debugging symbols for gLite L&B/JP common server bones
  This package contains debugging symbols for gLite L&B/JP common server-bones.
diff --git a/org.glite.lbjp-common.server-bones/project/debian.rules b/org.glite.lbjp-common.server-bones/project/debian.rules
index c51d1c9..a6d2849 100644
--- a/org.glite.lbjp-common.server-bones/project/debian.rules
+++ b/org.glite.lbjp-common.server-bones/project/debian.rules
@@ -3,7 +3,7 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
-p_dbg=glite-lbjp-common-server-bones-dbg
+p_dbg=libglite-lbu-server-bones2-dbg
 p_dev=libglite-lbjp-common-server-bones-dev
 p_lib=libglite-lbu-server-bones2
 
diff --git a/org.glite.lbjp-common.trio/project/debian.control b/org.glite.lbjp-common.trio/project/debian.control
index 535cebe..a55f80a 100644
--- a/org.glite.lbjp-common.trio/project/debian.control
+++ b/org.glite.lbjp-common.trio/project/debian.control
@@ -25,10 +25,10 @@ Description: Development files for gLite L&B/JP common trio library
  This package contains development libraries and header files for gLite L&B/JP
  common trio library.
 
-Package: glite-lbjp-common-trio-dbg
+Package: libglite-lbu-trio2-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: libglite-lbu-trio2 (= ${binary:Version}), ${misc:Depends}
-Description: gLite L&B/JP common trio library debugging symbols
+Description: Debugging symbols for gLite L&B/JP common trio library
  This package contains debugging symbols for gLite L&B/JP common trio library.
diff --git a/org.glite.lbjp-common.trio/project/debian.rules b/org.glite.lbjp-common.trio/project/debian.rules
index 5303ebb..f66e5bf 100644
--- a/org.glite.lbjp-common.trio/project/debian.rules
+++ b/org.glite.lbjp-common.trio/project/debian.rules
@@ -3,7 +3,7 @@
 
 -include /usr/share/dpkg/buildflags.mk
 
-p_dbg=glite-lbjp-common-trio-dbg
+p_dbg=libglite-lbu-trio2-dbg
 p_dev=libglite-lbjp-common-trio-dev
 p_lib=libglite-lbu-trio2
 
diff --git a/org.glite.px.proxyrenewal/project/debian.control b/org.glite.px.proxyrenewal/project/debian.control
index b378708..387228a 100644
--- a/org.glite.px.proxyrenewal/project/debian.control
+++ b/org.glite.px.proxyrenewal/project/debian.control
@@ -41,10 +41,18 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: gLite proxyrenewal daemon and client 
  This package contains daemon and client program of gLite proxyrenewal.
 
-Package: glite-px-proxyrenewal-dbg
+Package: libglite-security-proxyrenewal1-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: libglite-security-proxyrenewal1 (= ${binary:Version}), ${misc:Depends}
-Description: gLite proxyrenewal debugging symbols
- This package contains debugging symbols for gLite proxyrenewal.
+Description: Debugging symbols for gLite proxyrenewal library
+ This package contains debugging symbols for gLite proxyrenewal library.
+
+Package: glite-px-proxyrenewal-progs-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: glite-px-proxyrenewal-progs (= ${binary:Version}), ${misc:Depends}
+Description: Debugging symbols for gLite proxyrenewal programs
+ This package contains debugging symbols for gLite proxyrenewal programs.
diff --git a/org.glite.px.proxyrenewal/project/debian.rules b/org.glite.px.proxyrenewal/project/debian.rules
index 92c6e98..a4264b1 100644
--- a/org.glite.px.proxyrenewal/project/debian.rules
+++ b/org.glite.px.proxyrenewal/project/debian.rules
@@ -4,7 +4,6 @@
 -include /usr/share/dpkg/buildflags.mk
 
 p_base=glite-px-proxyrenewal
-p_dbg=glite-px-proxyrenewal-dbg
 p_dev=libglite-security-proxyrenewal-dev
 p_lib=libglite-security-proxyrenewal1
 p_progs=glite-px-proxyrenewal-progs
@@ -45,12 +44,14 @@ install: build-stamp
 	rm -vf debian/tmp/usr/lib/*.la
 	find debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
 	mkdir -p debian/$(p_base)/usr/share/doc
-	mkdir -p debian/$(p_dbg)/usr/share/doc
 	mkdir -p debian/$(p_dev)/usr/share/doc
 	mkdir -p debian/$(p_progs)/usr/share/doc
+	mkdir -p debian/$(p_lib)-dbg/usr/share/doc
+	mkdir -p debian/$(p_progs)-dbg/usr/share/doc
 	ln -s $(p_lib) debian/$(p_base)/usr/share/doc/$(p_base)
-	ln -s $(p_lib) debian/$(p_dbg)/usr/share/doc/$(p_dbg)
 	ln -s $(p_lib) debian/$(p_dev)/usr/share/doc/$(p_dev)
+	ln -s $(p_lib) debian/$(p_lib)-dbg/usr/share/doc/$(p_lib)-dbg
+	ln -s $(p_lib) debian/$(p_progs)-dbg/usr/share/doc/$(p_progs)-dbg
 	mv debian/tmp/usr/share/doc/glite-px-proxyrenewal-@MAJOR@.@MINOR@.@REVISION@ debian/$(p_progs)/usr/share/doc/$(p_progs)
 
 binary-indep:
@@ -67,7 +68,8 @@ binary-arch: install
 	dh_installcron
 	dh_install --fail-missing
 	dh_link
-	dh_strip --dbg-package=$(p_dbg)
+	dh_strip -p$(p_lib) --dbg-package=$(p_lib)-dbg
+	dh_strip -p$(p_progs) --dbg-package=$(p_progs)-dbg
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs
-- 
1.8.2.3