r43102 - in /desktop/unstable/aisleriot/debian: aisleriot.install changelog control control.in rules

[ah at users.alioth.debian.org]

Author: ah
Date: Tue Sep 23 19:42:28 2014
New Revision: 43102

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43102
Log:
* New upstream release.
* Add build-dependency on appdata-tools
  - needs appdata-validate
* Use dh-autoreconf and use it for --as-needed
* debian/rules: ensure bash shell is used to avoid issues in ltmain.sh
* debian/aisleriot.install: ship usr/share/appdata

Modified:
    desktop/unstable/aisleriot/debian/aisleriot.install
    desktop/unstable/aisleriot/debian/changelog
    desktop/unstable/aisleriot/debian/control
    desktop/unstable/aisleriot/debian/control.in
    desktop/unstable/aisleriot/debian/rules

Modified: desktop/unstable/aisleriot/debian/aisleriot.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/aisleriot.install?rev=43102&op=diff
==============================================================================
--- desktop/unstable/aisleriot/debian/aisleriot.install	[utf-8] (original)
+++ desktop/unstable/aisleriot/debian/aisleriot.install	[utf-8] Tue Sep 23 19:42:28 2014
@@ -3,6 +3,7 @@
 usr/lib
 usr/share/aisleriot/cards/bonded.svgz
 usr/share/aisleriot/[d-z]*
+usr/share/appdata
 usr/share/applications
 usr/share/[b-z]*
 debian/pixmaps/aisleriot.xpm /usr/share/pixmaps

Modified: desktop/unstable/aisleriot/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/changelog?rev=43102&op=diff
==============================================================================
--- desktop/unstable/aisleriot/debian/changelog	[utf-8] (original)
+++ desktop/unstable/aisleriot/debian/changelog	[utf-8] Tue Sep 23 19:42:28 2014
@@ -1,3 +1,14 @@
+aisleriot (1:3.14.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Add build-dependency on appdata-tools
+    - needs appdata-validate
+  * Use dh-autoreconf and use it for --as-needed
+  * debian/rules: ensure bash shell is used to avoid issues in ltmain.sh
+  * debian/aisleriot.install: ship usr/share/appdata
+
+ -- Andreas Henriksson <andreas at fatal.se>  Tue, 23 Sep 2014 21:19:18 +0200
+
 aisleriot (1:3.10.2-1) unstable; urgency=medium
 
   [ Peter Michael Green ]

Modified: desktop/unstable/aisleriot/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/control?rev=43102&op=diff
==============================================================================
--- desktop/unstable/aisleriot/debian/control	[utf-8] (original)
+++ desktop/unstable/aisleriot/debian/control	[utf-8] Tue Sep 23 19:42:28 2014
@@ -2,7 +2,6 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: aisleriot
 Section: games
 Priority: optional
@@ -10,6 +9,8 @@
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Jordi Mallach <jordi at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 8),
+               dh-autoreconf,
+               appdata-tools,
                desktop-file-utils,
                gnome-pkg-tools (>= 0.6),
                lsb-release,

Modified: desktop/unstable/aisleriot/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/control.in?rev=43102&op=diff
==============================================================================
--- desktop/unstable/aisleriot/debian/control.in	[utf-8] (original)
+++ desktop/unstable/aisleriot/debian/control.in	[utf-8] Tue Sep 23 19:42:28 2014
@@ -5,6 +5,8 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs,
                debhelper (>= 8),
+               dh-autoreconf,
+               appdata-tools,
                desktop-file-utils,
                gnome-pkg-tools (>= 0.6),
                lsb-release,

Modified: desktop/unstable/aisleriot/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/rules?rev=43102&op=diff
==============================================================================
--- desktop/unstable/aisleriot/debian/rules	[utf-8] (original)
+++ desktop/unstable/aisleriot/debian/rules	[utf-8] Tue Sep 23 19:42:28 2014
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
+export CONFIG_SHELL=/bin/bash
+
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
@@ -15,4 +18,6 @@
 
 DEB_DH_FIXPERMS_ARGS_ALL := -X/usr/games/sol
 DEB_DH_MAKESHLIBS_ARGS_aisleriot := --no-act
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,-O1 -Wl,--as-needed"
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,-O1"
+
+DEB_DH_AUTORECONF_ARGS = --as-needed