Source: atris
Version: 1.0.7.dfsg.1-7.1
Severity: important
Justification: ftbfs with dash as /bin/sh
Tags: upstream patch
Hi,
atris uses brace expansions (as in {foo,bar,baz}) in its Makefile
but that is not valid POSIX shell syntax (and dash and busybox ash
don't support them). How about this patch?
-- 8< --
Subject: atris: avoid nonportable {foo,bar} expansion in Makefile
Signed-off-by: Jonathan Nieder <[email protected]>
---
debian/changelog | 8 +++
debian/patches/06-atris-1.0.7.brace_expansion.diff | 48 ++++++++++++++++++++
2 files changed, 56 insertions(+), 0 deletions(-)
create mode 100644 debian/patches/06-atris-1.0.7.brace_expansion.diff
diff --git a/debian/changelog b/debian/changelog
index 225cd23..71e3e70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+atris (1.0.7.dfsg.1-7.1.1) local; urgency=low
+
+ * [debian/patches/06-atris-1.0.7.brace_expansion.diff]:
+ Makefile.am: avoid brace expansions (since dash does not
+ support them).
+
+ -- Jonathan Nieder <[email protected]> Sat, 26 Mar 2011 07:25:35 -0500
+
atris (1.0.7.dfsg.1-7.1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/patches/06-atris-1.0.7.brace_expansion.diff
b/debian/patches/06-atris-1.0.7.brace_expansion.diff
new file mode 100644
index 0000000..d72a368
--- /dev/null
+++ b/debian/patches/06-atris-1.0.7.brace_expansion.diff
@@ -0,0 +1,48 @@
+From: Jonathan Nieder <[email protected]>
+Date: Sat, 26 Mar 2011 07:22:24 -0500
+Subject: avoid unportable brace expansion
+
+dash, FreeBSD ash, and busybox ash do not support 'echo {hello,world}'
+expansion.
+
+Signed-off-by: Jonathan Nieder <[email protected]>
+---
+ Makefile.am | 10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git Makefile.am Makefile.am
+index cc07f93..561186a 100644
+--- Makefile.am
++++ Makefile.am
+@@ -59,14 +59,14 @@ install_gamedata:
+ cp -rv graphics \
+ styles \
+ $(target)/
+- -rm -f $(target)/{graphics,styles}/Makefile*
++ -rm -f $(target)/graphics/Makefile* $(target)/styles/Makefile*
+
+ sh mkinstalldirs / $(statedir)/
+ cp -rv Atris.Players \
+ Atris.Scores \
+ $(statedir)/
+- chmod 666 $(statedir)/Atris.{Players,Scores}
+- chown .games $(statedir)/Atris.{Players,Scores}
++ chmod 666 $(statedir)/Atris.Players $(statedir)/Atris.Scores
++ chown .games $(statedir)/Atris.Players $(statedir)/Atris.Scores
+
+ install_gamedocs:
+ sh mkinstalldirs $(target)/
+@@ -90,7 +90,9 @@ zip: distdir $(PACKAGE)
+ mv $(PACKAGE) $(PACKAGE)-$(VERSION)/$(PACKAGE).exe
+ mv $(PACKAGE)-$(VERSION) $(PACKAGE)
+ cp ~/*.dll $(PACKAGE)
+- rm $(PACKAGE)/config* $(PACKAGE)/*.[ch] $(PACKAGE)/Make*
$(PACKAGE)/*.m4 $(PACKAGE)/{install-sh,missing,mkinstalldirs,autogen.sh}
++ rm $(PACKAGE)/config* $(PACKAGE)/*.[ch] $(PACKAGE)/Make* $(PACKAGE)/*.m4
++ rm $(PACKAGE)/install-sh $(PACKAGE)/missing $(PACKAGE)/mkinstalldirs
++ rm $(PACKAGE)/autogen.sh
+ rm $(PACKAGE)/*.in -r $(PACKAGE)/.protos
+ zip -r9 $(PACKAGE)-$(VERSION)-win32.zip $(PACKAGE)
+ rm -r $(PACKAGE)
+--
+1.7.4.1
+
--
1.7.4.1
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
