r1173 - in /unstable/evolution/debian: changelog control evolution-mail.desktop evolution-plugins-experimental.install evolution-plugins.install evolution.install evolution.links lintian/evolution-plugins lintian/evolution-plugins-experimental rules
corsac at users.alioth.debian.org
corsac at users.alioth.debian.org
Sat Apr 25 12:05:23 UTC 2009
Author: corsac
Date: Sat Apr 25 12:05:23 2009
New Revision: 1173
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1173
Log:
merge back experimental 2.26 packaging to unstable/
Modified:
unstable/evolution/debian/changelog
unstable/evolution/debian/control
unstable/evolution/debian/evolution-mail.desktop
unstable/evolution/debian/evolution-plugins-experimental.install
unstable/evolution/debian/evolution-plugins.install
unstable/evolution/debian/evolution.install
unstable/evolution/debian/evolution.links
unstable/evolution/debian/lintian/evolution-plugins
unstable/evolution/debian/lintian/evolution-plugins-experimental
unstable/evolution/debian/rules
Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1173&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Sat Apr 25 12:05:23 2009
@@ -1,8 +1,18 @@
-evolution (2.24.5-4) UNRELEASED; urgency=low
-
+evolution (2.26.0-1) UNRELEASED; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * New upstream release.
+ * debian/control:
+ - update standards version to 3.8.1.
+ - update (build-)deps for 2.26.
+ - add build-dep on libical-dev and libicu-dev.
+ * debian/*.install: upgrade paths to 2.26.
+ * debian/lintian/*: upgrade paths to 2.26.
+
+ [ Josselin Mouette ]
* Fix section for the debug package.
- -- Josselin Mouette <joss at debian.org> Wed, 01 Apr 2009 18:29:28 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 25 Apr 2009 14:00:55 +0200
evolution (2.24.5-3) unstable; urgency=low
Modified: unstable/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/control?rev=1173&op=diff
==============================================================================
--- unstable/evolution/debian/control (original)
+++ unstable/evolution/debian/control Sat Apr 25 12:05:23 2009
@@ -9,7 +9,7 @@
Oystein Gisnas <oystein at gisnas.net>,
Pedro Fragoso <emberez at gmail.com>,
Yves-Alexis Perez <corsac at debian.org>
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Dm-Upload-Allowed: yes
Homepage: http://www.gnome.org/projects/evolution/
Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/evolution
@@ -28,8 +28,8 @@
gtk-doc-tools (>= 0.6),
libatk1.0-dev,
libldap2-dev,
- libgtkhtml3.14-dev (>= 3.24.5),
- libgtkhtml-editor-dev (>= 3.23.5),
+ libgtkhtml3.14-dev (>= 3.26.0),
+ libgtkhtml-editor-dev (>= 3.26.0),
libgnome-pilot2-dev (>= 2.0.15),
libkrb5-dev,
libnss3-dev,
@@ -37,8 +37,8 @@
libglib2.0-dev (>= 2.15.3),
liborbit2-dev (>= 1:2.9.8),
libbonobo2-dev (>= 2.20.3),
- evolution-data-server-dev (>= 2.24.5),
- evolution-data-server-dev (<< 2.25.0),
+ evolution-data-server-dev (>= 2.26.0),
+ evolution-data-server-dev (<< 2.27.0),
libgtk2.0-dev (>= 2.12.0),
libbonoboui2-dev (>= 2.4.2),
libgnomevfs2-dev (>= 2.4),
@@ -70,15 +70,17 @@
libytnef0-dev,
pilot-link,
automake,
- libtool
+ libtool,
+ libical-dev,
+ libicu-dev
Package: evolution
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
evolution-common (= ${source:Version}),
- evolution-data-server (>= 2.24.0),
- evolution-data-server (<< 2.25.0),
+ evolution-data-server (>= 2.26.0),
+ evolution-data-server (<< 2.27.0),
gnome-icon-theme (>= 2.19.91),
dbus
Pre-Depends: debconf (>= 1.4.69) | debconf-2.0
Modified: unstable/evolution/debian/evolution-mail.desktop
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution-mail.desktop?rev=1173&op=diff
==============================================================================
--- unstable/evolution/debian/evolution-mail.desktop (original)
+++ unstable/evolution/debian/evolution-mail.desktop Sat Apr 25 12:05:23 2009
@@ -43,5 +43,5 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=Evolution
X-GNOME-Bugzilla-Component=BugBuddyBugs
-X-GNOME-Bugzilla-Version=2.24.x
-X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.24;evolution-alarm-notify;
+X-GNOME-Bugzilla-Version=2.26.x
+X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.26;evolution-alarm-notify;
Modified: unstable/evolution/debian/evolution-plugins-experimental.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution-plugins-experimental.install?rev=1173&op=diff
==============================================================================
--- unstable/evolution/debian/evolution-plugins-experimental.install (original)
+++ unstable/evolution/debian/evolution-plugins-experimental.install Sat Apr 25 12:05:23 2009
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/evolution/2.24/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments,email-custom-header,evolution-webdav,templates}*.{so,eplug,xml}
-debian/tmp/usr/lib/evolution/2.24/plugins/templates.glade
+debian/tmp/usr/lib/evolution/2.26/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments,email-custom-header,evolution-webdav,templates}*.{so,eplug,xml}
+debian/tmp/usr/lib/evolution/2.26/plugins/templates.glade
debian/lintian/evolution-plugins-experimental usr/share/lintian/overrides/
Modified: unstable/evolution/debian/evolution-plugins.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution-plugins.install?rev=1173&op=diff
==============================================================================
--- unstable/evolution/debian/evolution-plugins.install (original)
+++ unstable/evolution/debian/evolution-plugins.install Sat Apr 25 12:05:23 2009
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/evolution/2.24/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,face,backup-restore}*.{so,eplug,xml,glade}
+debian/tmp/usr/lib/evolution/2.26/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,face,backup-restore}*.{so,eplug,xml,glade}
debian/lintian/evolution-plugins usr/share/lintian/overrides/
Modified: unstable/evolution/debian/evolution.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution.install?rev=1173&op=diff
==============================================================================
--- unstable/evolution/debian/evolution.install (original)
+++ unstable/evolution/debian/evolution.install Sat Apr 25 12:05:23 2009
@@ -1,15 +1,15 @@
debian/tmp/etc/gconf
-debian/tmp/usr/lib/evolution/2.24/*.so.*
-debian/tmp/usr/lib/evolution/2.24/components/*.so
-debian/tmp/usr/lib/evolution/2.24/conduits/*.so
-debian/tmp/usr/lib/evolution/2.24/csv2vcard
-debian/tmp/usr/lib/evolution/2.24/killev
-debian/tmp/usr/lib/evolution/2.24/evolution-addressbook-export
-debian/tmp/usr/lib/evolution/2.24/evolution-addressbook-clean
-debian/tmp/usr/lib/evolution/2.24/evolution-alarm-notify
-debian/tmp/usr/lib/evolution/2.24/evolution-backup
+debian/tmp/usr/lib/evolution/2.26/*.so.*
+debian/tmp/usr/lib/evolution/2.26/components/*.so
+debian/tmp/usr/lib/evolution/2.26/conduits/*.so
+debian/tmp/usr/lib/evolution/2.26/csv2vcard
+debian/tmp/usr/lib/evolution/2.26/killev
+debian/tmp/usr/lib/evolution/2.26/evolution-addressbook-export
+debian/tmp/usr/lib/evolution/2.26/evolution-addressbook-clean
+debian/tmp/usr/lib/evolution/2.26/evolution-alarm-notify
+debian/tmp/usr/lib/evolution/2.26/evolution-backup
debian/tmp/usr/bin
debian/tmp/usr/lib/bonobo
-debian/tmp/usr/lib/evolution/2.24/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,imap-features,google,sa-junk-plugin,bogo-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade}
+debian/tmp/usr/lib/evolution/2.26/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,imap-features,google,sa-junk-plugin,bogo-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade}
debian/evolution-mail.desktop usr/share/applications/
debian/evolution.xpm usr/share/pixmaps/
Modified: unstable/evolution/debian/evolution.links
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution.links?rev=1173&op=diff
==============================================================================
--- unstable/evolution/debian/evolution.links (original)
+++ unstable/evolution/debian/evolution.links Sat Apr 25 12:05:23 2009
@@ -1,3 +1,3 @@
-/usr/lib/evolution/2.24/csv2vcard /usr/bin/csv2vcard
-/usr/lib/evolution/2.24/evolution-addressbook-export /usr/bin/evolution-addressbook-export
-/usr/share/man/man1/evolution.1.gz /usr/share/man/man1/evolution-2.24.1.gz
+/usr/lib/evolution/2.26/csv2vcard /usr/bin/csv2vcard
+/usr/lib/evolution/2.26/evolution-addressbook-export /usr/bin/evolution-addressbook-export
+/usr/share/man/man1/evolution.1.gz /usr/share/man/man1/evolution-2.26.1.gz
Modified: unstable/evolution/debian/lintian/evolution-plugins
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/lintian/evolution-plugins?rev=1173&op=diff
==============================================================================
--- unstable/evolution/debian/lintian/evolution-plugins (original)
+++ unstable/evolution/debian/lintian/evolution-plugins Sat Apr 25 12:05:23 2009
@@ -1,16 +1,16 @@
# Private rpath
-evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-default-mailer.so /usr/lib/evolution/2.24/components
-evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-evolution-attachment-reminder.so /usr/lib/evolution/2.24/components
-evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-evolution-attachment-reminder.so /usr/lib/evolution/2.24
-evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-evolution-bbdb.so /usr/lib/evolution/2.24
-evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so /usr/lib/evolution/2.24/components
-evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so /usr/lib/evolution/2.24
-evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-face.so /usr/lib/evolution/2.24/components
-evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-face.so /usr/lib/evolution/2.24
-evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-mail-to-task.so /usr/lib/evolution/2.24/components
-evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-mail-to-task.so /usr/lib/evolution/2.24
-evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-mailing-list-actions.so /usr/lib/evolution/2.24/components
-evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-mailing-list-actions.so /usr/lib/evolution/2.24
-evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-prefer-plain.so /usr/lib/evolution/2.24/components
-evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-save-calendar.so /usr/lib/evolution/2.24
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.26/plugins/liborg-gnome-default-mailer.so /usr/lib/evolution/2.26/components
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.26/plugins/liborg-gnome-evolution-attachment-reminder.so /usr/lib/evolution/2.26/components
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.26/plugins/liborg-gnome-evolution-attachment-reminder.so /usr/lib/evolution/2.26
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.26/plugins/liborg-gnome-evolution-bbdb.so /usr/lib/evolution/2.26
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.26/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so /usr/lib/evolution/2.26/components
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.26/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so /usr/lib/evolution/2.26
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.26/plugins/liborg-gnome-face.so /usr/lib/evolution/2.26/components
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.26/plugins/liborg-gnome-face.so /usr/lib/evolution/2.26
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.26/plugins/liborg-gnome-mail-to-task.so /usr/lib/evolution/2.26/components
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.26/plugins/liborg-gnome-mail-to-task.so /usr/lib/evolution/2.26
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.26/plugins/liborg-gnome-mailing-list-actions.so /usr/lib/evolution/2.26/components
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.26/plugins/liborg-gnome-mailing-list-actions.so /usr/lib/evolution/2.26
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.26/plugins/liborg-gnome-prefer-plain.so /usr/lib/evolution/2.26/components
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.26/plugins/liborg-gnome-save-calendar.so /usr/lib/evolution/2.26
Modified: unstable/evolution/debian/lintian/evolution-plugins-experimental
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/lintian/evolution-plugins-experimental?rev=1173&op=diff
==============================================================================
--- unstable/evolution/debian/lintian/evolution-plugins-experimental (original)
+++ unstable/evolution/debian/lintian/evolution-plugins-experimental Sat Apr 25 12:05:23 2009
@@ -1,3 +1,3 @@
-evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-mail-folder-unsubscribe.so /usr/lib/evolution/2.24/components
-evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-email-custom-header.so /usr/lib/evolution/2.24/components
-evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-templates.so /usr/lib/evolution/2.24/components
+evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.26/plugins/liborg-gnome-mail-folder-unsubscribe.so /usr/lib/evolution/2.26/components
+evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.26/plugins/liborg-gnome-email-custom-header.so /usr/lib/evolution/2.26/components
+evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.26/plugins/liborg-gnome-templates.so /usr/lib/evolution/2.26/components
Modified: unstable/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/rules?rev=1173&op=diff
==============================================================================
--- unstable/evolution/debian/rules (original)
+++ unstable/evolution/debian/rules Sat Apr 25 12:05:23 2009
@@ -10,9 +10,9 @@
UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg')
-ELIBDIR := usr/lib/evolution/2.24
+ELIBDIR := usr/lib/evolution/2.26
-DEB_SHLIBDEPS_INCLUDE := debian/evolution/usr/lib/evolution/2.24
+DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR)
DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' --noscripts -X $(ELIBDIR)/components
DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins
@@ -34,7 +34,8 @@
--sysconfdir=/etc \
--enable-nntp \
--libexecdir=/usr/lib \
- --enable-plugins=experimental
+ --enable-plugins=experimental \
+ --without-weather
configure:
dh_testdir
@@ -42,15 +43,3 @@
clean::
find -name '*.schemas' | xargs rm -f
-
-#binary-install/evolution-plugins::
-# chrpath -d -k $(CURDIR)/debian/evolution-plugins/usr/lib/evolution/2.24/plugins/*.so
-#
-#binary-install/evolution-plugins-experimental::
-# chrpath -d -k $(CURDIR)/debian/evolution-plugins-experimental/usr/lib/evolution/2.24/plugins/*.so
-#
-#binary-install/evolution::
-# chrpath -d -k $(CURDIR)/debian/evolution/usr/bin/evolution
-# chrpath -d -k $(CURDIR)/debian/evolution/$(ELIBDIR)/{killev,evolution-addressbook-export,evolution-alarm-notify,evolution-backup}
-# chrpath -d -k $(CURDIR)/debian/evolution/$(ELIBDIR)/*.so*
-# chrpath -d -k $(CURDIR)/debian/evolution/$(ELIBDIR)/*/*.so*
More information about the pkg-evolution-commits
mailing list