Merge lp:~tormodvolden/ubuntu/lucid/pkg-create-dbgsym/doublestrip into lp:pkg-create-dbgsym

[Tormod Volden]

[Martin Pitt (pitti)]

This looks good, thanks! I'll add a test case first, and then merge this.

review: Approve

[Martin Pitt (pitti)]

Ah, unfortunately this check isn't sufficient -- it will still cause a rebuild of the ddeb packages, which breaks their control fields (see failure of the test suite when this is merged). I'll figure this out, don't worry.

review: Needs Fixing

[Tormod Volden (tormodvolden)]

I think a good test case would be the xserver variant:
dh_strip --debug-package=something-dbg
dh_strip -s --remaining_packages

[Tormod Volden (tormodvolden)]

I haven't checked but I thought it would / think it should not build ddeb packages if it could not find a file to strip.

[Martin Pitt (pitti)]

Tormod Volden [2010-04-22 7:48 -0000]:
> I haven't checked but I thought it would / think it should not build
> ddeb packages if it could not find a file to strip.

Right, that's what I'm implementing now.

[Martin Pitt (pitti)]

Hm, I couldn't get it to work reliably with an approach like this. I now committed a check based on the existence of the ddeb in debian/files, which passes all tests and fixes this bug.

Unmerged revisions

177. By Tormod Volden on 2010-04-21

add changelog entry

176. By Tormod Volden on 2010-04-21

do not strip an already stripped file

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-20 09:01:45 +0000
+++ debian/changelog	2010-04-21 20:49:15 +0000
@@ -1,3 +1,11 @@
+pkg-create-dbgsym (0.42) lucid; urgency=low
+
+  * Do not strip a binary which for any reason is already stripped.
+    It will make a useless debug file, potentially overwriting
+    a good one, and also overwrite the debug link. (LP: 562418)
+
+ -- Tormod Volden <[e-mail]>  Wed, 21 Apr 2010 21:29:51 +0200
+
 pkg-create-dbgsym (0.41) lucid; urgency=low
 
   * tests/dhtest.dbg2: Add a new package dhtest2-extra which we exclude from

=== modified file 'pkg_create_dbgsym'
--- pkg_create_dbgsym	2010-01-14 15:33:25 +0000
+++ pkg_create_dbgsym	2010-04-21 20:49:15 +0000
@@ -73,6 +73,8 @@
     if [ -n "$blacklist" ]; then
         if echo "$f" | fgrep -q "$blacklist"; then continue; fi
     fi
+    # ignore already stripped files
+    file "$f" | grep -q "not stripped" || continue
 
     mkdir -p $dp/usr/lib/debug/`dirname "$f"`
     objcopy --only-keep-debug "$f" "$dp/usr/lib/debug/$f" || {