diff options
| author | Antoine Beaupré <anarcat@koumbit.org> | 2016-01-14 14:59:00 -0500 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-01-14 16:09:19 -0400 |
| commit | 1490c8d6dd94f1b58718f6bc61ba78cf8a0a2e26 (patch) | |
| tree | 8d4946611d4209330431cfca2565071d0336b685 | |
| parent | 43bddb0fdbf63f79d9296dc333d2ba10802dccd8 (diff) | |
fix makefile version patterns to ignore non-native version numbers
(cherry picked from commit 70289c2491fee8aa5dbae4cc5c7425556d60f319)
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -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 |