r33476 - in /desktop/experimental/gnome-themes-standard/debian: changelog control control.in patches/ patches/01_gtk-update-icon-cache_name.patch patches/series rules

mpitt at users.alioth.debian.org mpitt at users.alioth.debian.org
Wed Mar 21 13:02:44 UTC 2012


Author: mpitt
Date: Wed Mar 21 13:02:43 2012
New Revision: 33476

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33476
Log:
* Add 01_gtk-update-icon-cache_name.patch: Debian packaging uses
  gtk-update-icon-cache-3.0, update path in configure.ac.
* debian/control.in, debian/rules: Use dh-autoreconf, for the patch above.

Added:
    desktop/experimental/gnome-themes-standard/debian/patches/
    desktop/experimental/gnome-themes-standard/debian/patches/01_gtk-update-icon-cache_name.patch
    desktop/experimental/gnome-themes-standard/debian/patches/series
Modified:
    desktop/experimental/gnome-themes-standard/debian/changelog
    desktop/experimental/gnome-themes-standard/debian/control
    desktop/experimental/gnome-themes-standard/debian/control.in
    desktop/experimental/gnome-themes-standard/debian/rules

Modified: desktop/experimental/gnome-themes-standard/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-themes-standard/debian/changelog?rev=33476&op=diff
==============================================================================
--- desktop/experimental/gnome-themes-standard/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-themes-standard/debian/changelog [utf-8] Wed Mar 21 13:02:43 2012
@@ -5,6 +5,9 @@
   * New upstream development release.
   * debian/control.in: Add libcairo2-dev, libgdk-pixbuf2.0-dev, and
     libglib2.0-dev build dependencies as per configure.ac.
+  * Add 01_gtk-update-icon-cache_name.patch: Debian packaging uses
+    gtk-update-icon-cache-3.0, update path in configure.ac.
+  * debian/control.in, debian/rules: Use dh-autoreconf, for the patch above.
 
  -- Martin Pitt <mpitt at debian.org>  Wed, 21 Mar 2012 13:14:03 +0100
 

Modified: desktop/experimental/gnome-themes-standard/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-themes-standard/debian/control?rev=33476&op=diff
==============================================================================
--- desktop/experimental/gnome-themes-standard/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-themes-standard/debian/control [utf-8] Wed Mar 21 13:02:43 2012
@@ -12,6 +12,7 @@
 Build-Depends: debhelper (>= 8),
                gnome-pkg-tools (>= 0.10),
                cdbs (>= 0.4.41),
+               dh-autoreconf,
                intltool (>= 0.40.0),
                libgtk-3-dev (>= 3.3.14),
                libcairo2-dev,

Modified: desktop/experimental/gnome-themes-standard/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-themes-standard/debian/control.in?rev=33476&op=diff
==============================================================================
--- desktop/experimental/gnome-themes-standard/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-themes-standard/debian/control.in [utf-8] Wed Mar 21 13:02:43 2012
@@ -7,6 +7,7 @@
 Build-Depends: debhelper (>= 8),
                gnome-pkg-tools (>= 0.10),
                cdbs (>= 0.4.41),
+               dh-autoreconf,
                intltool (>= 0.40.0),
                libgtk-3-dev (>= 3.3.14),
                libcairo2-dev,

Added: desktop/experimental/gnome-themes-standard/debian/patches/01_gtk-update-icon-cache_name.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-themes-standard/debian/patches/01_gtk-update-icon-cache_name.patch?rev=33476&op=file
==============================================================================
--- desktop/experimental/gnome-themes-standard/debian/patches/01_gtk-update-icon-cache_name.patch (added)
+++ desktop/experimental/gnome-themes-standard/debian/patches/01_gtk-update-icon-cache_name.patch [utf-8] Wed Mar 21 13:02:43 2012
@@ -1,0 +1,19 @@
+Description: Debian packaging uses gtk-update-icon-cache-3.0, update path in configure.ac.
+Author: Martin Pitt <mpitt at debian.org>
+
+Index: gnome-themes-standard-exp/configure.ac
+===================================================================
+--- gnome-themes-standard-exp.orig/configure.ac	2012-03-19 22:08:58.000000000 +0100
++++ gnome-themes-standard-exp/configure.ac	2012-03-21 13:56:19.112235720 +0100
+@@ -50,9 +50,9 @@
+               enable_placeholders=no)
+ AM_CONDITIONAL(PLACEHOLDERS, test "x$enable_placeholders" != "xno")
+ 
+-AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache)
++AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache-3.0)
+ if test -z "$GTK_UPDATE_ICON_CACHE"; then
+-    AC_MSG_ERROR([Could not find gtk-update-icon-cache])
++    AC_MSG_ERROR([Could not find gtk-update-icon-cache-3.0])
+ fi
+ 
+ # Workaround to make aclocal get the right flags

Added: desktop/experimental/gnome-themes-standard/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-themes-standard/debian/patches/series?rev=33476&op=file
==============================================================================
--- desktop/experimental/gnome-themes-standard/debian/patches/series (added)
+++ desktop/experimental/gnome-themes-standard/debian/patches/series [utf-8] Wed Mar 21 13:02:43 2012
@@ -1,0 +1,1 @@
+01_gtk-update-icon-cache_name.patch

Modified: desktop/experimental/gnome-themes-standard/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-themes-standard/debian/rules?rev=33476&op=diff
==============================================================================
--- desktop/experimental/gnome-themes-standard/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-themes-standard/debian/rules [utf-8] Wed Mar 21 13:02:43 2012
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk




More information about the pkg-gnome-commits mailing list