[arename] 01/03: Fix FTBFS if building from a git checkout with tags with slashes
Axel Beckert
abe at deuxchevaux.org
Sat May 23 17:50:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch master
in repository arename.
commit 8a1240f35a746c6a4e3c0b2c4d88ff65de8ec4d6
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Sat May 23 19:36:35 2015 +0200
Fix FTBFS if building from a git checkout with tags with slashes
---
debian/changelog | 2 ++
debian/patches/cope-with-slashes-in-tag-names.patch | 20 ++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 23 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 97c2c06..55b9c44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ arename (4.0-3) UNRELEASED; urgency=low
* Apply wrap-and-sort
* Remove Maximilian Gaß from Uploaders (no more active according to himself)
* Update Homepage URL. (Thanks DUCK!)
+ * Add patches for:
+ + Fixing FTBFS if building from a git checkout with tags with slashes.
[ Salvatore Bonaccorso ]
* Update Vcs-Browser URL to cgit web frontend
diff --git a/debian/patches/cope-with-slashes-in-tag-names.patch b/debian/patches/cope-with-slashes-in-tag-names.patch
new file mode 100644
index 0000000..7b508c0
--- /dev/null
+++ b/debian/patches/cope-with-slashes-in-tag-names.patch
@@ -0,0 +1,20 @@
+Description: Fix FTBFS if building from a git checkout with tags with slashes
+ If built from a checkout of the Debian package, there are commonly
+ tags like debian/4.0-2, i.e. tags which include a slash. This fails
+ due to sed using slashes as delimiter for the tag-based version
+ replacement, too.
+Author: Axel Beckert <abe at debian.org>
+
+Index: arename/bin/genperlscripts.sh
+===================================================================
+--- arename.orig/bin/genperlscripts.sh 2015-05-23 18:24:17.799474077 +0200
++++ arename/bin/genperlscripts.sh 2015-05-23 19:26:13.428720948 +0200
+@@ -20,7 +20,7 @@
+
+ printf 'Generating '\''%s'\''... ' "${scr}"
+
+- sed -e 's/@@arenameversioninfo@@/'"${version}"'/' \
++ sed -e 's:@@arenameversioninfo@@:'"${version}"':' \
+ -e 's:@@perl@@:'"${PERL}"':' < "${scr}.in" > "${scr}"
+ chmod +x "${scr}"
+
diff --git a/debian/patches/series b/debian/patches/series
index cfdac44..21d156b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
spelling.patch
VERSION.patch
+cope-with-slashes-in-tag-names.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/arename.git
More information about the Pkg-perl-cvs-commits
mailing list