[Pkg-cli-apps-commits] r5423 - in /packages/cowbell/trunk/debian: changelog control patches/ac_prog_cxx.patch rules

[laney at users.alioth.debian.org]

Author: laney
Date: Sat Apr  7 16:40:10 2012
New Revision: 5423

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5423
Log:
* autoreconf in build to fix ancient config.{sub,guess} files properly 
* debian/patches/ac_prog_cxx.patch: Add missing AC_PROG_CXX as we have some
  cpp code in taglib.

Added:
    packages/cowbell/trunk/debian/patches/ac_prog_cxx.patch
Modified:
    packages/cowbell/trunk/debian/changelog
    packages/cowbell/trunk/debian/control
    packages/cowbell/trunk/debian/rules

Modified: packages/cowbell/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/cowbell/trunk/debian/changelog?rev=5423&op=diff
==============================================================================
--- packages/cowbell/trunk/debian/changelog (original)
+++ packages/cowbell/trunk/debian/changelog Sat Apr  7 16:40:10 2012
@@ -3,6 +3,9 @@
   * Apply patch cherry-picked from Ubuntu (Ilya Barygin) by Gregor Herrmann.
     Fix "FTBFS: configure: error: 'Taglib C bindings are not installed'": add
     multiarch (Closes: #665052)
+  * autoreconf in build to fix ancient config.{sub,guess} files properly 
+  * debian/patches/ac_prog_cxx.patch: Add missing AC_PROG_CXX as we have some
+    cpp code in taglib.
 
  -- Iain Lane <laney at debian.org>  Sat, 07 Apr 2012 14:14:39 +0100
 

Modified: packages/cowbell/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/cowbell/trunk/debian/control?rev=5423&op=diff
==============================================================================
--- packages/cowbell/trunk/debian/control (original)
+++ packages/cowbell/trunk/debian/control Sat Apr  7 16:40:10 2012
@@ -4,12 +4,15 @@
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 5),
+ dh-autoreconf,
  cdbs,
  cli-common-dev (>= 0.4.4),
+ gnome-common,
  mono-devel (>= 2.4.3),
  libtag1-dev (>= 1.3.0),
  libtagc0-dev (>= 1.3.0),
  libgtk2.0-cil-dev,
+ libglib2.0-dev,
  libglib2.0-cil-dev,
  libglade2.0-cil-dev,
  pkg-config,

Added: packages/cowbell/trunk/debian/patches/ac_prog_cxx.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/cowbell/trunk/debian/patches/ac_prog_cxx.patch?rev=5423&op=file
==============================================================================
--- packages/cowbell/trunk/debian/patches/ac_prog_cxx.patch (added)
+++ packages/cowbell/trunk/debian/patches/ac_prog_cxx.patch Sat Apr  7 16:40:10 2012
@@ -1,0 +1,14 @@
+## Description: AC_PROG_CXX was missing,leading to inability to autoreconf (there's cpp code in taglib)
+## Origin/Author: Iain Lane <laney at debian.org>
+diff -Nur -x '*.orig' -x '*~' cowbell-0.2.7.1/configure.in cowbell-0.2.7.1.new/configure.in
+--- cowbell-0.2.7.1/configure.in	2012-04-07 17:16:07.876156055 +0100
++++ cowbell-0.2.7.1.new/configure.in	2012-04-07 17:16:38.906911996 +0100
+@@ -7,6 +7,8 @@
+ AC_PROG_INTLTOOL([0.21])
+ AC_PROG_LIBTOOL
+ 
++AC_PROG_CXX
++
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ if test "x$PKG_CONFIG" = "xno"; then
+ 	AC_MSG_ERROR(['pkg-config' is not in your PATH.])

Modified: packages/cowbell/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/cowbell/trunk/debian/rules?rev=5423&op=diff
==============================================================================
--- packages/cowbell/trunk/debian/rules (original)
+++ packages/cowbell/trunk/debian/rules Sat Apr  7 16:40:10 2012
@@ -3,6 +3,10 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
+
+export NOCONFIGURE=1
+DEB_DH_AUTORECONF_ARGS += /usr/bin/gnome-autogen.sh
 
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-static CSC=/usr/bin/mono-csc
 DEB_INSTALL_MANPAGES_cowbell += debian/cowbell.1