[SCM] Debian packaging for apache2 branch, next, updated. debian/2.4.4-2-12-ga193314

Arno Töll arno at debian.org
Tue May 14 17:17:04 UTC 2013


The following commit has been merged in the next branch:
commit a193314e30e0e0a0d2b490a7105fc6c90cc69748
Author: Arno Töll <arno at debian.org>
Date:   Tue May 14 19:16:58 2013 +0200

    Make DEBIAN_VERSION parsing in debian/rules more robust

diff --git a/debian/changelog b/debian/changelog
index 2a8be5c..c1737bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,13 +22,15 @@ apache2 (2.4.4-3) UNRELEASED; urgency=low
   * Fix "apxs2 outputs "uninitialized value" warnings" by removing the double
     declaration of variables in apxs. This problem was harmless, but noisy
     (Closes: #707109)
+  * Make the DEBIAN_VERSION parsing in debian/rules more robust. Thanks to
+    Ondřej Surý for noticing and providing a patch.
 
   [ Stefan Fritsch ]
   * Remove paragraph about MaxMemFree in README.Debian. The issue should be
     fixed in 2.4.
   * Enable mod_authn_core when upgrading from wheezy (Closes: #702866)
 
- -- Arno Töll <arno at debian.org>  Sun, 12 May 2013 17:06:18 +0200
+ -- Arno Töll <arno at debian.org>  Tue, 14 May 2013 19:15:12 +0200
 
 apache2 (2.4.4-2) experimental; urgency=low
 
diff --git a/debian/rules b/debian/rules
index e1f187f..aa24684 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
 
 LSB_RELEASE := $(shell lsb_release -i -s)
 SERVER_VERSION := $(shell dpkg-parsechangelog | perl -ne 'print $$1 if m/Version:\s*([\d\.]+)/')
-DEBIAN_VERSION := $(shell dpkg-parsechangelog | perl -ne 'print $$1 if m/Version:\s*([\d\.\-]+)/')
+DEBIAN_VERSION := $(shell dpkg-parsechangelog | perl -ne 'print $$1 if m/Version:\s*(.+)/')
 MODULE_DIR := /usr/lib/apache2/modules/
 API = $(shell perl -ne 'print $$1 if m/define\s+MODULE_MAGIC_NUMBER_MAJOR\s+?(.*)$$/' < include/ap_mmn.h)
 AP2_CFLAGS = -pipe $(shell dpkg-buildflags --get CFLAGS)

-- 
Debian packaging for apache2



More information about the Pkg-apache-commits mailing list