r1800 - in /experimental/evolution-data-server/debian: changelog evolution-data-server.install patches/25_mute-debug-messages.patch patches/series rules

[corsac at users.alioth.debian.org]

Author: corsac
Date: Thu Nov 18 18:46:12 2010
New Revision: 1800

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1800
Log:
  - 25_mute-debug-messages dropped, included upstream.
  - 45_libcamel_providers_version finally dropped, stop diverting from
    upstream on this.
  - add hardening, -z,defs, -O1 and --as-needed to LDFLAGS.
* debian/evolution-data-server.install:
  - update install file to follow camel-provider rename patch removal.

Removed:
    experimental/evolution-data-server/debian/patches/25_mute-debug-messages.patch
Modified:
    experimental/evolution-data-server/debian/changelog
    experimental/evolution-data-server/debian/evolution-data-server.install
    experimental/evolution-data-server/debian/patches/series
    experimental/evolution-data-server/debian/rules

Modified: experimental/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/changelog?rev=1800&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/changelog (original)
+++ experimental/evolution-data-server/debian/changelog Thu Nov 18 18:46:12 2010
@@ -1,4 +1,4 @@
-evolution-data-server (2.32.0-1) UNRELEASED; urgency=low
+evolution-data-server (2.32.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * debian/watch updated.
@@ -20,11 +20,14 @@
         105-Bug-629916-imapx-fails-to-handle-errors-in-imapx_com, 
         106-Bug-630149-imapx_sync-never-returns-error dropped as well,
         included upstream.
+    - 25_mute-debug-messages dropped, included upstream.
+    - 45_libcamel_providers_version finally dropped, stop diverting from
+      upstream on this.
   * debian/rules:
     - explicitly disable gtk3 build.
     - get flags from dpkg-buildflags.
     - include hardening rules.
-    - add hardening and --as-needed to LDFLAGS.
+    - add hardening, -z,defs, -O1 and --as-needed to LDFLAGS.
     - add hardening to CFLAGS.
   * debian/libcamel1.2-14.shlibs: 
     - bump depends/conflicts for 2.32.
@@ -37,8 +40,10 @@
   * debian/libecal1.2-7.install renamed to follow soname change.
   * debian/libedata-cal1.2-7.install renamed to follow soname change.
   * lintian overrides updated to follow soname changes.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 04 Oct 2010 08:38:26 +0200
+  * debian/evolution-data-server.install:
+    - update install file to follow camel-provider rename patch removal.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 18 Nov 2010 18:53:42 +0100
 
 evolution-data-server (2.30.3-2) unstable; urgency=low
 

Modified: experimental/evolution-data-server/debian/evolution-data-server.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/evolution-data-server.install?rev=1800&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/evolution-data-server.install (original)
+++ experimental/evolution-data-server/debian/evolution-data-server.install Thu Nov 18 18:46:12 2010
@@ -1,5 +1,5 @@
 debian/tmp/usr/lib/evolution
 debian/tmp/usr/lib/evolution-data-server-1.2/extensions/*.so
-debian/tmp/usr/lib/evolution-data-server-1.2/camel-providers-*/*.urls
-debian/tmp/usr/lib/evolution-data-server-1.2/camel-providers-*/*.so
+debian/tmp/usr/lib/evolution-data-server-1.2/camel-providers/*.urls
+debian/tmp/usr/lib/evolution-data-server-1.2/camel-providers/*.so
 debian/lintian/evolution-data-server usr/share/lintian/overrides/

Modified: experimental/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/patches/series?rev=1800&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/patches/series (original)
+++ experimental/evolution-data-server/debian/patches/series Thu Nov 18 18:46:12 2010
@@ -1,2 +1,0 @@
-25_mute-debug-messages.patch
-45_libcamel_providers_version.patch

Modified: experimental/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/rules?rev=1800&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/rules (original)
+++ experimental/evolution-data-server/debian/rules Thu Nov 18 18:46:12 2010
@@ -17,7 +17,7 @@
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 CFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
 
 DEB_CONFIGURE_EXTRA_FLAGS += --sysconfdir=/etc \
 	--libexecdir=\$${prefix}/lib/evolution \