r2080 - in /unstable/gtkhtml4.0/debian: changelog control patches/01_deprecated.patch patches/series rules

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Dec 16 18:50:12 2011
New Revision: 2080

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2080
Log:
* New upstream release.
* 01_deprecated.patch: patch from upstream git. Don’t use 
  _DISABLE_DEPRECATED flags.
* Use dh-autoreconf.
* Update Vcs-* fields.

Added:
    unstable/gtkhtml4.0/debian/patches/01_deprecated.patch
    unstable/gtkhtml4.0/debian/patches/series
Modified:
    unstable/gtkhtml4.0/debian/changelog
    unstable/gtkhtml4.0/debian/control
    unstable/gtkhtml4.0/debian/rules

Modified: unstable/gtkhtml4.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml4.0/debian/changelog?rev=2080&op=diff
==============================================================================
--- unstable/gtkhtml4.0/debian/changelog (original)
+++ unstable/gtkhtml4.0/debian/changelog Fri Dec 16 18:50:12 2011
@@ -1,3 +1,13 @@
+gtkhtml4.0 (4.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * 01_deprecated.patch: patch from upstream git. Don’t use 
+    _DISABLE_DEPRECATED flags.
+  * Use dh-autoreconf.
+  * Update Vcs-* fields.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 16 Dec 2011 19:49:17 +0100
+
 gtkhtml4.0 (4.2.1-1) experimental; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: unstable/gtkhtml4.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml4.0/debian/control?rev=2080&op=diff
==============================================================================
--- unstable/gtkhtml4.0/debian/control (original)
+++ unstable/gtkhtml4.0/debian/control Fri Dec 16 18:50:12 2011
@@ -11,10 +11,11 @@
 Standards-Version: 3.9.2
 Dm-Upload-Allowed: yes
 Homepage: http://www.gnome.org/projects/evolution/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/experimental/gtkhtml4.0
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/experimental/gtkhtml4.0
+Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/gtkhtml4.0
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml4.0
 Build-Depends: debhelper (>= 8),
                cdbs (>= 0.4.37),
+               dh-autoreconf,
                dpkg-dev (>= 1.16.1),
                pkg-config,
                libtool,

Added: unstable/gtkhtml4.0/debian/patches/01_deprecated.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml4.0/debian/patches/01_deprecated.patch?rev=2080&op=file
==============================================================================
--- unstable/gtkhtml4.0/debian/patches/01_deprecated.patch (added)
+++ unstable/gtkhtml4.0/debian/patches/01_deprecated.patch Fri Dec 16 18:50:12 2011
@@ -1,0 +1,45 @@
+From cbe46cc7690cc91e3f04388c2fafc164cafbd229 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes at redhat.com>
+Date: Thu, 24 Nov 2011 22:57:59 +0000
+Subject: Remove all *_DISABLE_DEPRECATED_FLAGS.
+
+I'll care about deprecated APIs again when a gtk4 release date is
+announced.  Meanwhile it's just causing distros unnecessary pain.
+
+(cherry picked from commit 580892db87f3ab5bb88495e7d5e9fde71a371e9f)
+---
+diff --git a/configure.ac b/configure.ac
+index d22ff6c..28d9864 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -48,19 +48,6 @@ AM_GLIB_GNU_GETTEXT
+ dnl **********************************
+ dnl Compiler Warning Flags
+ dnl **********************************
+-AC_ARG_ENABLE([deprecated_warning_flags],
+-	AS_HELP_STRING([--enable-deprecated-warning-flags],
+-	[Enable warning flags for deprecated apis]),
+-	[enable_deprecated_flags=$enableval],[enable_deprecated_flags=yes])
+-
+-if test "x${enable_deprecated_flags}" = "xyes"; then
+-	AS_COMPILER_FLAGS(DEPRECATED_WARNING_FLAGS,
+-		"-DPANGO_DISABLE_DEPRECATED
+-		-DGDK_PIXBUF_DISABLE_DEPRECATED
+-		-DGNOME_DISABLE_DEPRECATED")
+-	AC_SUBST(WARNING_FLAGS)
+-fi
+-
+ AS_COMPILER_FLAGS(WARNING_FLAGS,
+ 	"-DG_DISABLE_SINGLE_INCLUDES
+ 	-DGTK_DISABLE_SINGLE_INCLUDES
+@@ -85,7 +72,7 @@ dnl	-Wshadow
+ dnl	-Wstrict-aliasing=2
+ 
+ dnl XXX This really belongs in AM_CPPFLAGS.
+-CFLAGS="$CFLAGS $DEPRECATED_WARNING_FLAGS  $WARNING_FLAGS"
++CFLAGS="$CFLAGS $WARNING_FLAGS"
+ 
+ dnl *********************
+ dnl Necessary programs
+--
+cgit v0.9.0.2

Added: unstable/gtkhtml4.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml4.0/debian/patches/series?rev=2080&op=file
==============================================================================
--- unstable/gtkhtml4.0/debian/patches/series (added)
+++ unstable/gtkhtml4.0/debian/patches/series Fri Dec 16 18:50:12 2011
@@ -1,0 +1,1 @@
+01_deprecated.patch

Modified: unstable/gtkhtml4.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml4.0/debian/rules?rev=2080&op=diff
==============================================================================
--- unstable/gtkhtml4.0/debian/rules (original)
+++ unstable/gtkhtml4.0/debian/rules Fri Dec 16 18:50:12 2011
@@ -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/class/autotools.mk
 include /usr/share/cdbs/1/class/gnome.mk