Bug#241860: gtk+2.0: debian/rules file version-determining sed script needs tweak

[Paul Varga]

--=-dzhtj85pWa1skhPpxmSd
Content-Type: multipart/mixed; boundary="=-89oqcT9//TBG5jS/67Ho"


--=-89oqcT9//TBG5jS/67Ho
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Package: gtk+2.0
Severity: minor
Tags: experimental patch

The "debian/rules" file's version-determining sed script needs the
'-packageversion' and '+misc' removers transposed. Due to those two
scripts checking that the replacement ends at the end of a line, they
only work in last-to-first order. I discovered this when building a GTK+
package using a patch I'd written; I used a '+1' suffix to mark the
package as specially modified and this triggered the bug (which mangled
"version" and "modver" pretty badly).

I haven't checked if this applies to non-experimental GTK+ Debian
packaging. Thought I might as well report it.

An extremely simple patch is included as a more detailed answer.

Thanks.

-- System Information:
Debian Release: unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.4.25-1-k7
Locale: LANG=3Den_US.UTF-8, LC_CTYPE=3Den_US.UTF-8

--=-89oqcT9//TBG5jS/67Ho
Content-Description:
Content-Disposition: inline; filename=rules.patch
Content-Type: text/x-patch; charset=ANSI_X3.4-1968
Content-Transfer-Encoding: base64

LS0tIHJ1bGVzCTIwMDQtMDQtMDMgMTM6Mjc6MDEuMDAwMDAwMDAwICswMDAwDQorKysgcnVsZXMu
bmV3CTIwMDQtMDQtMDMgMTM6MjY6NDEuMDAwMDAwMDAwICswMDAwDQpAQCAtMjgsNyArMjgsNyBA
QA0KIGVuZGlmDQogDQogIyMNCi12ZXJzaW9uPSQoc2hlbGwgZHBrZy1wYXJzZWNoYW5nZWxvZyB8
IGdyZXAgJ15WZXJzaW9uOiAnIHwgc2VkIC1lICdzL15WZXJzaW9uOiAvLycgLWUgJ3MvLVtBLVph
LXowLTlcLl0qJCQvL2cnIC1lICdzLytbQS1aYS16MC05XC5dKiQkLy9nJykNCit2ZXJzaW9uPSQo
c2hlbGwgZHBrZy1wYXJzZWNoYW5nZWxvZyB8IGdyZXAgJ15WZXJzaW9uOiAnIHwgc2VkIC1lICdz
L15WZXJzaW9uOiAvLycgLWUgJ3MvK1tBLVphLXowLTlcLl0qJCQvL2cnIC1lICdzLy1bQS1aYS16
MC05XC5dKiQkLy9nJykNCiBtYWpvcj0kKHNoZWxsIGVjaG8gJHt2ZXJzaW9ufSB8IHNlZCAtZSAn
cy9cKF5bMC05XSpcKVwuWzAtOV0qXC5bMC05XSokJC9cMS8nKQ0KIG1pbm9yPSQoc2hlbGwgZWNo
byAke3ZlcnNpb259IHwgc2VkIC1lICdzL15bMC05XSpcLlwoWzAtOV0qXClcLlswLTldKiQkL1wx
LycpDQogcmVsPSQoc2hlbGwgZWNobyAke3ZlcnNpb259IHwgc2VkIC1lICdzL15bMC05XSpcLlsw
LTldKlwuXChbMC05XSpcKSQkL1wxLycpDQo=

--=-89oqcT9//TBG5jS/67Ho--

--=-dzhtj85pWa1skhPpxmSd
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

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

iD8DBQBAbr6WXA1+umfjMJYRArI1AKCsE+xw0lj53Bw7wCuMtiTGSmdcxgCdH6ZG
X+Wjohf9yR7chOwo1d2srLg=
=7xBi
-----END PGP SIGNATURE-----

--=-dzhtj85pWa1skhPpxmSd--