debdiff: make debdiff "patch -p1" compatible for native packages (or when interdiff not available)

Bug #136863 reported by Daniel Hahler
6
Affects Status Importance Assigned to Milestone
devscripts (Debian)
Fix Released
Unknown
devscripts (Ubuntu)
Fix Released
Wishlist
Martin Pitt

Bug Description

Binary package hint: devscripts

Currently I'm using the following script snippet to make a debdiff compatible for "patch -p1":
sed -i -r 's~^(---|\+\+\+) /tmp/\w+/~\1 ~g' foo.dsc.diff

Normally, debdiff uses interdiff to accomplish this, but only if there are diff files available. This is not the case for Debian/Ubuntu native packages at least (e.g. missingpy).

Does it make sense to add this functionality to the debdiff script?

Related branches

Changed in devscripts:
importance: Undecided → Wishlist
Changed in devscripts:
status: Unknown → New
Revision history for this message
Daniel Holbach (dholbach) wrote :

Bug spam due to bug 176085.

Revision history for this message
Tormod Volden (tormodvolden) wrote :

The macro ###VERSION### got hardcoded to 2.10.11ubuntu1 in your patch, was that intentional?

-This is $progname, from the Debian devscripts package, version ###VERSION###
+This is $progname, from the Debian devscripts package, version 2.10.11ubuntu1

Revision history for this message
Daniel Hahler (blueyed) wrote :

No, the macro was not hardcoded intentionally. I've updated the diff (and it's not in the patch sent to Debian).
Thanks, Tormod, for pointing this out.

Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package devscripts - 2.10.11ubuntu2

---------------
devscripts (2.10.11ubuntu2) hardy; urgency=low

  * scripts/debdiff.pl:
    Make diff output p1-compatible, when interdiff is not used
    (either for native packages or if not available) (LP: #136863)

 -- dAniel hAhler <email address hidden> Thu, 13 Dec 2007 19:20:43 +0100

Changed in devscripts:
status: In Progress → Fix Released
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks dAniel, uploaded.

Changed in devscripts:
assignee: nobody → pitti
status: New → In Progress
Changed in devscripts:
status: New → Fix Committed
Changed in devscripts:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.