r1805 - in /unstable/evolution/debian: changelog control evolution-mail.desktop evolution-plugins-experimental.install evolution-plugins.install evolution.install libevolution.install patches/ rules
corsac at users.alioth.debian.org
corsac at users.alioth.debian.org
Sun Feb 6 14:48:08 UTC 2011
Author: corsac
Date: Sun Feb 6 14:48:07 2011
New Revision: 1805
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1805
Log:
merge experimental changes into unstable
Removed:
unstable/evolution/debian/evolution-mail.desktop
unstable/evolution/debian/patches/
Modified:
unstable/evolution/debian/changelog
unstable/evolution/debian/control
unstable/evolution/debian/evolution-plugins-experimental.install
unstable/evolution/debian/evolution-plugins.install
unstable/evolution/debian/evolution.install
unstable/evolution/debian/libevolution.install
unstable/evolution/debian/rules
Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1805&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Sun Feb 6 14:48:07 2011
@@ -1,3 +1,29 @@
+evolution (2.32.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ - categories are now editable. closes: #591950
+ * debian/control:
+ - bump build-deps for 2.32 release.
+ - add build-dep on libchamplain and geoclue to add contacts map plugin.
+ - add build-dep on hardening-includes.
+ * debian/rules:
+ - pick flags from dpkg-buildflags.
+ - include hardening rules.
+ - add hardening flags, -z,defs, -O1 and --as-needed to LDFLAGS
+ - add hardening flags to CFLAGS.
+ - explicitly disable GTK3 build.
+ - don't disable contact maps, drop pilot conduit disabling (useless now).
+ * debian/patches:
+ - 02_let-nss-search-for-nssckbi, 03_correctly-init-nss and
+ 04_login-to-nss-on-demand dropped, included upstream.
+ * debian/*.install:
+ - install in 2.32 folder
+ * debian/evolution-mail.desktop dropped, stick with upstream.
+ * debian/evolution-plugins-experimental.install:
+ - add contact-maps and dbx-import plugins.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 18 Oct 2010 17:58:29 +0200
+
evolution (2.30.3-5) unstable; urgency=low
* debian/po:
Modified: unstable/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/control?rev=1805&op=diff
==============================================================================
--- unstable/evolution/debian/control (original)
+++ unstable/evolution/debian/control Sun Feb 6 14:48:07 2011
@@ -17,6 +17,7 @@
Build-Depends: debhelper (>= 7.2.3~),
cdbs (>= 0.4.52),
dpkg-dev (>= 1.14.16),
+ hardening-includes,
scrollkeeper,
flex,
bison,
@@ -28,28 +29,26 @@
gtk-doc-tools (>= 0.6),
libatk1.0-dev,
libldap2-dev,
- libgtkhtml3.14-dev (>= 3.30.3),
- libgtkhtml-editor-dev (>= 3.30.3),
+ libgtkhtml3.14-dev (>= 3.32.1),
+ libgtkhtml-editor-3.14-dev (>= 3.32.1),
libkrb5-dev,
libnss3-dev,
psmisc,
- libglib2.0-dev (>= 2.22.0),
- evolution-data-server-dev (>= 2.30.3),
- evolution-data-server-dev (<< 2.31),
- libgtk2.0-dev (>= 2.18.0),
- libgnomecanvas2-dev,
+ libglib2.0-dev (>= 2.25.12),
+ evolution-data-server-dev (>= 2.32.1),
+ evolution-data-server-dev (<< 2.33),
+ libgtk2.0-dev (>= 2.20.0),
libxml2-dev,
libgconf2-dev,
- libcamel1.2-dev (>= 2.30.3),
- libedataserver1.2-dev (>= 2.30.3),
- libegroupwise1.2-dev (>= 2.30.3),
- libedataserverui1.2-dev (>= 2.30.3),
- libebackend1.2-dev (>= 2.30.3),
- libgdata1.2-dev (>= 2.30.3),
- libgdata-google1.2-dev (>= 2.30.3),
+ libcamel1.2-dev (>= 2.32.1),
+ libedataserver1.2-dev (>= 2.32.1),
+ libegroupwise1.2-dev (>= 2.32.1),
+ libedataserverui1.2-dev (>= 2.32.1),
+ libebackend1.2-dev (>= 2.32.1),
+ libgdata-dev,
+ libecal1.2-dev (>= 2.32.1),
+ libebook1.2-dev (>= 2.32.1),
libgnome2-dev,
- libecal1.2-dev (>= 2.30.3),
- libebook1.2-dev (>= 2.30.3),
libdbus-glib-1-dev,
libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libnotify-dev (>= 0.3.0),
@@ -65,21 +64,24 @@
po-debconf,
libgnome-desktop-dev (>= 2.26.0),
sharutils,
- libunique-dev,
+ libunique-dev (>= 1.1.2),
libcanberra-dev,
libcanberra-gtk-dev,
- libgtkimageview-dev,
- libunique-dev,
- gnome-pkg-tools
+ libgtkimageview-dev (>= 1.6),
+ gnome-pkg-tools,
+ libclutter-gtk-0.10-dev (>= 0.10),
+ libchamplain-0.4-dev,
+ libchamplain-gtk-0.4-dev,
+ libgeoclue-dev
Package: evolution
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
evolution-common (= ${source:Version}),
- evolution-data-server (>= 2.30.3),
- evolution-data-server (<< 2.31),
- gnome-icon-theme (>= 2.19.92),
+ evolution-data-server (>= 2.32.1),
+ evolution-data-server (<< 2.33),
+ gnome-icon-theme (>= 2.30.2.1),
dbus
Pre-Depends: debconf (>= 1.4.69) | debconf-2.0
Recommends: gnome-desktop-data,
@@ -162,7 +164,7 @@
libcamel1.2-dev,
libunique-dev,
libgtkhtml3.14-dev,
- libgtkhtml-editor-dev,
+ libgtkhtml-editor-3.14-dev,
libgnomecanvas2-dev,
# evolution-shell
libgconf2-dev,
Modified: unstable/evolution/debian/evolution-plugins-experimental.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution-plugins-experimental.install?rev=1805&op=diff
==============================================================================
--- unstable/evolution/debian/evolution-plugins-experimental.install (original)
+++ unstable/evolution/debian/evolution-plugins-experimental.install Sun Feb 6 14:48:07 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/evolution/2.30/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments,profiler}*.{so,eplug,xml}
+debian/tmp/usr/lib/evolution/*/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments,profiler,contacts-map,dbx-import}*.{so,eplug,xml}
Modified: unstable/evolution/debian/evolution-plugins.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution-plugins.install?rev=1805&op=diff
==============================================================================
--- unstable/evolution/debian/evolution-plugins.install (original)
+++ unstable/evolution/debian/evolution-plugins.install Sun Feb 6 14:48:07 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/evolution/2.30/plugins/*{attachment-reminder,audio-inline,bbdb,subject-thread,save-calendar,select-one-source,copy-tool,face,mail-to-task,mark-calendar-offline,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,backup-restore,email-custom-header,templates,vcard-inline,image-inline}*.{so,eplug,xml}
+debian/tmp/usr/lib/evolution/*/plugins/*{attachment-reminder,audio-inline,bbdb,subject-thread,save-calendar,select-one-source,copy-tool,face,mail-to-task,mark-calendar-offline,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,backup-restore,email-custom-header,templates,vcard-inline,image-inline}*.{so,eplug,xml}
Modified: unstable/evolution/debian/evolution.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution.install?rev=1805&op=diff
==============================================================================
--- unstable/evolution/debian/evolution.install (original)
+++ unstable/evolution/debian/evolution.install Sun Feb 6 14:48:07 2011
@@ -1,6 +1,5 @@
debian/tmp/etc/gconf
debian/tmp/etc/xdg
debian/tmp/usr/bin
-debian/tmp/usr/lib/evolution/2.30/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,webdav,imap-features,google,sa-junk-plugin,bogo-junk-plugin,folder-permissions,folder-subscription}*.{so,eplug,xml}
-debian/evolution-mail.desktop usr/share/applications/
+debian/tmp/usr/lib/evolution/*/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,webdav,imap-features,google,sa-junk-plugin,bogo-junk-plugin,folder-permissions,folder-subscription}*.{so,eplug,xml}
debian/evolution.xpm usr/share/pixmaps/
Modified: unstable/evolution/debian/libevolution.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/libevolution.install?rev=1805&op=diff
==============================================================================
--- unstable/evolution/debian/libevolution.install (original)
+++ unstable/evolution/debian/libevolution.install Sun Feb 6 14:48:07 2011
@@ -1,8 +1,8 @@
-debian/tmp/usr/lib/evolution/2.30/*.so.*
-debian/tmp/usr/lib/evolution/2.30/csv2vcard
-debian/tmp/usr/lib/evolution/2.30/modules/*.so
-debian/tmp/usr/lib/evolution/2.30/evolution-addressbook-export
-debian/tmp/usr/lib/evolution/2.30/evolution-addressbook-clean
-debian/tmp/usr/lib/evolution/2.30/evolution-backup
-debian/tmp/usr/lib/evolution/2.30/evolution-alarm-notify
-debian/tmp/usr/lib/evolution/2.30/killev
+debian/tmp/usr/lib/evolution/*/*.so.*
+debian/tmp/usr/lib/evolution/*/csv2vcard
+debian/tmp/usr/lib/evolution/*/modules/*.so
+debian/tmp/usr/lib/evolution/*/evolution-addressbook-export
+debian/tmp/usr/lib/evolution/*/evolution-addressbook-clean
+debian/tmp/usr/lib/evolution/*/evolution-backup
+debian/tmp/usr/lib/evolution/*/evolution-alarm-notify
+debian/tmp/usr/lib/evolution/*/killev
Modified: unstable/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/rules?rev=1805&op=diff
==============================================================================
--- unstable/evolution/debian/rules (original)
+++ unstable/evolution/debian/rules Sun Feb 6 14:48:07 2011
@@ -6,30 +6,34 @@
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/hardening-includes/hardening.make
UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg')
-ELIBDIR := usr/lib/evolution/2.30
+ELIBDIR := usr/lib/evolution/2.32
DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR)
DEB_DH_MAKESHLIBS_ARGS_libevolution += -V'libevolution (>= ${UPSTREAM_VERSION})' --noscripts -X $(ELIBDIR)/modules
DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})'
DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+CFLAGS += $(HARDENING_CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed $(HARDENING_LDFLAGS)
-CFLAGS += -fPIC
+export CFLAGS LDFLAGS
DEB_CONFIGURE_EXTRA_FLAGS += \
--with-openldap \
--enable-nls \
- --disable-pilot-conduits \
--with-krb5=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/lib \
--enable-plugins=experimental \
--disable-pst-import \
- --disable-contacts-map
+ --enable-gtk3=no
ifneq ($(DEB_HOST_ARCH_OS), linux)
DEB_CONFIGURE_EXTRA_FLAGS+=--disable-nm
More information about the pkg-evolution-commits
mailing list