Your message dated Mon, 24 Oct 2011 00:02:09 +0000
with message-id <[email protected]>
and subject line Bug#638864: fixed in dpatch 2.0.33
has caused the Debian Bug report #638864,
regarding dpatch-edit-patch fails if there is binary data in the patch
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
638864: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638864
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: dpatch
Version: 2.0.31
Severity: normal


dpatch-edit-patch fails with the following message if there is binary
data (e.g. an image) in your patch:

dpatch-edit-patch: @DPATCH@ tag found, preserving dpatch header.
head: Binary file <filename> matches: invalid number of lines

This can be fixed trivially by applying the following patch:

--- /usr/bin/dpatch-edit-patch.orig     2011-08-16 09:04:23.000000000 +0100
+++ /usr/bin/dpatch-edit-patch  2011-08-22 15:55:26.000000000 +0100
@@ -355,7 +355,7 @@
     dpep_message norm "Updating patch $OLDPATCH"
     # Need another temporary file.
     NEWPATCH="$(tempfile -m 666 -d "$WORKDIR")"
-    DPEP_TAGLINENUM="$(grep -n '^@DPATCH@$' "$OLDPATCH" | head -n1 | cut -f1 
-d:)"
+    DPEP_TAGLINENUM="$(grep -an '^@DPATCH@$' "$OLDPATCH" | head -n1 | cut -f1 
-d:)"
     if [ "$DPEP_TAGLINENUM" ]; then
        # They have our tag, so we can preserve their headers.
        dpep_message norm "@DPATCH@ tag found, preserving dpatch header."


-- System Information:
Debian Release: 6.0.2
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages dpatch depends on:
ii  bash                          4.1-3      The GNU Bourne Again SHell

Versions of packages dpatch recommends:
ii  dpkg-dev                      1.15.8.11  Debian package development tools
ii  fakeroot                      1.14.4-1   Gives a fake root environment
ii  patchutils                    0.3.1-2    Utilities to work with patches

Versions of packages dpatch suggests:
ii  curl                          7.21.0-2   Get a file from an HTTP, HTTPS or

-- no debconf information



--- End Message ---
--- Begin Message ---
Source: dpatch
Source-Version: 2.0.33

We believe that the bug you reported is fixed in the latest version of
dpatch, which is due to be installed in the Debian FTP archive:

dpatch_2.0.33.dsc
  to main/d/dpatch/dpatch_2.0.33.dsc
dpatch_2.0.33.tar.gz
  to main/d/dpatch/dpatch_2.0.33.tar.gz
dpatch_2.0.33_all.deb
  to main/d/dpatch/dpatch_2.0.33_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Gergely Nagy <[email protected]> (supplier of updated dpatch 
package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Sun, 23 Oct 2011 23:09:08 +0200
Source: dpatch
Binary: dpatch
Architecture: source all
Version: 2.0.33
Distribution: unstable
Urgency: low
Maintainer: Gergely Nagy <[email protected]>
Changed-By: Gergely Nagy <[email protected]>
Description: 
 dpatch     - patch maintenance system for Debian source packages
Closes: 638864
Changes: 
 dpatch (2.0.33) unstable; urgency=low
 .
   * dpatch is now DEPRECATED, please do not use it for new packages.
     + NEWS and manual pages updated accordingly.
 .
   * dpatch-edit-patch does not fail anymore when there is binary data in
     the patch. Patch from Ben Brown (Closes: #638864).
Checksums-Sha1: 
 c70edace0543baa549377e73a8da1dffbd496781 864 dpatch_2.0.33.dsc
 f6a47647c88335f07ac0757ede64dd683f34b0ed 92549 dpatch_2.0.33.tar.gz
 1df72eb75fef065f0549631e6d1bb65c40015fa3 95868 dpatch_2.0.33_all.deb
Checksums-Sha256: 
 0bdaabe572f23fd7627063c63c4bd1120869abec36fc864be0dc9320f68d2c6c 864 
dpatch_2.0.33.dsc
 33aa211a3a00407c3041aa6fc3424740b7d4bb3a795c8464e9dd0aeaffe7bf1b 92549 
dpatch_2.0.33.tar.gz
 691515b2eb9bc3f5f505a92301ba38e8d17f9b3fcce33656990730299635cbe2 95868 
dpatch_2.0.33_all.deb
Files: 
 786b934de47978b9e599c29742e768b9 864 vcs optional dpatch_2.0.33.dsc
 ed876c55d5b41f8f23909f1a14ecda42 92549 vcs optional dpatch_2.0.33.tar.gz
 e40526e4b4329e68a2e6b1947dd1bb48 95868 vcs optional dpatch_2.0.33_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEARECAAYFAk6kp/AACgkQMDatjqUaT930fACdHOA6euezJbFTxgQd9kM4mpAv
GikAn0CjtV2QDfujVmBYQ1zxFEDFrXDI
=W9yU
-----END PGP SIGNATURE-----



--- End Message ---

Reply via email to