r38234 - in /packages/unstable/gtkspell3/debian: changelog control.in patches/ patches/fix-automake-syntax.patch patches/gtk-spell-cflags-typo.patch patches/series rules

jordi at users.alioth.debian.org jordi at users.alioth.debian.org
Wed May 29 09:14:05 UTC 2013 

Author: jordi
Date: Wed May 29 09:14:05 2013
New Revision: 38234

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38234
Log:
* debian/patches/gtk-spell-cflags-typo.patch: Cherry-pick patch from
  upstream to substitute correct variable name for CFLAGS.
* debian/patches/fix-automake-syntax.patch: Cherry-pick patch from
  upstream to use correct automake substitution syntax.
* dh-autoreconf for this change.

Added:
    packages/unstable/gtkspell3/debian/patches/
    packages/unstable/gtkspell3/debian/patches/fix-automake-syntax.patch
    packages/unstable/gtkspell3/debian/patches/gtk-spell-cflags-typo.patch
    packages/unstable/gtkspell3/debian/patches/series
Modified:
    packages/unstable/gtkspell3/debian/changelog
    packages/unstable/gtkspell3/debian/control.in
    packages/unstable/gtkspell3/debian/rules

Modified: packages/unstable/gtkspell3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtkspell3/debian/changelog?rev=38234&op=diff
==============================================================================
--- packages/unstable/gtkspell3/debian/changelog [utf-8] (original)
+++ packages/unstable/gtkspell3/debian/changelog [utf-8] Wed May 29 09:14:05 2013
@@ -1,3 +1,14 @@
+gtkspell3 (3.0.2-2) unstable; urgency=low
+
+  [ Iain Lane ]
+  * debian/patches/gtk-spell-cflags-typo.patch: Cherry-pick patch from
+    upstream to substitute correct variable name for CFLAGS.
+  * debian/patches/fix-automake-syntax.patch: Cherry-pick patch from
+    upstream to use correct automake substitution syntax.
+  * dh-autoreconf for this change.
+
+ -- Jordi Mallach <jordi at debian.org>  Wed, 29 May 2013 11:13:41 +0200
+
 gtkspell3 (3.0.2-1) unstable; urgency=low
 
   * New upstream release. 

Modified: packages/unstable/gtkspell3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtkspell3/debian/control.in?rev=38234&op=diff
==============================================================================
--- packages/unstable/gtkspell3/debian/control.in [utf-8] (original)
+++ packages/unstable/gtkspell3/debian/control.in [utf-8] Wed May 29 09:14:05 2013
@@ -4,6 +4,7 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
                cdbs,
                gnome-pkg-tools,
                gobject-introspection (>= 1.30.0),

Added: packages/unstable/gtkspell3/debian/patches/fix-automake-syntax.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtkspell3/debian/patches/fix-automake-syntax.patch?rev=38234&op=file
==============================================================================
--- packages/unstable/gtkspell3/debian/patches/fix-automake-syntax.patch (added)
+++ packages/unstable/gtkspell3/debian/patches/fix-automake-syntax.patch [utf-8] Wed May 29 09:14:05 2013
@@ -1,0 +1,123 @@
+Author: Sandro Mani <manisandro at gmail.com>
+Date: Tue May 14 01:07:13 2013 +0200
+Summary: Fix @foo@ syntax
+
+Index: b/docs/Makefile.am
+===================================================================
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -80,12 +80,12 @@
+ # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+ ## We use the gtk3 variant if available, otherwise the gtk2 variant ##
+ if ENABLE_GTK3
+-GTKDOC_CFLAGS=-I$(top_srcdir) @GTK_SPELL3_CFLAGS@
+-GTKDOC_LIBS=@GTK_SPELL3_LIBS@ $(top_builddir)/gtkspell/libgtkspell3-3.la
++GTKDOC_CFLAGS=-I$(top_srcdir) $(GTK_SPELL3_CFLAGS)
++GTKDOC_LIBS=$(GTK_SPELL3_LIBS) $(top_builddir)/gtkspell/libgtkspell3-3.la
+ else
+ if ENABLE_GTK2
+-GTKDOC_CFLAGS=-I$(top_srcdir) @GTK_SPELL2_CFLAGS@
+-GTKDOC_LIBS=@GTK_SPELL2_LIBS@ $(top_builddir)/gtkspell/libgtkspell3-2.la
++GTKDOC_CFLAGS=-I$(top_srcdir) $(GTK_SPELL2_CFLAGS)
++GTKDOC_LIBS=$(GTK_SPELL2_LIBS) $(top_builddir)/gtkspell/libgtkspell3-2.la
+ endif
+ endif
+ 
+Index: b/examples/Makefile.am
+===================================================================
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -2,31 +2,31 @@
+ 
+ if ENABLE_GTK2
+ noinst_PROGRAMS += simple-gtk2 advanced-gtk2
+-simple_gtk2_CPPFLAGS = @GTK_SPELL2_CFLAGS@ -I$(top_srcdir)
+-simple_gtk2_LDADD = @GTK_SPELL2_LIBS@ $(top_builddir)/gtkspell/libgtkspell3-2.la
++simple_gtk2_CPPFLAGS = $(GTK_SPELL2_CFLAGS) -I$(top_srcdir)
++simple_gtk2_LDADD = $(GTK_SPELL2_LIBS) $(top_builddir)/gtkspell/libgtkspell3-2.la
+ simple_gtk2_SOURCES = simple.c
+ 
+-advanced_gtk2_CPPFLAGS = @GTK_SPELL2_CFLAGS@ -I$(top_srcdir)
+-advanced_gtk2_LDADD = @GTK_SPELL2_LIBS@ $(top_builddir)/gtkspell/libgtkspell3-2.la
++advanced_gtk2_CPPFLAGS = $(GTK_SPELL2_CFLAGS) -I$(top_srcdir)
++advanced_gtk2_LDADD = $(GTK_SPELL2_LIBS) $(top_builddir)/gtkspell/libgtkspell3-2.la
+ advanced_gtk2_SOURCES = advanced.c
+ endif
+ 
+ if ENABLE_GTK3
+ noinst_PROGRAMS += simple-gtk3 advanced-gtk3
+-simple_gtk3_CPPFLAGS = @GTK_SPELL3_CFLAGS@ -I$(top_srcdir)
+-simple_gtk3_LDADD = @GTK_SPELL3_LIBS@ $(top_builddir)/gtkspell/libgtkspell3-3.la
++simple_gtk3_CPPFLAGS = $(GTK_SPELL3_CFLAGS) -I$(top_srcdir)
++simple_gtk3_LDADD = $(GTK_SPELL3_LIBS) $(top_builddir)/gtkspell/libgtkspell3-3.la
+ simple_gtk3_SOURCES = simple.c
+ 
+-advanced_gtk3_CPPFLAGS = @GTK_SPELL3_CFLAGS@ -I$(top_srcdir)
+-advanced_gtk3_LDADD = @GTK_SPELL3_LIBS@ $(top_builddir)/gtkspell/libgtkspell3-3.la
++advanced_gtk3_CPPFLAGS = $(GTK_SPELL3_CFLAGS) -I$(top_srcdir)
++advanced_gtk3_LDADD = $(GTK_SPELL3_LIBS) $(top_builddir)/gtkspell/libgtkspell3-3.la
+ advanced_gtk3_SOURCES = advanced.c
+ 
+ if ENABLE_VAPIGEN
+ if HAVE_VALAC
+ noinst_PROGRAMS += simple-gtk3-vala
+ simple_gtk3_vala_VALAFLAGS = --vapidir $(top_builddir)/gtkspell --pkg gtkspell3-3.0 --pkg gtk+-3.0
+-simple_gtk3_vala_CPPFLAGS = @GTK_SPELL3_CFLAGS@ -I$(top_srcdir)
+-simple_gtk3_vala_LDADD = @GTK_SPELL3_LIBS@ $(top_builddir)/gtkspell/libgtkspell3-3.la
++simple_gtk3_vala_CPPFLAGS = $(GTK_SPELL3_CFLAGS) -I$(top_srcdir)
++simple_gtk3_vala_LDADD = $(GTK_SPELL3_LIBS) $(top_builddir)/gtkspell/libgtkspell3-3.la
+ simple_gtk3_vala_SOURCES = simple-vala.vala
+ endif
+ endif
+Index: b/gtkspell/Makefile.am
+===================================================================
+--- a/gtkspell/Makefile.am
++++ b/gtkspell/Makefile.am
+@@ -6,12 +6,12 @@
+ 
+ if ENABLE_GTK3
+ lib_LTLIBRARIES += libgtkspell3-3.la
+-libgtkspell3_3_la_CPPFLAGS = -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" @GTK_SPELL3_CFLAGS@
++libgtkspell3_3_la_CPPFLAGS = -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" $(GTK_SPELL3_CFLAGS)
+ libgtkspell3_3_la_includedir=$(includedir)/gtkspell-3.0/gtkspell
+ libgtkspell3_3_la_include_HEADERS = gtkspell.h
+ 
+ libgtkspell3_3_la_SOURCES = gtkspell.c gtkspell.h
+-libgtkspell3_3_la_LIBADD = @GTK_SPELL3_LIBS@
++libgtkspell3_3_la_LIBADD = $(GTK_SPELL3_LIBS)
+ libgtkspell3_3_la_LDFLAGS = -version-info $(GTK_SPELL_SO_VERSION)
+ 
+ pkgconfig_DATA += gtkspell3-3.0.pc
+@@ -19,12 +19,12 @@
+ 
+ if ENABLE_GTK2
+ lib_LTLIBRARIES += libgtkspell3-2.la
+-libgtkspell3_2_la_CPPFLAGS = -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" @GTK_SPELL2_CFLAGS@
++libgtkspell3_2_la_CPPFLAGS = -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" $(GTK_SPELL2_CFLAGS)
+ libgtkspell3_2_la_includedir=$(includedir)/gtkspell-3.0/gtkspell
+ libgtkspell3_2_la_include_HEADERS = gtkspell.h
+ 
+ libgtkspell3_2_la_SOURCES = gtkspell.c gtkspell.h
+-libgtkspell3_2_la_LIBADD = @GTK_SPELL2_LIBS@
++libgtkspell3_2_la_LIBADD = $(GTK_SPELL2_LIBS)
+ libgtkspell3_2_la_LDFLAGS = -version-info $(GTK_SPELL_SO_VERSION)
+ 
+ pkgconfig_DATA += gtkspell3-2.0.pc
+@@ -40,7 +40,7 @@
+ if ENABLE_GTK3
+ GtkSpell-3.0.gir: libgtkspell3-3.la
+ GtkSpell_3_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-3.0
+-GtkSpell_3_0_gir_CFLAGS = --warn-all @GTK_SPELL3_CFLAGS@
++GtkSpell_3_0_gir_CFLAGS = --warn-all $(GTK_SPELL3_CFLAGS)
+ GtkSpell_3_0_gir_LIBS = libgtkspell3-3.la
+ GtkSpell_3_0_gir_FILES = $(libgtkspell3_3_la_SOURCES)
+ GtkSpell_3_0_gir_SCANNERFLAGS = --c-include gtkspell/gtkspell.h
+@@ -50,7 +50,7 @@
+ if ENABLE_GTK2
+ GtkSpell-2.0.gir: libgtkspell3-2.la
+ GtkSpell_2_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-2.0
+-GtkSpell_2_0_gir_CFLAGS = --warn-all @GTK_SPELL2_CFLAGS@
++GtkSpell_2_0_gir_CFLAGS = --warn-all $(GTK_SPELL2_CFLAGS)
+ GtkSpell_2_0_gir_LIBS = libgtkspell3-2.la
+ GtkSpell_2_0_gir_FILES = $(libgtkspell3_2_la_SOURCES)
+ GtkSpell_2_0_gir_SCANNERFLAGS = --c-include gtkspell/gtkspell.h

Added: packages/unstable/gtkspell3/debian/patches/gtk-spell-cflags-typo.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtkspell3/debian/patches/gtk-spell-cflags-typo.patch?rev=38234&op=file
==============================================================================
--- packages/unstable/gtkspell3/debian/patches/gtk-spell-cflags-typo.patch (added)
+++ packages/unstable/gtkspell3/debian/patches/gtk-spell-cflags-typo.patch [utf-8] Wed May 29 09:14:05 2013
@@ -1,0 +1,19 @@
+Author: Alexandre Rostovtsev <tetromino at gentoo.org>
+Date: Tue Apr 02 09:39:53 2013 -0400
+Description: s/GTK_SPELL_CFLAGS/GTK_SPELL3_CFLAGS/
+ Fixes build failure with some gobject-introspection versions.
+Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=463674
+
+Index: b/gtkspell/Makefile.am
+===================================================================
+--- a/gtkspell/Makefile.am
++++ b/gtkspell/Makefile.am
+@@ -40,7 +40,7 @@
+ if ENABLE_GTK3
+ GtkSpell-3.0.gir: libgtkspell3-3.la
+ GtkSpell_3_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-3.0
+-GtkSpell_3_0_gir_CFLAGS = --warn-all @GTK_SPELL_CFLAGS@
++GtkSpell_3_0_gir_CFLAGS = --warn-all @GTK_SPELL3_CFLAGS@
+ GtkSpell_3_0_gir_LIBS = libgtkspell3-3.la
+ GtkSpell_3_0_gir_FILES = $(libgtkspell3_3_la_SOURCES)
+ GtkSpell_3_0_gir_SCANNERFLAGS = --c-include gtkspell/gtkspell.h

Added: packages/unstable/gtkspell3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtkspell3/debian/patches/series?rev=38234&op=file
==============================================================================
--- packages/unstable/gtkspell3/debian/patches/series (added)
+++ packages/unstable/gtkspell3/debian/patches/series [utf-8] Wed May 29 09:14:05 2013
@@ -1,0 +1,2 @@
+fix-automake-syntax.patch
+gtk-spell-cflags-typo.patch

Modified: packages/unstable/gtkspell3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtkspell3/debian/rules?rev=38234&op=diff
==============================================================================
--- packages/unstable/gtkspell3/debian/rules [utf-8] (original)
+++ packages/unstable/gtkspell3/debian/rules [utf-8] Wed May 29 09:14:05 2013
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/class/autotools.mk
+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