r42442 - in /attic/rarian/debian: changelog control control.in patches/04_m4_syntax.patch patches/05_no_dist_gzip_option.patch patches/series rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed Sep 3 10:58:28 UTC 2014


Author: biebl
Date: Wed Sep  3 10:58:28 2014
New Revision: 42442

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42442
Log:
Use dh-autoreconf to update libtool macros for new ports. This also
requires fixing an m4 syntax error in configure.ac and removing the
nonexistent "dist-gzip" Automake option. Closes: #732588

Added:
    attic/rarian/debian/patches/04_m4_syntax.patch
    attic/rarian/debian/patches/05_no_dist_gzip_option.patch
Modified:
    attic/rarian/debian/changelog
    attic/rarian/debian/control
    attic/rarian/debian/control.in
    attic/rarian/debian/patches/series
    attic/rarian/debian/rules

Modified: attic/rarian/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/rarian/debian/changelog?rev=42442&op=diff
==============================================================================
--- attic/rarian/debian/changelog	[utf-8] (original)
+++ attic/rarian/debian/changelog	[utf-8] Wed Sep  3 10:58:28 2014
@@ -1,6 +1,12 @@
 rarian (0.8.1-6) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * Update repository URL.
+
+  [ Colin Watson ]
+  * Use dh-autoreconf to update libtool macros for new ports. This also
+    requires fixing an m4 syntax error in configure.ac and removing the
+    nonexistent "dist-gzip" Automake option. Closes: #732588
 
  -- Josselin Mouette <joss at debian.org>  Sat, 31 Dec 2011 14:57:52 +0100
 

Modified: attic/rarian/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/rarian/debian/control?rev=42442&op=diff
==============================================================================
--- attic/rarian/debian/control	[utf-8] (original)
+++ attic/rarian/debian/control	[utf-8] Wed Sep  3 10:58:28 2014
@@ -10,7 +10,7 @@
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 5),
-               autotools-dev,
+               dh-autoreconf,
                xsltproc,
                xml-core (>= 0.06),
                gnome-pkg-tools

Modified: attic/rarian/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/rarian/debian/control.in?rev=42442&op=diff
==============================================================================
--- attic/rarian/debian/control.in	[utf-8] (original)
+++ attic/rarian/debian/control.in	[utf-8] Wed Sep  3 10:58:28 2014
@@ -5,7 +5,7 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs,
                debhelper (>= 5),
-               autotools-dev,
+               dh-autoreconf,
                xsltproc,
                xml-core (>= 0.06),
                gnome-pkg-tools

Added: attic/rarian/debian/patches/04_m4_syntax.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/rarian/debian/patches/04_m4_syntax.patch?rev=42442&op=file
==============================================================================
--- attic/rarian/debian/patches/04_m4_syntax.patch	(added)
+++ attic/rarian/debian/patches/04_m4_syntax.patch	[utf-8] Wed Sep  3 10:58:28 2014
@@ -0,0 +1,18 @@
+Description: Fix m4 syntax so that autoreconf doesn't break
+Author: Colin Watson <cjwatson at ubuntu.com>
+Forwarded: no
+Last-Update: 2013-12-19
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,7 +5,7 @@
+ AC_INIT(rarian, 0.8.1)
+ AC_CONFIG_SRCDIR([util/rarian-example.c])
+ AC_CONFIG_HEADER([config.h])
+-AM_INIT_AUTOMAKE ([foreign dist-bzip2 dist-gzip])
++AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-gzip])
+ 
+ AM_MAINTAINER_MODE
+ 

Added: attic/rarian/debian/patches/05_no_dist_gzip_option.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/rarian/debian/patches/05_no_dist_gzip_option.patch?rev=42442&op=file
==============================================================================
--- attic/rarian/debian/patches/05_no_dist_gzip_option.patch	(added)
+++ attic/rarian/debian/patches/05_no_dist_gzip_option.patch	[utf-8] Wed Sep  3 10:58:28 2014
@@ -0,0 +1,18 @@
+Description: Remove the nonexistent "dist-gzip" Automake option
+Author: Colin Watson <cjwatson at ubuntu.com>
+Forwarded: no
+Last-Update: 2013-12-19
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,7 +5,7 @@
+ AC_INIT(rarian, 0.8.1)
+ AC_CONFIG_SRCDIR([util/rarian-example.c])
+ AC_CONFIG_HEADER([config.h])
+-AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-gzip])
++AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ 
+ AM_MAINTAINER_MODE
+ 

Modified: attic/rarian/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/rarian/debian/patches/series?rev=42442&op=diff
==============================================================================
--- attic/rarian/debian/patches/series	[utf-8] (original)
+++ attic/rarian/debian/patches/series	[utf-8] Wed Sep  3 10:58:28 2014
@@ -1,3 +1,5 @@
 01_info_shortnames.patch
 02_crash_no_extension.patch
 03_language.patch
+04_m4_syntax.patch
+05_no_dist_gzip_option.patch

Modified: attic/rarian/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/rarian/debian/rules?rev=42442&op=diff
==============================================================================
--- attic/rarian/debian/rules	[utf-8] (original)
+++ attic/rarian/debian/rules	[utf-8] Wed Sep  3 10:58:28 2014
@@ -3,6 +3,7 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-skdb-update=no




More information about the pkg-gnome-commits mailing list