summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--debian/changelog2
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c95d51a..007faae 100644
--- a/Makefile
+++ b/Makefile
@@ -59,11 +59,11 @@ clean: etckeeper.spec etckeeper.version
rm -rf build
etckeeper.spec:
- sed -i~ "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" etckeeper.spec
+ sed -i~ "s/Version:.*/Version: $$(perl -e '$$_=<>;m/\((.*?)(-.*)?\)/;print $$1;'<debian/changelog)/" etckeeper.spec
rm -f etckeeper.spec~
etckeeper.version:
- sed -i~ "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)\"/" etckeeper
+ sed -i~ "s/Version:.*/Version: $$(perl -e '$$_=<>;m/\((.*?)(-.*)?\)/;print $$1;' <debian/changelog)\"/" etckeeper
rm -f etckeeper~
.PHONY: etckeeper.spec etckeeper.version
diff --git a/debian/changelog b/debian/changelog
index 8341214..ff5a644 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ etckeeper (1.18.3) UNRELEASED; urgency=medium
* Added support for pacmatic, contributed by nicolaichuk.
* bzr: make sure EMAIL is defined
Thanks, Serge E. Hallyn
+ * Fix Makefile version patterns to ignore non-native version number
+ (Antoine Beaupré)
-- Joey Hess <id@joeyh.name> Mon, 21 Sep 2015 16:38:03 -0400