[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.0-25-g23ae51a
Sandro Tosi
morph at debian.org
Tue Mar 31 22:00:58 UTC 2009
The following commit has been merged in the master branch:
commit 23ae51a4df64dc41daa00d1492ae6c1664ceea76
Author: Sandro Tosi <morph at debian.org>
Date: Tue Mar 31 23:50:19 2009 +0200
parse changelog version removing any '+.*' part (to allow rebuild with binNMU version style); thanks to Daniel Schepler for the report; Closes: #522010
diff --git a/debian/changelog b/debian/changelog
index 60925e0..e3674e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ reportbug (4.1) UNRELEASED; urgency=low
Closes: #521186
* debian/rules
- cleanup
+ * debian/{extract_version, rules}
+ - parse changelog version removing any '+.*' part (to allow rebuild with
+ binNMU version style); thanks to Daniel Schepler for the report;
+ Closes: #522010
[ Luca Bruno ]
* bin/reportbug
@@ -28,7 +32,7 @@ reportbug (4.1) UNRELEASED; urgency=low
* debian/copyright, reportbug/ui/gtk2_ui.py
- bump copyright years
- -- Sandro Tosi <morph at debian.org> Thu, 26 Mar 2009 16:29:11 +0100
+ -- Sandro Tosi <morph at debian.org> Tue, 31 Mar 2009 23:40:35 +0200
reportbug (4.0) unstable; urgency=low
diff --git a/debian/extract_version b/debian/extract_version
deleted file mode 100755
index 02efbf5..0000000
--- a/debian/extract_version
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-head -n 1 debian/changelog | sed -e 's/[^(]*(\([^)]*\).*/\1/'
diff --git a/debian/rules b/debian/rules
index 7336609..600c84b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-VERSION=$(shell debian/extract_version)
+VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/^Version: \([^+]*\).*/\1/')
build: build-stamp
build-stamp:
--
Reportbug - reports bugs in the Debian distribution
More information about the Reportbug-commits
mailing list