r2059 - in /unstable/evolution/debian: changelog control patches/02_requires_private.patch patches/03_deprecated.patch patches/series rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Thu Nov 24 19:11:08 UTC 2011


Author: joss
Date: Thu Nov 24 19:11:08 2011
New Revision: 2059

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2059
Log:
* 02_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.

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

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=2059&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Thu Nov 24 19:11:08 2011
@@ -1,3 +1,14 @@
+evolution (3.0.3-3) unstable; urgency=low
+
+  * 02_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.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 24 Nov 2011 20:06:37 +0100
+
 evolution (3.0.3-2) unstable; urgency=low
 
   * Fix DEB_REVISION computation.

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

Copied: unstable/evolution/debian/patches/02_requires_private.patch (from r2056, experimental/evolution/debian/patches/01_requires_private.patch)
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/02_requires_private.patch?rev=2059&op=diff
==============================================================================
--- experimental/evolution/debian/patches/01_requires_private.patch (original)
+++ unstable/evolution/debian/patches/02_requires_private.patch Thu Nov 24 19:11:08 2011
@@ -1,13 +1,13 @@
-Index: evolution-3.2.2/evolution-shell.pc.in
+Index: evolution-3.0.3/evolution-shell.pc.in
 ===================================================================
---- evolution-3.2.2.orig/evolution-shell.pc.in	2011-04-26 16:32:44.000000000 +0200
-+++ evolution-3.2.2/evolution-shell.pc.in	2011-11-24 19:57:38.769373335 +0100
+--- evolution-3.0.3.orig/evolution-shell.pc.in	2011-01-31 08:05:37.000000000 +0100
++++ evolution-3.0.3/evolution-shell.pc.in	2011-11-24 20:06:02.463835750 +0100
 @@ -17,6 +17,7 @@ execversion=@BASE_VERSION@
  Name: evolution-shell
  Description: libraries needed for Evolution shell components
  Version: @VERSION@
--Requires: gtk+-3.0 gconf-2.0 gnome-desktop-3.0 libedataserverui-3.0
-+Requires: gtk+-3.0 gconf-2.0 libedataserverui-3.0
+-Requires: gtk+-3.0 gconf-2.0 gnome-desktop-3.0 libedataserverui-3.0 unique-3.0
++Requires: gtk+-3.0 gconf-2.0 libedataserverui-3.0 unique-3.0
 +Requires.private: gnome-desktop-3.0
  Libs: -L${privlibdir} -leshell -Wl,-R${privlibdir}
  Cflags: -I${privincludedir}

Added: unstable/evolution/debian/patches/03_deprecated.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/03_deprecated.patch?rev=2059&op=file
==============================================================================
--- unstable/evolution/debian/patches/03_deprecated.patch (added)
+++ unstable/evolution/debian/patches/03_deprecated.patch Thu Nov 24 19:11:08 2011
@@ -1,0 +1,17 @@
+Index: evolution-3.0.3/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 ******************************
+ dnl Compiler Warning Flags
+ dnl ******************************
+ AS_COMPILER_FLAGS(WARNING_FLAGS,
+-	"-DG_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
+ 	-Wno-missing-field-initializers

Modified: unstable/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/series?rev=2059&op=diff
==============================================================================
--- unstable/evolution/debian/patches/series (original)
+++ unstable/evolution/debian/patches/series Thu Nov 24 19:11:08 2011
@@ -1,1 +1,3 @@
 01_message_id.patch
+02_requires_private.patch
+03_deprecated.patch

Modified: unstable/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/rules?rev=2059&op=diff
==============================================================================
--- unstable/evolution/debian/rules (original)
+++ unstable/evolution/debian/rules Thu Nov 24 19:11:08 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




More information about the pkg-evolution-commits mailing list