r2182 - in /experimental/evolution-data-server/debian: changelog control evolution-data-server-common.install rules

[jordi at users.alioth.debian.org]

Author: jordi
Date: Fri May 18 16:43:27 2012
New Revision: 2182

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2182
Log:
* New upstream version.
* Add list-missing target.
* Install gsettings schemas and gconf conversion scripts.
* Include buildflags.mk, and adjust rules to use all hardening flags.
* Let libedataserverui-3.0-dev Break/Replace obsolete
  libedataserverui1.2-dev (closes: #672253).

Modified:
    experimental/evolution-data-server/debian/changelog
    experimental/evolution-data-server/debian/control
    experimental/evolution-data-server/debian/evolution-data-server-common.install
    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=2182&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/changelog (original)
+++ experimental/evolution-data-server/debian/changelog Fri May 18 16:43:27 2012
@@ -1,3 +1,14 @@
+evolution-data-server (3.4.2-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+  * Add list-missing target.
+  * Install gsettings schemas and gconf conversion scripts.
+  * Include buildflags.mk, and adjust rules to use all hardening flags.
+  * Let libedataserverui-3.0-dev Break/Replace obsolete
+    libedataserverui1.2-dev (closes: #672253).
+
+ -- Jordi Mallach <jordi at debian.org>  Fri, 18 May 2012 17:55:44 +0200
+
 evolution-data-server (3.4.1-1) experimental; urgency=low
 
   * New upstream version.

Modified: experimental/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/control?rev=2182&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/control (original)
+++ experimental/evolution-data-server/debian/control Fri May 18 16:43:27 2012
@@ -237,6 +237,8 @@
          libgtk-3-dev,
          libedataserver1.2-dev (= ${binary:Version}),
          libebook1.2-dev (= ${binary:Version})
+Breaks: libedataserverui1.2-dev
+Replaces: libedataserverui1.2-dev
 Description: GUI utility library for evolution data servers (development files)
  The data server, called "Evolution Data Server" is responsible for managing
  calendar and addressbook information.

Modified: experimental/evolution-data-server/debian/evolution-data-server-common.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/evolution-data-server-common.install?rev=2182&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/evolution-data-server-common.install (original)
+++ experimental/evolution-data-server/debian/evolution-data-server-common.install Fri May 18 16:43:27 2012
@@ -1,4 +1,6 @@
+debian/tmp/usr/share/GConf
+debian/tmp/usr/share/dbus-1
 debian/tmp/usr/share/evolution-data-server-*
+debian/tmp/usr/share/glib-2.0
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/pixmaps
-debian/tmp/usr/share/dbus-1

Modified: experimental/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/rules?rev=2182&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/rules (original)
+++ experimental/evolution-data-server/debian/rules Fri May 18 16:43:27 2012
@@ -15,7 +15,8 @@
 DEB_DH_MAKESHLIBS_ARGS_libcamel-1.2-33 += -V'libcamel-1.2-33 (>= $(DEB_GNOME_VERSION)), libcamel-1.2-33 (<< $(DEB_GNOME_NEXTVERSION))'
 
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
-export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+include /usr/share/dpkg/buildflags.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += --sysconfdir=/etc \
 	--libexecdir=\$${prefix}/lib/evolution \
@@ -41,3 +42,5 @@
 		$(CURDIR)/debian/evolution-data-server/usr/lib/evolution/camel*1.2
 	rm $(CURDIR)/debian/tmp/usr/lib/evolution-data-server/*/*.la
 	rm $(CURDIR)/debian/tmp/usr/lib/*.la
+
+common-binary-post-install-arch:: list-missing