rev 15867 - in kde-extras/kbarcode/trunk/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2009-09-01 21:42:30 +0000 (Tue, 01 Sep 2009)
New Revision: 15867

Added:
   kde-extras/kbarcode/trunk/debian/patches/07_autoconf2.64.diff
   kde-extras/kbarcode/trunk/debian/patches/08_automake-1.1x.diff
Modified:
   kde-extras/kbarcode/trunk/debian/changelog
   kde-extras/kbarcode/trunk/debian/control
   kde-extras/kbarcode/trunk/debian/patches/series
   kde-extras/kbarcode/trunk/debian/rules
Log:
* Add autoconf2.64 fixes. Thanks to pld-linux. Closes: 543014.
* Allow automake 1.11
* reautotool and stuff after applying patches

Modified: kde-extras/kbarcode/trunk/debian/changelog
===================================================================
--- kde-extras/kbarcode/trunk/debian/changelog	2009-09-01 19:35:10 UTC (rev 15866)
+++ kde-extras/kbarcode/trunk/debian/changelog	2009-09-01 21:42:30 UTC (rev 15867)
@@ -1,3 +1,11 @@
+kbarcode (2.0.7-2) UNRELEASED; urgency=low
+
+  * Add autoconf2.64 fixes. Thanks to pld-linux. Closes: 543014.
+  * Allow automake 1.11
+  * reautotool and stuff after applying patches
+
+ -- Sune Vuorela <debian at pusling.com>  Tue, 01 Sep 2009 22:40:31 +0200
+
 kbarcode (2.0.7-1) unstable; urgency=low
 
   * New upstream release (bugfix release).

Modified: kde-extras/kbarcode/trunk/debian/control
===================================================================
--- kde-extras/kbarcode/trunk/debian/control	2009-09-01 19:35:10 UTC (rev 15866)
+++ kde-extras/kbarcode/trunk/debian/control	2009-09-01 21:42:30 UTC (rev 15867)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 6), quilt, automake1.9, kdelibs4-dev
+Build-Depends: cdbs, debhelper (>= 6), quilt, automake, kdelibs4-dev
 Standards-Version: 3.8.0
 Homepage: http://www.kbarcode.net/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kbarcode/?op=log

Added: kde-extras/kbarcode/trunk/debian/patches/07_autoconf2.64.diff
===================================================================
--- kde-extras/kbarcode/trunk/debian/patches/07_autoconf2.64.diff	                        (rev 0)
+++ kde-extras/kbarcode/trunk/debian/patches/07_autoconf2.64.diff	2009-09-01 21:42:30 UTC (rev 15867)
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -46,6 +46,8 @@ dnl generate the config header
+ AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+ 
+ dnl Checks for programs.
++AC_PROG_CC
++AC_PROG_CXX
+ AC_CHECK_COMPILERS
+ AC_ENABLE_SHARED(yes)
+ AC_ENABLE_STATIC(no)

Added: kde-extras/kbarcode/trunk/debian/patches/08_automake-1.1x.diff
===================================================================
--- kde-extras/kbarcode/trunk/debian/patches/08_automake-1.1x.diff	                        (rev 0)
+++ kde-extras/kbarcode/trunk/debian/patches/08_automake-1.1x.diff	2009-09-01 21:42:30 UTC (rev 15867)
@@ -0,0 +1,11 @@
+--- a/admin/cvs.sh
++++ b/admin/cvs.sh
+@@ -68,7 +68,7 @@ case $AUTOMAKE_STRING in
+     echo "*** KDE requires automake $required_automake_version"
+     exit 1
+     ;;
+-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1*)
+     echo "*** $AUTOMAKE_STRING found."
+     UNSERMAKE=no
+     ;;

Modified: kde-extras/kbarcode/trunk/debian/patches/series
===================================================================
--- kde-extras/kbarcode/trunk/debian/patches/series	2009-09-01 19:35:10 UTC (rev 15866)
+++ kde-extras/kbarcode/trunk/debian/patches/series	2009-09-01 21:42:30 UTC (rev 15867)
@@ -3,3 +3,5 @@
 04_am_maintainer_mode.diff
 05_pedantic-errors.diff
 06_disable_no_undefined.diff
+07_autoconf2.64.diff
+08_automake-1.1x.diff

Modified: kde-extras/kbarcode/trunk/debian/rules
===================================================================
--- kde-extras/kbarcode/trunk/debian/rules	2009-09-01 19:35:10 UTC (rev 15866)
+++ kde-extras/kbarcode/trunk/debian/rules	2009-09-01 21:42:30 UTC (rev 15867)
@@ -7,7 +7,7 @@
 
 DEB_INSTALL_MANPAGES_kbarcode := debian/kbarcode.1
 
-makebuilddir/kbarcode::
+post-patches::
 	find . -type f -name Makefile.in | xargs rm -f
 	$(MAKE) -f admin/Makefile.common