Merge lp://staging/~tormodvolden/ubuntu/lucid/pkg-create-dbgsym/doublestrip into lp://staging/ubuntu/lucid/pkg-create-dbgsym
Proposed by
Tormod Volden
| Status: | Rejected |
|---|---|
| Rejected by: | Martin Pitt |
| Proposed branch: | lp://staging/~tormodvolden/ubuntu/lucid/pkg-create-dbgsym/doublestrip |
| Merge into: | lp://staging/ubuntu/lucid/pkg-create-dbgsym |
| Diff against target: |
4778 lines (+3968/-0) (has conflicts) 155 files modified
.bzrignore (+4/-0) debian/changelog (+439/-0) debian/compat (+1/-0) debian/control (+22/-0) debian/copyright (+24/-0) debian/pkg-create-dbgsym.install (+2/-0) debian/pkg-create-dbgsym.lintian-overrides (+1/-0) debian/postrm (+19/-0) debian/preinst (+19/-0) debian/rules (+15/-0) dh_strip (+205/-0) pkg_create_dbgsym (+149/-0) tests/cdbstest/Makefile (+18/-0) tests/cdbstest/crash.c (+34/-0) tests/cdbstest/crash2.c (+39/-0) tests/cdbstest/debian/cdbstest1.install (+1/-0) tests/cdbstest/debian/cdbstest2.install (+1/-0) tests/cdbstest/debian/changelog (+5/-0) tests/cdbstest/debian/compat (+1/-0) tests/cdbstest/debian/control (+31/-0) tests/cdbstest/debian/copyright (+1/-0) tests/cdbstest/debian/rules (+10/-0) tests/dhtest.archspecific/Makefile (+18/-0) tests/dhtest.archspecific/crash.c (+34/-0) tests/dhtest.archspecific/crash2.c (+39/-0) tests/dhtest.archspecific/debian/changelog (+5/-0) tests/dhtest.archspecific/debian/compat (+1/-0) tests/dhtest.archspecific/debian/control (+31/-0) tests/dhtest.archspecific/debian/copyright (+1/-0) tests/dhtest.archspecific/debian/dhtest-i386.install (+1/-0) tests/dhtest.archspecific/debian/dhtest-ppc.install (+1/-0) tests/dhtest.archspecific/debian/dhtest64.install (+1/-0) tests/dhtest.archspecific/debian/rules (+76/-0) tests/dhtest.compat1/Makefile (+18/-0) tests/dhtest.compat1/crash.c (+34/-0) tests/dhtest.compat1/crash2.c (+39/-0) tests/dhtest.compat1/debian/changelog (+5/-0) tests/dhtest.compat1/debian/control (+25/-0) tests/dhtest.compat1/debian/copyright (+1/-0) tests/dhtest.compat1/debian/rules (+75/-0) tests/dhtest.compat1override/Makefile (+18/-0) tests/dhtest.compat1override/crash.c (+34/-0) tests/dhtest.compat1override/crash2.c (+39/-0) tests/dhtest.compat1override/debian/changelog (+5/-0) tests/dhtest.compat1override/debian/compat (+1/-0) tests/dhtest.compat1override/debian/control (+25/-0) tests/dhtest.compat1override/debian/copyright (+1/-0) tests/dhtest.compat1override/debian/rules (+77/-0) tests/dhtest.compatenvvar/Makefile (+18/-0) tests/dhtest.compatenvvar/crash.c (+34/-0) tests/dhtest.compatenvvar/crash2.c (+39/-0) tests/dhtest.compatenvvar/debian/changelog (+5/-0) tests/dhtest.compatenvvar/debian/control (+13/-0) tests/dhtest.compatenvvar/debian/copyright (+1/-0) tests/dhtest.compatenvvar/debian/rules (+64/-0) tests/dhtest.dbg/Makefile (+18/-0) tests/dhtest.dbg/crash.c (+34/-0) tests/dhtest.dbg/crash2.c (+39/-0) tests/dhtest.dbg/debian/changelog (+5/-0) tests/dhtest.dbg/debian/compat (+1/-0) tests/dhtest.dbg/debian/control (+31/-0) tests/dhtest.dbg/debian/copyright (+1/-0) tests/dhtest.dbg/debian/dhtest1.install (+1/-0) tests/dhtest.dbg/debian/dhtest2.install (+1/-0) tests/dhtest.dbg/debian/rules (+87/-0) tests/dhtest.dbg2/Makefile (+18/-0) tests/dhtest.dbg2/crash.c (+34/-0) tests/dhtest.dbg2/crash2.c (+39/-0) tests/dhtest.dbg2/debian/changelog (+5/-0) tests/dhtest.dbg2/debian/compat (+1/-0) tests/dhtest.dbg2/debian/control (+37/-0) tests/dhtest.dbg2/debian/copyright (+1/-0) tests/dhtest.dbg2/debian/dhtest1.install (+1/-0) tests/dhtest.dbg2/debian/dhtest2.install (+1/-0) tests/dhtest.dbg2/debian/rules (+89/-0) tests/dhtest.dbg3/Makefile (+18/-0) tests/dhtest.dbg3/crash.c (+34/-0) tests/dhtest.dbg3/crash2.c (+39/-0) tests/dhtest.dbg3/debian/changelog (+5/-0) tests/dhtest.dbg3/debian/compat (+1/-0) tests/dhtest.dbg3/debian/control (+31/-0) tests/dhtest.dbg3/debian/copyright (+1/-0) tests/dhtest.dbg3/debian/dhtest1.install (+1/-0) tests/dhtest.dbg3/debian/dhtest2.install (+1/-0) tests/dhtest.dbg3/debian/rules (+86/-0) tests/dhtest.noargs/Makefile (+19/-0) tests/dhtest.noargs/crash.c (+34/-0) tests/dhtest.noargs/crash2.c (+39/-0) tests/dhtest.noargs/debian/changelog (+5/-0) tests/dhtest.noargs/debian/compat (+1/-0) tests/dhtest.noargs/debian/control (+29/-0) tests/dhtest.noargs/debian/copyright (+1/-0) tests/dhtest.noargs/debian/dhtest1.install (+1/-0) tests/dhtest.noargs/debian/dhtest2.install (+1/-0) tests/dhtest.noargs/debian/rules (+69/-0) tests/dhtest.nostrip/Makefile (+19/-0) tests/dhtest.nostrip/crash.c (+34/-0) tests/dhtest.nostrip/crash2.c (+39/-0) tests/dhtest.nostrip/debian/changelog (+5/-0) tests/dhtest.nostrip/debian/compat (+1/-0) tests/dhtest.nostrip/debian/control (+30/-0) tests/dhtest.nostrip/debian/copyright (+1/-0) tests/dhtest.nostrip/debian/dhtest1.install (+1/-0) tests/dhtest.nostrip/debian/dhtest2-nostrip.install (+2/-0) tests/dhtest.nostrip/debian/rules (+84/-0) tests/dhtest.samename/Makefile (+18/-0) tests/dhtest.samename/crash.c (+34/-0) tests/dhtest.samename/crash2.c (+39/-0) tests/dhtest.samename/debian/changelog (+5/-0) tests/dhtest.samename/debian/compat (+1/-0) tests/dhtest.samename/debian/control (+29/-0) tests/dhtest.samename/debian/copyright (+1/-0) tests/dhtest.samename/debian/dhtest.samename.install (+1/-0) tests/dhtest.samename/debian/dhtest1.install (+1/-0) tests/dhtest.samename/debian/rules (+76/-0) tests/dhtest.tmpdirarg/Makefile (+18/-0) tests/dhtest.tmpdirarg/crash.c (+34/-0) tests/dhtest.tmpdirarg/crash2.c (+39/-0) tests/dhtest.tmpdirarg/debian/changelog (+5/-0) tests/dhtest.tmpdirarg/debian/compat (+1/-0) tests/dhtest.tmpdirarg/debian/control (+12/-0) tests/dhtest.tmpdirarg/debian/copyright (+1/-0) tests/dhtest.tmpdirarg/debian/dhtest1.install (+1/-0) tests/dhtest.tmpdirarg/debian/rules (+57/-0) tests/dhtest.versionoverride/Makefile (+18/-0) tests/dhtest.versionoverride/crash.c (+34/-0) tests/dhtest.versionoverride/crash2.c (+39/-0) tests/dhtest.versionoverride/debian/changelog (+5/-0) tests/dhtest.versionoverride/debian/compat (+1/-0) tests/dhtest.versionoverride/debian/control (+18/-0) tests/dhtest.versionoverride/debian/copyright (+1/-0) tests/dhtest.versionoverride/debian/dhtest1.install (+1/-0) tests/dhtest.versionoverride/debian/dhtest2.install (+1/-0) tests/dhtest.versionoverride/debian/rules (+57/-0) tests/dhtest.whitespace/Makefile (+18/-0) tests/dhtest.whitespace/crash.c (+34/-0) tests/dhtest.whitespace/crash2.c (+39/-0) tests/dhtest.whitespace/debian/changelog (+5/-0) tests/dhtest.whitespace/debian/compat (+1/-0) tests/dhtest.whitespace/debian/control (+35/-0) tests/dhtest.whitespace/debian/copyright (+1/-0) tests/dhtest.whitespace/debian/dhtest1.install (+1/-0) tests/dhtest.whitespace/debian/dhtest2.install (+1/-0) tests/dhtest.whitespace/debian/rules (+76/-0) tests/dhtest/Makefile (+18/-0) tests/dhtest/crash.c (+34/-0) tests/dhtest/crash2.c (+39/-0) tests/dhtest/debian/changelog (+5/-0) tests/dhtest/debian/compat (+1/-0) tests/dhtest/debian/control (+30/-0) tests/dhtest/debian/copyright (+1/-0) tests/dhtest/debian/dhtest1.install (+1/-0) tests/dhtest/debian/dhtest2.install (+1/-0) tests/dhtest/debian/rules (+76/-0) tests/run (+107/-0) Conflict adding file debian. Moved existing file to debian.moved. Conflict adding file dh_strip. Moved existing file to dh_strip.moved. Conflict adding file pkg_create_dbgsym. Moved existing file to pkg_create_dbgsym.moved. Conflict adding file tests. Moved existing file to tests.moved. |
| To merge this branch: | bzr merge lp://staging/~tormodvolden/ubuntu/lucid/pkg-create-dbgsym/doublestrip |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Martin Pitt (pitti) wrote | # |
Unmerged revisions
- 177. By Tormod Volden
-
add changelog entry
- 176. By Tormod Volden
-
do not strip an already stripped file
- 175. By Martin Pitt
-
releasing version 0.41
- 174. By Martin Pitt
-
dh_strip: Fix the "is this package in this list" grep to only match on
whitespace separation, not on e. g. dashes (which grep -w does). This
caused some ddebs like "libglib2.0-0-dbgsym" not to be built if dh_strip
was called with ignoring a similar package name (-Nlibglib2.0-0-refdbg) .
To make this more robust, define a new shell function in_list() for this
and just implement it once. (LP: #566602) - 173. By Martin Pitt
-
tests/dhtest.dbg2: Add a new package dhtest2-extra which we exclude from
dh_strip with -N. This causes dhtest2-dbgsym to not be generated and thus
reproduces LP #566602. - 172. By Martin Pitt
-
releasing version 0.40
- 171. By Martin Pitt
-
Strip -O from options passed from dh not only for comparison but also for
processing them. (LP: #520767) - 170. By Martin Pitt
-
releasing version 0.39
- 169. By Martin Pitt
-
Strip -O from options passed from dh (LP: #520767).
- 168. By Loïc Minier
-
Release 0.38
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Wrong branch, using the other merge request in https:/
Thanks!