r1612 - in /unstable/evolution/debian: changelog control evolution-dev.install evolution.install libevolution.install lintian/evolution-plugins lintian/evolution-plugins-experimental rules
corsac at users.alioth.debian.org
corsac at users.alioth.debian.org
Mon May 17 12:27:55 UTC 2010
Author: corsac
Date: Mon May 17 12:27:54 2010
New Revision: 1612
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1612
Log:
try to fix messed up merge...
Added:
unstable/evolution/debian/libevolution.install
- copied unchanged from r1602, experimental/evolution/debian/libevolution.install
Removed:
unstable/evolution/debian/lintian/evolution-plugins
unstable/evolution/debian/lintian/evolution-plugins-experimental
Modified:
unstable/evolution/debian/changelog
unstable/evolution/debian/control
unstable/evolution/debian/evolution-dev.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=1612&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Mon May 17 12:27:54 2010
@@ -5,8 +5,10 @@
* debian/control:
- drop recommends on gnome-pilot-conduits since we don't build anymore
with pilot support. closes: #580293
-
- -- Yves-Alexis Perez <corsac at debian.org> Wed, 05 May 2010 08:00:26 +0200
+ * debian/evolution-dev.install:
+ - ship documentation.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 17 May 2010 14:14:52 +0200
evolution (2.30.1.2-1) experimental; urgency=low
Modified: unstable/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/control?rev=1612&op=diff
==============================================================================
--- unstable/evolution/debian/control (original)
+++ unstable/evolution/debian/control Mon May 17 12:27:54 2010
@@ -55,17 +55,19 @@
libnotify-dev (>= 0.3.0),
libsoup2.4-dev,
libdbus-1-dev,
- libexchange-storage1.2-dev (>= 2.28.3),
libgstreamer0.10-dev,
libytnef0-dev,
automake,
libtool,
libical-dev,
libicu-dev,
- libgweather-dev (>= 2.24.5),
+ libgweather-dev (>= 2.25.3),
po-debconf,
libgnome-desktop-dev (>= 2.26.0),
- sharutils
+ sharutils,
+ libunique-dev,
+ libcanberra-dev,
+ libcanberra-gtk-dev,
libgtkimageview-dev,
libunique-dev
@@ -127,7 +129,6 @@
- google-account-setup
- sa-junk-plugin
- bogo-junk-plugin
- - exchange-operations
- mono
Package: libevolution
@@ -154,23 +155,7 @@
Architecture: any
Depends: evolution (= ${binary:Version}),
${misc:Depends},
- ${shlibs:Depends},
-# evolution-plugin
- libxml2-dev,
- libcamel1.2-dev,
- libunique-dev,
- libgtkhtml3.14-dev,
- libgtkhtml-editor-dev,
- libgnomecanvas2-dev,
-# evolution-shell
- libdbus-glib-1-dev,
- libgconf2-dev,
- libgnome-desktop-dev,
- libgtk2.0-dev,
- libedataserverui1.2-dev,
- libglade2-dev,
-# other (to check against 2.28)
- libebook1.2-dev,
+ ${shlibs:Depends},
libgtkhtml3.14-dev,
libgnome2-dev,
libcamel1.2-dev,
@@ -227,6 +212,8 @@
- attachment-reminder
- face
- backup-restore
+ - templates
+ - vcard-inline
- image-inline
Package: evolution-plugins-experimental
@@ -252,5 +239,3 @@
- tnef-attachments
- email-custom-headers
- evolution-webdav
- - templates
- - vcard-inline
Modified: unstable/evolution/debian/evolution-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution-dev.install?rev=1612&op=diff
==============================================================================
--- unstable/evolution/debian/evolution-dev.install (original)
+++ unstable/evolution/debian/evolution-dev.install Mon May 17 12:27:54 2010
@@ -1,4 +1,4 @@
debian/tmp/usr/lib/pkgconfig
debian/tmp/usr/include
-debian/tmp/usr/share/idl
debian/tmp/usr/lib/evolution/*/*.{a,so}
+debian/tmp/usr/share/gtk-doc
Modified: unstable/evolution/debian/evolution.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution.install?rev=1612&op=diff
==============================================================================
--- unstable/evolution/debian/evolution.install (original)
+++ unstable/evolution/debian/evolution.install Mon May 17 12:27:54 2010
@@ -1,13 +1,5 @@
debian/tmp/etc/gconf
-debian/tmp/usr/lib/evolution/2.28/*.so.*
-debian/tmp/usr/lib/evolution/2.28/components/*.so
-debian/tmp/usr/lib/evolution/2.28/conduits/*.so
-debian/tmp/usr/lib/evolution/2.28/csv2vcard
-debian/tmp/usr/lib/evolution/2.28/killev
-debian/tmp/usr/lib/evolution/2.28/evolution-addressbook-export
-debian/tmp/usr/lib/evolution/2.28/evolution-addressbook-clean
-debian/tmp/usr/lib/evolution/2.28/evolution-alarm-notify
-debian/tmp/usr/lib/evolution/2.28/evolution-backup
+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/
Modified: unstable/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/rules?rev=1612&op=diff
==============================================================================
--- unstable/evolution/debian/rules (original)
+++ unstable/evolution/debian/rules Mon May 17 12:27:54 2010
@@ -10,10 +10,11 @@
UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg')
-ELIBDIR := usr/lib/evolution/2.28
+ELIBDIR := usr/lib/evolution/2.30
DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR)
-DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' --noscripts -X $(ELIBDIR)/components
+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
@@ -23,12 +24,7 @@
--with-openldap \
--enable-nls \
--disable-pilot-conduits \
- --enable-cairo-calendar \
- --enable-exchange=yes \
- --without-krb4 \
--with-krb5=/usr \
- --enable-ipv6 \
- --disable-openssl \
--sysconfdir=/etc \
--libexecdir=/usr/lib \
--enable-plugins=experimental \
More information about the pkg-evolution-commits
mailing list