From 1490c8d6dd94f1b58718f6bc61ba78cf8a0a2e26 Mon Sep 17 00:00:00 2001
From: Antoine Beaupré <anarcat@koumbit.org>
Date: Thu, 14 Jan 2016 14:59:00 -0500
Subject: fix makefile version patterns to ignore non-native version numbers

(cherry picked from commit 70289c2491fee8aa5dbae4cc5c7425556d60f319)
---
 Makefile         | 4 ++--
 debian/changelog | 2 ++
 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
 
-- 
cgit v1.2.3