diff --git a/debian/changelog b/debian/changelog index bd42a5d302..f725d8c95e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,20 @@ -evolution (2.26.2-3) UNRELEASED; urgency=low +evolution (2.27.3-1) UNRELEASED; urgency=low + * New upstream development release. + * debian/watch: look in development folder. * po: - cs.po: add czech, thanks to Martin Šín. closes: #532165 + * debian/control: + - update deps and build-deps for 2.27 branch. + - update standards version to 3.8.2. + * debian/*.install: update folder name to 2.28. + * debian/evolution-plugins-experimental.install + - add vcard-inline plugin. + * debian/lintian/*: + - update folder name to 2.28. + - update components to match real rpaths. - -- Yves-Alexis Perez Sun, 07 Jun 2009 19:11:04 +0200 + -- Yves-Alexis Perez Wed, 24 Jun 2009 20:03:02 +0200 evolution (2.26.2-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 663801622a..45e8e00d88 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Uploaders: Jordi Mallach , Oystein Gisnas , Pedro Fragoso , Yves-Alexis Perez -Standards-Version: 3.8.1 +Standards-Version: 3.8.2 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 @@ Build-Depends: debhelper (>= 5.0.0), gtk-doc-tools (>= 0.6), libatk1.0-dev, libldap2-dev, - libgtkhtml3.14-dev (>= 3.26.2), - libgtkhtml-editor-dev (>= 3.26.2), + libgtkhtml3.14-dev (>= 3.27.3), + libgtkhtml-editor-dev (>= 3.27.3), libgnome-pilot2-dev (>= 2.0.15), libkrb5-dev, libnss3-dev, @@ -37,8 +37,8 @@ Build-Depends: debhelper (>= 5.0.0), libglib2.0-dev (>= 2.15.3), liborbit2-dev (>= 1:2.9.8), libbonobo2-dev (>= 2.20.3), - evolution-data-server-dev (>= 2.26.2), - evolution-data-server-dev (<< 2.27.0), + evolution-data-server-dev (>= 2.27.0), + evolution-data-server-dev (<< 2.28.0), libgtk2.0-dev (>= 2.12.0), libbonoboui2-dev (>= 2.4.2), libgnomevfs2-dev (>= 2.4), @@ -50,22 +50,22 @@ Build-Depends: debhelper (>= 5.0.0), libgnomeprint2.2-dev (>= 2.7.0), libgnomeprintui2.2-dev (>= 2.2.1), libhal-dev (>= 0.5.4) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], - libcamel1.2-dev (>= 2.23.91), - libedataserver1.2-dev (>= 2.23.91), - libegroupwise1.2-dev (>= 2.23.91), - libedataserverui1.2-dev (>= 2.23.91), - libebackend1.2-dev (>= 2.23.91), - libgdata1.2-dev (>= 2.23.91), - libgdata-google1.2-dev (>= 2.23.91), + libcamel1.2-dev (>= 2.27.3), + libedataserver1.2-dev (>= 2.27.3), + libegroupwise1.2-dev (>= 2.27.3), + libedataserverui1.2-dev (>= 2.27.3), + libebackend1.2-dev (>= 2.27.3), + libgdata1.2-dev (>= 2.27.3), + libgdata-google1.2-dev (>= 2.27.3), libgnome2-dev, - libecal1.2-dev (>= 2.23.91), - libebook1.2-dev (>= 2.23.91), + libecal1.2-dev (>= 2.27.3), + libebook1.2-dev (>= 2.27.3), libdbus-glib-1-dev, libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libnotify-dev (>= 0.3.0), libsoup2.4-dev, libdbus-1-dev, - libexchange-storage1.2-dev (>= 2.23.91), + libexchange-storage1.2-dev (>= 2.27.3), libgstreamer0.10-dev, libytnef0-dev, pilot-link, @@ -81,8 +81,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, evolution-common (= ${source:Version}), - evolution-data-server (>= 2.26.2), - evolution-data-server (<< 2.27.0), + evolution-data-server (>= 2.27.0), + evolution-data-server (<< 2.28.0), gnome-icon-theme (>= 2.19.91), dbus Pre-Depends: debconf (>= 1.4.69) | debconf-2.0 @@ -235,3 +235,4 @@ Description: experimental plugins for Evolution - email-custom-headers - evolution-webdav - templates + - vcard-inline diff --git a/debian/evolution-mail.desktop b/debian/evolution-mail.desktop index 11f4a5a75b..e0a519af12 100644 --- a/debian/evolution-mail.desktop +++ b/debian/evolution-mail.desktop @@ -43,5 +43,5 @@ StartupNotify=true X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=Evolution X-GNOME-Bugzilla-Component=BugBuddyBugs -X-GNOME-Bugzilla-Version=2.26.x -X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.26;evolution-alarm-notify; +X-GNOME-Bugzilla-Version=2.27.x +X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.27;evolution-alarm-notify; diff --git a/debian/evolution-plugins-experimental.install b/debian/evolution-plugins-experimental.install index e922bd8640..e0d3dbec22 100644 --- a/debian/evolution-plugins-experimental.install +++ b/debian/evolution-plugins-experimental.install @@ -1,3 +1,3 @@ -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/tmp/usr/lib/evolution/2.28/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments,email-custom-header,evolution-webdav,templates,vcard-inline}*.{so,eplug,xml} +debian/tmp/usr/lib/evolution/2.28/plugins/templates.glade debian/lintian/evolution-plugins-experimental usr/share/lintian/overrides/ diff --git a/debian/evolution-plugins.install b/debian/evolution-plugins.install index 5835c264f0..b54c930f02 100644 --- a/debian/evolution-plugins.install +++ b/debian/evolution-plugins.install @@ -1,2 +1,2 @@ -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/tmp/usr/lib/evolution/2.28/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/ diff --git a/debian/evolution.install b/debian/evolution.install index a5cfd49dcd..1246be03f8 100644 --- a/debian/evolution.install +++ b/debian/evolution.install @@ -1,15 +1,15 @@ debian/tmp/etc/gconf -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/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/usr/bin debian/tmp/usr/lib/bonobo -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/tmp/usr/lib/evolution/2.28/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/ diff --git a/debian/evolution.links b/debian/evolution.links index 393e65800a..e8ff0a0cbb 100644 --- a/debian/evolution.links +++ b/debian/evolution.links @@ -1,3 +1,3 @@ -/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 +/usr/lib/evolution/2.28/csv2vcard /usr/bin/csv2vcard +/usr/lib/evolution/2.28/evolution-addressbook-export /usr/bin/evolution-addressbook-export +/usr/share/man/man1/evolution.1.gz /usr/share/man/man1/evolution-2.28.1.gz diff --git a/debian/lintian/evolution-plugins b/debian/lintian/evolution-plugins index 66378f40cf..ca9b177fb3 100644 --- a/debian/lintian/evolution-plugins +++ b/debian/lintian/evolution-plugins @@ -1,16 +1,7 @@ # Private rpath -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 - +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-default-mailer.so /usr/lib/evolution/2.28/components +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-evolution-attachment-reminder.so /usr/lib/evolution/2.28/components +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-face.so /usr/lib/evolution/2.28/components +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-mail-to-task.so /usr/lib/evolution/2.28/components +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-mailing-list-actions.so /usr/lib/evolution/2.28/components +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-prefer-plain.so /usr/lib/evolution/2.28/components diff --git a/debian/lintian/evolution-plugins-experimental b/debian/lintian/evolution-plugins-experimental index ddec4513bd..a45e9ca94e 100644 --- a/debian/lintian/evolution-plugins-experimental +++ b/debian/lintian/evolution-plugins-experimental @@ -1,3 +1,5 @@ -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 +# Private rpaths +evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-email-custom-header.so /usr/lib/evolution/2.28/components +evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-mail-folder-unsubscribe.so /usr/lib/evolution/2.28/components +evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-templates.so /usr/lib/evolution/2.28/components + diff --git a/debian/rules b/debian/rules index 438a528af3..73c9ed33fb 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg') -ELIBDIR := usr/lib/evolution/2.26 +ELIBDIR := usr/lib/evolution/2.28 DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR) DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' --noscripts -X $(ELIBDIR)/components diff --git a/debian/watch b/debian/watch index 784102b0e0..74c12663f4 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://ftp.gnome.org/pub/GNOME/sources/evolution/([\d\.]+)[02468]/evolution-([\d\.]+)\.tar\.gz debian uupdate +http://ftp.gnome.org/pub/GNOME/sources/evolution/([\d\.]+)[13579]/evolution-([\d\.]+)\.tar\.gz debian uupdate