[SCM] specimen/master: Don't patch the configure file, use dh-autoreconf to regenerate autotools stuff.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sun May 8 08:46:17 UTC 2011
The following commit has been merged in the master branch:
commit 66485bf878cca08681e01e3f54f953bcf00c88a8
Author: Alessio Treglia <alessio at debian.org>
Date: Sun May 8 10:45:34 2011 +0200
Don't patch the configure file, use dh-autoreconf to regenerate autotools stuff.
diff --git a/debian/control b/debian/control
index e92c2d7..65f19c6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
Uploaders: Jaromír Mikeš <mira.mikes at seznam.cz>
Build-Depends: debhelper (>= 7.0.50~),
+ dh-autoreconf,
autotools-dev (>= 20100122.1),
libphat0-dev (>= 0.2.3),
libgtk2.0-dev (>= 2.4.13),
diff --git a/debian/patches/02-gcc46_ftbfs.patch b/debian/patches/02-gcc46_ftbfs.patch
index f7e5ebb..f3cba01 100644
--- a/debian/patches/02-gcc46_ftbfs.patch
+++ b/debian/patches/02-gcc46_ftbfs.patch
@@ -3,11 +3,12 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=625424
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Forwarded: no
---
-Index: specimen/configure.ac
-===================================================================
---- specimen.orig/configure.ac 2011-05-03 23:01:41.000000000 +0200
-+++ specimen/configure.ac 2011-05-03 23:08:44.449147041 +0200
-@@ -51,7 +51,7 @@
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- specimen.orig/configure.ac
++++ specimen/configure.ac
+@@ -51,7 +51,7 @@ AC_CHECK_FUNCS([floor gettimeofday pow s
# pthreads
ACX_PTHREAD
@@ -16,16 +17,3 @@ Index: specimen/configure.ac
AC_SUBST(SPECIMEN_CFLAGS)
CFLAGS="$SPECIMEN_CFLAGS $CFLAGS"
-Index: specimen/configure
-===================================================================
---- specimen.orig/configure 2011-05-03 23:08:58.240694970 +0200
-+++ specimen/configure 2011-05-03 23:09:36.519440198 +0200
-@@ -5607,7 +5607,7 @@
-
-
-
--SPECIMEN_CFLAGS="-Wall -Werror"
-+SPECIMEN_CFLAGS="-Wall"
-
- CFLAGS="$SPECIMEN_CFLAGS $CFLAGS"
-
diff --git a/debian/rules b/debian/rules
index 26ebbe5..9cb529f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
LDFLAGS+=-Wl,--as-needed
%:
- dh --with autotools_dev $@
+ dh $@ --with autoreconf
override_dh_auto_configure:
dh_auto_configure -- --disable-lash
--
specimen packaging
More information about the pkg-multimedia-commits
mailing list