r2060 - in /experimental/evolution/debian: changelog control patches/03_deprecated.patch patches/series rules

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Nov 24 19:13:27 2011
New Revision: 2060

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2060
Log:
* Use dh-autoreconf.
* 03_deprecated.patch: new patch. Remove *_DISABLE_DEPRECATED.
  Closes: #649645.

Added:
    experimental/evolution/debian/patches/03_deprecated.patch
      - copied, changed from r2059, unstable/evolution/debian/patches/03_deprecated.patch
Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/control
    experimental/evolution/debian/patches/series
    experimental/evolution/debian/rules

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=2060&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Thu Nov 24 19:13:27 2011
@@ -10,6 +10,9 @@
   * 01_requires_private.patch: new patch. Make gnome-desktop a private 
     requirement, it’s not referenced anywhere in the headers.
     Closes: #649646.
+  * Use dh-autoreconf.
+  * 03_deprecated.patch: new patch. Remove *_DISABLE_DEPRECATED.
+    Closes: #649645.
 
  -- Jordi Mallach <jordi at debian.org>  Thu, 24 Nov 2011 14:36:16 +0100
 

Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=2060&op=diff
==============================================================================
--- experimental/evolution/debian/control (original)
+++ experimental/evolution/debian/control Thu Nov 24 19:13:27 2011
@@ -17,6 +17,7 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-evolution/unstable/evolution
 Build-Depends: debhelper (>= 7.2.3~),
                cdbs (>= 0.4.52),
+               dh-autoreconf,
                dpkg-dev (>= 1.16.1),
                hardening-includes,
                libglib2.0-dev (>= 2.30),

Copied: experimental/evolution/debian/patches/03_deprecated.patch (from r2059, unstable/evolution/debian/patches/03_deprecated.patch)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/03_deprecated.patch?rev=2060&op=diff
==============================================================================
--- unstable/evolution/debian/patches/03_deprecated.patch (original)
+++ experimental/evolution/debian/patches/03_deprecated.patch Thu Nov 24 19:13:27 2011
@@ -1,17 +1,20 @@
-Index: evolution-3.0.3/configure.ac
+Index: evolution-3.2.2/configure.ac
 ===================================================================
---- evolution-3.0.3.orig/configure.ac	2011-05-23 11:11:27.000000000 +0200
-+++ evolution-3.0.3/configure.ac	2011-11-24 20:09:30.472852655 +0100
-@@ -67,11 +67,7 @@ dnl ******************************
+--- evolution-3.2.2.orig/configure.ac	2011-10-20 12:38:02.000000000 +0200
++++ evolution-3.2.2/configure.ac	2011-11-24 20:12:25.689709264 +0100
+@@ -68,14 +68,7 @@ dnl ******************************
  dnl Compiler Warning Flags
  dnl ******************************
  AS_COMPILER_FLAGS(WARNING_FLAGS,
--	"-DG_DISABLE_DEPRECATED
--	-DPANGO_DISABLE_DEPRECATED
+-	"-DPANGO_DISABLE_DEPRECATED
 -	-DGDK_PIXBUF_DISABLE_DEPRECATED
 -	-DEDS_DISABLE_DEPRECATED
 -	-DG_DISABLE_SINGLE_INCLUDES
-+	"-DG_DISABLE_SINGLE_INCLUDES
- 	-DGTK_DISABLE_SINGLE_INCLUDES
- 	-Wall -Wextra
+-	-DGTK_DISABLE_SINGLE_INCLUDES
+-	-DE_BOOK_DISABLE_DEPRECATED
+-	-DE_CAL_DISABLE_DEPRECATED
+-	-Wall -Wextra
++	"-Wall -Wextra
  	-Wno-missing-field-initializers
+ 	-Wno-sign-compare
+ 	-Wno-unused-parameter

Modified: experimental/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/series?rev=2060&op=diff
==============================================================================
--- experimental/evolution/debian/patches/series (original)
+++ experimental/evolution/debian/patches/series Thu Nov 24 19:13:27 2011
@@ -1,1 +1,2 @@
 01_requires_private.patch
+03_deprecated.patch

Modified: experimental/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/rules?rev=2060&op=diff
==============================================================================
--- experimental/evolution/debian/rules (original)
+++ experimental/evolution/debian/rules Thu Nov 24 19:13:27 2011
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/buildvars.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk