r2057 - in /unstable/evolution/debian: changelog control evolution-common.install evolution.install patches/01_message_id.patch patches/series rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Thu Nov 24 19:03:22 UTC 2011
Author: joss
Date: Thu Nov 24 19:03:22 2011
New Revision: 2057
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2057
Log:
Revert all changes that were meant for experimental branch.
Added:
unstable/evolution/debian/patches/01_message_id.patch
- copied unchanged from r1988, unstable/evolution/debian/patches/01_message_id.patch
unstable/evolution/debian/patches/series
- copied unchanged from r1988, unstable/evolution/debian/patches/series
Modified:
unstable/evolution/debian/changelog
unstable/evolution/debian/control
unstable/evolution/debian/evolution-common.install
unstable/evolution/debian/evolution.install
unstable/evolution/debian/rules
Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=2057&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Thu Nov 24 19:03:22 2011
@@ -1,30 +1,3 @@
-evolution (3.2.1-1) UNRELEASED; urgency=low
-
- [ Yves-Alexis Perez ]
- * New upstream release.
- * debian/control:
- - bump eds build-deps and deps to 3.2.
- - bump gtkhtml build-dep to 4.2.
- - drop build-dep and dep on libunique
- - add build-dep on gsettings-desktop-schemas-dev and libchamplain.
- - update dpkg-dev build-dep for hardening.
- - drop build-dep on libegroupwise.
- * debian/rules:
- - set hardening flags directly from cdbs
- - update ELIBDIR for 3.2.
- * debian/patches:
- - 01_message_id dropped, included upstream.
- * debian/evolution.install:
- - drop groupwise plugin since it doesn't exist anymore
- * debian/evolution-common.install:
- - drop /u/s/h/omf since it doesn't exist anymore
-
- [ Sjoerd Simons ]
- * New upstream release
- * enable goa
-
- -- Sjoerd Simons <sjoerd at debian.org> Sat, 05 Nov 2011 10:46:18 +0000
-
evolution (3.0.3-2) unstable; urgency=low
* Fix DEB_REVISION computation.
@@ -42,8 +15,6 @@
* debian/evolution-dev.install:
- drop brace expansion, since it's not officially supported by debhelper.
- don't install .a files anymore, they're gone now.
- * debian/rules:
- - remove .la files instead of not installing them.
-- Yves-Alexis Perez <corsac at debian.org> Fri, 02 Sep 2011 00:01:41 +0200
Modified: unstable/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/control?rev=2057&op=diff
==============================================================================
--- unstable/evolution/debian/control (original)
+++ unstable/evolution/debian/control Thu Nov 24 19:03:22 2011
@@ -17,20 +17,21 @@
Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution
Build-Depends: debhelper (>= 7.2.3~),
cdbs (>= 0.4.52),
- dpkg-dev (>= 1.16.1),
+ dpkg-dev (>= 1.14.16),
hardening-includes,
- libglib2.0-dev (>= 2.30),
+ libglib2.0-dev (>= 2.28),
libgtk-3-dev (>= 3.0.2),
libgail-3-dev (>= 3.0.2),
- libebook1.2-dev (>= 3.2.0),
- libecal1.2-dev (>= 3.2.0),
- libedataserver1.2-dev (>= 3.2.0),
- libedataserverui-3.0-dev (>= 3.2.0),
- libebackend1.2-dev (>= 3.2.0),
- libcamel1.2-dev (>= 3.2.0),
- evolution-data-server-dev (>= 3.2.0),
- evolution-data-server-dev (<< 3.3),
- libgtkhtml-4.0-dev (>= 4.1.2),
+ libebook1.2-dev (>= 3.0.3),
+ libecal1.2-dev (>= 3.0.3),
+ libedataserver1.2-dev (>= 3.0.3),
+ libedataserverui-3.0-dev (>= 3.0.3),
+ libegroupwise1.2-dev (>= 3.0.3),
+ libebackend1.2-dev (>= 3.0.3),
+ libcamel1.2-dev (>= 3.0.3),
+ evolution-data-server-dev (>= 3.0.3),
+ evolution-data-server-dev (<< 3.1),
+ libgtkhtml-4.0-dev (>= 3.91.3),
libgtkhtml-editor-4.0-dev,
libgnome-desktop-3-dev (>= 2.91.3),
gnome-icon-theme (>= 2.30.2.1),
@@ -39,6 +40,7 @@
libxml2-dev (>= 2.7.3),
shared-mime-info (>= 0.22),
libnotify-dev (>= 0.7),
+ libunique-3.0-dev (>= 2.90.4),
libgweather-3-dev (>= 2.90.0),
libcanberra-gtk3-dev (>= 0.25),
network-manager-dev (>= 0.7) [linux-any],
@@ -63,17 +65,15 @@
libgstreamer0.10-dev,
po-debconf,
rarian-compat,
- gnome-pkg-tools,
- gsettings-desktop-schemas-dev (>= 2.91.92),
- libchamplain-0.12-dev
+ gnome-pkg-tools
Package: evolution
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
evolution-common (= ${source:Version}),
- evolution-data-server (>= 3.2),
- evolution-data-server (<< 3.3),
+ evolution-data-server (>= 3.0),
+ evolution-data-server (<< 3.1),
gnome-icon-theme (>= 2.30.2.1),
dbus,
psmisc
@@ -95,7 +95,7 @@
Evolution is a groupware suite which integrates mail, calendar,
address book, to-do list and memo tools.
.
- Additional features include integration with Exchange
+ Additional features include integration with Exchange and Groupwise
servers, newsgroup client, LDAP support and web calendars
.
Evolution is a graphical application that is part of GNOME, and
@@ -111,6 +111,7 @@
- default-source
- addressbook-file
- mark-all-read
+ - groupwise-features
- publish-calendar
- caldav
- imap-features
@@ -148,6 +149,7 @@
# evolution-plugin
libxml2-dev,
libcamel1.2-dev,
+ libunique-3.0-dev,
libgtkhtml-4.0-dev,
libgtkhtml-editor-4.0-dev,
# evolution-shell
Modified: unstable/evolution/debian/evolution-common.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution-common.install?rev=2057&op=diff
==============================================================================
--- unstable/evolution/debian/evolution-common.install (original)
+++ unstable/evolution/debian/evolution-common.install Thu Nov 24 19:03:22 2011
@@ -3,4 +3,5 @@
debian/tmp/usr/share/icons/hicolor
debian/tmp/usr/share/locale
debian/tmp/usr/share/gnome
+debian/tmp/usr/share/omf
debian/lintian/evolution-common usr/share/lintian/overrides/
Modified: unstable/evolution/debian/evolution.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution.install?rev=2057&op=diff
==============================================================================
--- unstable/evolution/debian/evolution.install (original)
+++ unstable/evolution/debian/evolution.install Thu Nov 24 19:03:22 2011
@@ -1,6 +1,6 @@
debian/tmp/etc/gconf
debian/tmp/etc/xdg
debian/tmp/usr/bin
-debian/tmp/usr/lib/evolution/*/plugins/*-{calendar-file,calendar-http,itip-formatter,default-source,addressbook-file,mark-all-read,publish-calendar,caldav,imap-features,google,webdav,calendar-weather,sa-junk-plugin,bogo-junk-plugin}.{so,eplug,xml}
+debian/tmp/usr/lib/evolution/*/plugins/*-{calendar-file,calendar-http,itip-formatter,default-source,addressbook-file,mark-all-read,groupwise-features,publish-calendar,caldav,imap-features,google,webdav,calendar-weather,sa-junk-plugin,bogo-junk-plugin}.{so,eplug,xml}
debian/tmp/usr/share/applications
debian/evolution.xpm usr/share/pixmaps/
Modified: unstable/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/rules?rev=2057&op=diff
==============================================================================
--- unstable/evolution/debian/rules (original)
+++ unstable/evolution/debian/rules Thu Nov 24 19:03:22 2011
@@ -9,15 +9,19 @@
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
include /usr/share/hardening-includes/hardening.make
-ELIBDIR := usr/lib/evolution/3.2
+ELIBDIR := usr/lib/evolution/3.0
DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR)
DEB_DH_MAKESHLIBS_ARGS_libevolution += -V'libevolution (>= $(DEB_GNOME_VERSION)), libevolution (<< $(DEB_GNOME_NEXTVERSION))' --noscripts -X $(ELIBDIR)/modules
DEB_DH_MAKESHLIBS_ARGS_evolution += -V
DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins
-export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
-export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+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)
+
+export CFLAGS LDFLAGS
DEB_REVISION := $(shell echo $(DEB_VERSION) | awk -F- '{ print $$NF }')
@@ -31,7 +35,6 @@
--disable-pst-import \
--disable-contacts-map \
--disable-image-inline \
- --enable-goa \
--with-sub-version=-$(DEB_REVISION)
ifneq ($(DEB_HOST_ARCH_OS), linux)
@@ -40,10 +43,6 @@
DEB_CONFIGURE_EXTRA_FLAGS+=--enable-nm
endif
-binary-install/evolution-dev::
- rm debian/tmp/evolution/*.la
- rm debian/tmp/evolution/*/*.la
-
clean::
debconf-updatepo
find -name '*.schemas' | xargs rm -f
More information about the pkg-evolution-commits
mailing list