#417932 [debdiff] allow running debdiff on .orig.tar.gz and .diff.gz

Package:
devscripts
Source:
devscripts
Description:
scripts to make the life of a Debian Package maintainer easier
Submitter:
Loïc Minier
Date:
2010-03-30 15:36:09 UTC
Severity:
wishlist
#417932#5
Date:
2007-04-05 14:29:15 UTC
From:
To:
        Hi,

 nmudiff includes the full debdiff when preparing a new upstream
 release:
bee% lsdiff orbit2-2.14.5-0.1-nmu.diff
/tmp/k7tXieDrqT/orbit2-2.14.4/acinclude.m4
/tmp/k7tXieDrqT/orbit2-2.14.4/ChangeLog
/tmp/k7tXieDrqT/orbit2-2.14.4/configure
[...]
/tmp/k7tXieDrqT/orbit2-2.14.4/debian/changelog
[...]
/tmp/k7tXieDrqT/orbit2-2.14.4/test/inhibit/Makefile.in
/tmp/k7tXieDrqT/orbit2-2.14.4/test/Makefile.in
/tmp/k7tXieDrqT/orbit2-2.14.4/test/poa/Makefile.in

 This is not very useful, the maintainer usually only cares about the
 delta between the two diff.gz.  Interdiff gives usually good results
 when the change are truly a diff:
bee% interdiff -z -p1 orbit2_2.14.4-1.1.diff.gz orbit2_2.14.5-0.1.diff.gz
--- orbit2-2.14.4/debian/changelog
+++ orbit2-2.14.5/debian/changelog
@@ -1,4 +1,4 @@
-orbit2 (1:2.14.4-1.1) unstable; urgency=low
+orbit2 (1:2.14.5-0.1) unstable; urgency=low

   * Non-maintainer upload.
   * New upstream stable release; no ABI change, one small backward-compatible

   Bye,

#417932#10
Date:
2007-04-05 17:59:08 UTC
From:
To:
Loïc Minier wrote:

Ofcourse it does, the new upstream is part of the NMU.

I don't agree, if someone wants to NMU one of my packages or one of the
packages I care about (and even as NMUer) I want the changes of the new
upstream in the diff that gets attached to the bug log.

A possibility would be to split it in two files though?

Cheers

Luk

#417932#17
Date:
2007-08-05 08:47:16 UTC
From:
To:
retitle 417932 running debdiff on .orig.tar.gz and .diff.gz
stop

 I suppose it depends on the exact package and the way the changes are
 done; lenghty details follow.

 I can understand why it's useful to diff the tarball AND the .diff.gz
 when:
 - this is a new upstream release
 - some changes are done directly in the .diff.gz and not via
   debian/patches and hence might move between the diff and tarball

 I use debdiff in a number of cases on *.changes or *.deb between
 uploads of my packages, but I would like to use debdiff when I'm
 sending patches to the security team (I currently use interdiff), when
 I'm preparing a NMU (I'm using nmudiff, but often save the file and
 exit Mutt to check it), and when I'm reviewing packages to sponsor.

 The reason I've asked for the change is mostly for the last use case
 where I basically mirror my own way of preparing a new upstream
 release: I diff the upstream tarballs and do the related packaging
 changes.  When I'm asked to sponsor a new upstream release, I'll
 typically depack both upstream tarball, diff them manually, then I'll
 try to diff the two .diff.gz via interdiff or if this fails diff the
 two unpacked debian/.


 I understand why some person would find the current behavior
 interesting, so I retract my initial request and propose an alternate
 change instead: allow to run debdiff on tarballs and on .diff.gz files.
 This would save me from unpacking the upstream tarball alone (which
 often requires wiping an unpacked package tree), and from diffing and
 interdiffing manually with the proper options.  I would then basically
 adapt my uses to be:
    debdiff <old>.orir.tar.gz <new>.orig.tar.gz
    debdiff <old>.diff.gz <new>.diff.gz

 While running debdiff on .dsc file will probably not be in my personal
 interests, I suppose it could simply be the result of concatening the
 results of the above two commands.


 I hope I expressed my needs clearly enough and the propsal makes sense.

#417932#22
Date:
2007-08-10 08:41:43 UTC
From:
To:
Loïc Minier wrote:

Well yes, that was kind of my suggestion to be able to split the diff
into two files. Of course adding the possibility to debdiff diff.gz
could be a way to do that.

Cheers

Luk