[SCM] Packaging for muparser branch, master, updated. debian/2.1.0-1-3-g9ad0187

Scott Howard showard at debian.org
Sun Jan 8 23:10:38 UTC 2012


The following commit has been merged in the master branch:
commit c7da24eb514a823764b5bc7bd0c2d0653bea385b
Author: Scott Howard <showard at debian.org>
Date:   Sun Jan 8 17:57:43 2012 -0500

    Fix FTBFS on GNU/Hurd (Closes: #533817). debian/patches/FTBFS_hurd.patch

diff --git a/debian/changelog b/debian/changelog
index df39b1f..0330d43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+muparser (2.1.0-2) experimental; urgency=low
+
+  * Fix FTBFS on GNU/Hurd (Closes: #533817).
+    debian/patches/FTBFS_hurd.patch
+
+ -- Scott Howard <showard at debian.org>  Sun, 08 Jan 2012 17:55:15 -0500
+
 muparser (2.1.0-1) experimental; urgency=low
 
   * New upstream release, updated debian/watch
diff --git a/debian/clean b/debian/clean
index bc8d550..4963b3e 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1,3 @@
 build/autoconf/config.guess
 build/autoconf/config.sub
+configure
diff --git a/debian/patches/FTBFS_hurd.patch b/debian/patches/FTBFS_hurd.patch
new file mode 100644
index 0000000..aadbdb7
--- /dev/null
+++ b/debian/patches/FTBFS_hurd.patch
@@ -0,0 +1,26 @@
+Description: Allow building on hurd
+Author: Scott Howard <showard at debian.org>
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=533817
+
+Index: muparser/build/autoconf/aclocal.m4
+===================================================================
+--- muparser.orig/build/autoconf/aclocal.m4	2012-01-08 14:56:07.302415724 -0500
++++ muparser/build/autoconf/aclocal.m4	2012-01-08 17:28:31.271388524 -0500
+@@ -1257,7 +1257,7 @@
+       ;;
+ 
+       powerpc-apple-macos* | \
+-      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
++      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | *-*-gnu* | \
+       *-*-mirbsd* | \
+       *-*-sunos4* | \
+       *-*-osf* | \
+@@ -1308,7 +1308,7 @@
+     SONAME_FLAG=
+ 
+     case "${BAKEFILE_HOST}" in
+-      *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
++      *-*-linux* | *-*-gnu* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+       *-*-k*bsd*-gnu | *-*-mirbsd* )
+         if test "x$SUNCXX" = "xyes"; then
+             SONAME_FLAG="-h "
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2504a1b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+FTBFS_hurd.patch
diff --git a/debian/rules b/debian/rules
index 67f6f38..3fa8571 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,11 +6,10 @@
 	dh $@
 
 override_dh_auto_configure:
+	bash build/autoconf/acregen.sh
 	cp /usr/share/misc/config.sub build/autoconf
 	cp /usr/share/misc/config.guess build/autoconf
-	chmod +x configure
 	dh_auto_configure
-	chmod -x configure
 
 get-orig-source:
 	uscan --repack --rename --download-current-version

-- 
Packaging for muparser



More information about the debian-science-commits mailing list