r1616 - in /unstable/evolution-exchange/debian: changelog control evolution-exchange.install evolution-exchange.manpages patches/01_link_calendar.patch patches/10_bonobo-component-alias.patch patches/90_relibtoolize.patch patches/series rules
corsac at users.alioth.debian.org
corsac at users.alioth.debian.org
Mon May 17 17:52:05 UTC 2010
Author: corsac
Date: Mon May 17 17:52:04 2010
New Revision: 1616
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1616
Log:
merge experimental into unstable
Added:
unstable/evolution-exchange/debian/patches/01_link_calendar.patch
- copied unchanged from r1615, experimental/evolution-exchange/debian/patches/01_link_calendar.patch
unstable/evolution-exchange/debian/patches/90_relibtoolize.patch
- copied unchanged from r1615, experimental/evolution-exchange/debian/patches/90_relibtoolize.patch
unstable/evolution-exchange/debian/patches/series
- copied unchanged from r1615, experimental/evolution-exchange/debian/patches/series
Removed:
unstable/evolution-exchange/debian/evolution-exchange.manpages
unstable/evolution-exchange/debian/patches/10_bonobo-component-alias.patch
Modified:
unstable/evolution-exchange/debian/changelog
unstable/evolution-exchange/debian/control
unstable/evolution-exchange/debian/evolution-exchange.install
unstable/evolution-exchange/debian/rules
Modified: unstable/evolution-exchange/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-exchange/debian/changelog?rev=1616&op=diff
==============================================================================
--- unstable/evolution-exchange/debian/changelog (original)
+++ unstable/evolution-exchange/debian/changelog Mon May 17 17:52:04 2010
@@ -1,3 +1,18 @@
+evolution-exchange (2.29.92-1) experimental; urgency=low
+
+ * New upstream release candidate.
+ * Update build-dependencies.
+ * 10_bonobo-component-alias.patch: dropped, obsolete.
+ * Stop installing the manual page, it is outdated.
+ * Update installed files list.
+ * Use quilt to manage patches.
+ * 01_link_calendar.patch: add correct dependencies to the plugins,
+ otherwise they donât get the RPATH.
+ * 90_relibtoolize.patch: re-run the autotools on top of that.
+ * Pass --no-act to dh_makeshlibs.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 20 Mar 2010 13:02:17 +0100
+
evolution-exchange (2.28.3-1) unstable; urgency=low
* New upstream bugfix release.
Modified: unstable/evolution-exchange/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-exchange/debian/control?rev=1616&op=diff
==============================================================================
--- unstable/evolution-exchange/debian/control (original)
+++ unstable/evolution-exchange/debian/control Mon May 17 17:52:04 2010
@@ -17,39 +17,37 @@
Build-Depends: debhelper (>= 5.0.0),
dpkg-dev (>= 1.14.16),
cdbs (>= 0.4.37),
+ quilt,
pkg-config,
libglib2.0-dev (>= 2.16.0),
libgtk2.0-dev (>= 2.10.0),
libgconf2-dev (>= 2.0.0),
- libbonobo2-dev (>= 2.20.3),
- libglade2-dev,
- libgnomeui-dev (>= 2.0.0),
libxml2-dev (>= 2.0.0),
- libsoup2.4-dev (>= 2.3.0),
- libebook1.2-dev (>= 2.28.1),
- libecal1.2-dev (>= 2.28.1),
+ libsoup2.4-dev (>= 2.3.0),
+ libebook1.2-dev (>= 2.29.92),
+ libecal1.2-dev (>= 2.29.92),
libical-dev,
- libedataserver1.2-dev (>= 2.28.1),
- libedataserverui1.2-dev (>= 2.28.1),
- libegroupwise1.2-dev (>= 2.28.1),
- libebackend1.2-dev (>= 2.28.1),
- libexchange-storage1.2-dev (>= 2.28.1),
- evolution-dev (>= 2.26),
+ libedataserver1.2-dev (>= 2.29.92),
+ libedataserverui1.2-dev (>= 2.29.92),
+ libedata-book1.2-dev (>= 2.29.92),
+ libedata-cal1.2-dev (>= 2.29.92),
+ libegroupwise1.2-dev (>= 2.29.92),
+ libebackend1.2-dev (>= 2.29.92),
+ evolution-dev (>= 2.29.92),
intltool (>= 0.35.5),
liborbit2-dev,
- libcamel1.2-dev (>= 2.28.1),
- libedata-book1.2-dev (>= 2.28.1),
- libedata-cal1.2-dev (>= 2.28.1),
+ libcamel1.2-dev (>= 2.29.92),
libldap2-dev,
- gtk-doc-tools (>= 1.0),
- libdb-dev
+ gtk-doc-tools (>= 1.9),
+ libdb-dev,
+ libkrb5-dev
Package: evolution-exchange
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- evolution (>= 2.28.0),
- evolution (<< 2.29.0)
+ evolution (>= 2.29.0),
+ evolution (<< 2.30.0)
Conflicts: ximian-connector
Provides: ximian-connector
Replaces: ximian-connector
Modified: unstable/evolution-exchange/debian/evolution-exchange.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-exchange/debian/evolution-exchange.install?rev=1616&op=diff
==============================================================================
--- unstable/evolution-exchange/debian/evolution-exchange.install (original)
+++ unstable/evolution-exchange/debian/evolution-exchange.install Mon May 17 17:52:04 2010
@@ -1,9 +1,11 @@
debian/tmp/etc/gconf/schemas
debian/tmp/usr/bin
-debian/tmp/usr/lib/evolution
-debian/tmp/usr/lib/bonobo
+debian/tmp/usr/lib/evolution/*/plugins/*.eplug
+debian/tmp/usr/lib/evolution/*/plugins/*.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/extensions/*.so
+debian/tmp/usr/share/evolution
debian/tmp/usr/share/evolution-exchange
debian/tmp/usr/share/gtk-doc
debian/tmp/usr/share/locale
Modified: unstable/evolution-exchange/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-exchange/debian/rules?rev=1616&op=diff
==============================================================================
--- unstable/evolution-exchange/debian/rules (original)
+++ unstable/evolution-exchange/debian/rules Mon May 17 17:52:04 2010
@@ -1,7 +1,9 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/gnome.mk
CFLAGS += -fPIC
+
+DEB_DH_MAKESHLIBS_ARGS_ALL += --no-act
More information about the pkg-evolution-commits
mailing list