[SCM] ois/master: debian/patches/autotools.diff

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Apr 6 08:07:48 UTC 2012


The following commit has been merged in the master branch:
commit d70ee816ec681a26025d8e290d15fed5bc205ed4
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Apr 6 09:45:20 2012 +0200

    debian/patches/autotools.diff
    
    - Don't patch bootstrap anymore, we'll call autoreconf in debian/rules.
    - Set 'foreign' in AC_INIT_AUTOMAKE since this is not a GNU-style project.

diff --git a/debian/patches/autotools.diff b/debian/patches/autotools.diff
index 887a45d..87f8868 100644
--- a/debian/patches/autotools.diff
+++ b/debian/patches/autotools.diff
@@ -1,14 +1,18 @@
-Index: ois/bootstrap
-===================================================================
---- ois.orig/bootstrap	2009-03-18 14:07:02.179273915 +0100
-+++ ois/bootstrap	2009-03-18 14:07:06.667595466 +0100
-@@ -1,9 +1,5 @@
- #!/bin/sh
+Description: Add "foreign" to AC_INIT_AUTOMAKE since this doesn't
+ adhere to GNU-style.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: no
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+--- ois.orig/configure.ac
++++ ois/configure.ac
+@@ -4,7 +4,7 @@ AC_PREREQ(2.50)
+ AC_INIT( [OIS], 1.3.0 )
  
--# Deal with some gentoo-specific issues
--export WANT_AUTOMAKE='1.7'
--export WANT_AUTOCONF='2.5'
--
- # clean up files which cause confusion when switch versions of auto*
- rm -rf autom4te.cache
+ AC_CANONICAL_TARGET
+-AM_INIT_AUTOMAKE( [OIS], 1.3.0 )
++AM_INIT_AUTOMAKE([1.3.0 foreign])
+ AM_CONFIG_HEADER([includes/config.h])
  
+ dnl Check for programs

-- 
ois packaging



More information about the pkg-multimedia-commits mailing list