r45508 - in /desktop/unstable/gnome-common/debian: changelog control control.in rules

[smcv at users.alioth.debian.org]

Author: smcv
Date: Tue Jul  7 20:00:38 2015
New Revision: 45508

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45508
Log:
Drop AX_* macros, which are now in autoconf-archive. Depend on a new enough autoconf-archive instead. (Closes: #790936)

Modified:
    desktop/unstable/gnome-common/debian/changelog
    desktop/unstable/gnome-common/debian/control
    desktop/unstable/gnome-common/debian/control.in
    desktop/unstable/gnome-common/debian/rules

Modified: desktop/unstable/gnome-common/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-common/debian/changelog?rev=45508&op=diff
==============================================================================
--- desktop/unstable/gnome-common/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-common/debian/changelog	[utf-8] Tue Jul  7 20:00:38 2015
@@ -1,3 +1,10 @@
+gnome-common (3.14.0-2) UNRELEASED; urgency=medium
+
+  * Drop AX_* macros, which are now in autoconf-archive. Depend on
+    a new enough autoconf-archive instead. (Closes: #790936)
+
+ -- Simon McVittie <smcv at debian.org>  Tue, 07 Jul 2015 20:52:21 +0100
+
 gnome-common (3.14.0-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/gnome-common/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-common/debian/control?rev=45508&op=diff
==============================================================================
--- desktop/unstable/gnome-common/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-common/debian/control	[utf-8] Tue Jul  7 20:00:38 2015
@@ -6,7 +6,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Gustavo Noronha Silva <kov at debian.org>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 9),
                cdbs,
                gnome-pkg-tools
@@ -20,6 +20,7 @@
 Architecture: all
 Depends: ${misc:Depends},
          autoconf,
+         autoconf-archive (>= 20150224),
          automake (>= 1:1.11),
          libtool,
          pkg-config,

Modified: desktop/unstable/gnome-common/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-common/debian/control.in?rev=45508&op=diff
==============================================================================
--- desktop/unstable/gnome-common/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-common/debian/control.in	[utf-8] Tue Jul  7 20:00:38 2015
@@ -16,6 +16,7 @@
 Architecture: all
 Depends: ${misc:Depends},
          autoconf,
+         autoconf-archive (>= 20150224),
          automake (>= 1:1.11),
          libtool,
          pkg-config,

Modified: desktop/unstable/gnome-common/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-common/debian/rules?rev=45508&op=diff
==============================================================================
--- desktop/unstable/gnome-common/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-common/debian/rules	[utf-8] Tue Jul  7 20:00:38 2015
@@ -5,3 +5,8 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
+common-binary-indep:: fix-duplication
+
+fix-duplication:
+	rm -f -v debian/gnome-common/usr/share/aclocal/ax_check_enable_debug.m4
+	rm -f -v debian/gnome-common/usr/share/aclocal/ax_code_coverage.m4