Package: devscripts
Version: 2.12.6
Severity: normal
Tags: patch

Hi,

I’ve tried to use nmudiff on a package with a slightly weird previous 
changelog entry:

transmission (2.52-3) unstable; urgency=high (fixes CVE-2012-4037)

Apparently this is valid, but nmudiff chokes on the double parenthesis.
Since dpkg-parsechangelog includes necessary options to parse previous 
entries, I’m attaching a simple patch to just remove the manual parsing 
and use dpkg-parsechangelog instead.


-- Package-specific info:

--- /etc/devscripts.conf ---

--- ~/.devscripts ---
DEBDIFF_DIRS=yes
DEBDIFF_CONTROLFILES=ALL
DEBDIFF_SHOW_MOVED=yes
DEBCHANGE_RELEASE_HEURISTIC=changelog
DEBCHANGE_FORCE_SAVE_ON_RELEASE=no

-- System Information:
Debian Release: 7.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages devscripts depends on:
ii  dpkg-dev  1.16.9
ii  libc6     2.13-38
ii  perl      5.14.2-17
ii  python    2.7.3-3

Versions of packages devscripts recommends:
ii  at                        3.1.13-2
ii  curl                      7.28.0-3
ii  dctrl-tools               2.22.2
ii  debian-keyring            2012.11.15
ii  dput                      0.9.6.3+nmu1
ii  equivs                    2.0.9
ii  fakeroot                  1.18.4-2
ii  gnupg                     1.4.12-7
ii  libcrypt-ssleay-perl      0.58-1
ii  libdistro-info-perl       0.10
ii  libjson-perl              2.53-2
ii  libparse-debcontrol-perl  2.005-3
ii  libsoap-lite-perl         0.714-1
ii  liburi-perl               1.60-1
ii  libwww-perl               6.04-1
ii  lintian                   2.5.10.3
ii  man-db                    2.6.3-3
ii  patch                     2.6.1-3
ii  patchutils                0.3.2-1.1
ii  python-debian             0.1.21+nmu2
ii  python-magic              5.11-2
ii  sensible-utils            0.0.7
ii  strace                    4.5.20-2.3
ii  unzip                     6.0-8
ii  wdiff                     1.1.2-1
ii  wget                      1.14-1
ii  xz-utils                  5.1.1alpha+20120614-2

Versions of packages devscripts suggests:
ii  bsd-mailx [mailx]            8.1.2-0.20111106cvs-1
ii  build-essential              11.6
pn  cvs-buildpackage             <none>
pn  devscripts-el                <none>
ii  gnuplot                      4.6.0-8
pn  libauthen-sasl-perl          <none>
pn  libfile-desktopentry-perl    <none>
pn  libnet-smtp-ssl-perl         <none>
pn  libterm-size-perl            <none>
ii  libtimedate-perl             1.2000-1
pn  libyaml-syck-perl            <none>
ii  mutt                         1.5.21-6.2
ii  openssh-client [ssh-client]  1:6.0p1-3
ii  svn-buildpackage             0.8.5
ii  w3m                          0.5.3-8

-- no debconf information

-- 
 .''`.      Josselin Mouette
: :' :
`. `'
  `-
--- /usr/bin/nmudiff	2012-11-25 00:51:46.000000000 +0100
+++ nmudiff	2013-02-14 20:00:51.864737374 +0100
@@ -275,8 +275,7 @@
     fi
 fi
 
-OLDVERSION=$( sed -n "s/^[^ .][^ ]* (\(.*\)).*$/\1/p" debian/changelog | \
-  head -2 | tail -1 )
+OLDVERSION=$( dpkg-parsechangelog -o1 -c1 | grep ^Version: | cut -d" " -f2 )
 if [ -z "$OLDVERSION" ]; then
     echo "nmudiff: could not determine previous package version from changelog!" >&2
     exit 1

Reply via email to