diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian index 4fa05c943c..8476e3ca49 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS.Debian @@ -1,3 +1,17 @@ +evolution (2.24.5-2) unstable; urgency=low + + * Evolution 2.24 now uses an sqlite database to store the messages + summaries, so at first restart it'll generate the database. That could + take some time for large messages folders. + * Evolution 2.24 is a large upgrade, and touches many things, so, just in + case, you should make sure: + - to make a backup of current setup, either by using the integrated + plugin or by backing up your $HOME/.evolution folders. + - to shutdown Evolution completely before upgrading, using: + evolution --force-shutdown + + -- Yves-Alexis Perez Wed, 11 Mar 2009 23:41:01 +0100 + evolution (2.2.2-2) unstable; urgency=low * Plugin package is available now. diff --git a/debian/changelog b/debian/changelog index 528fe6253c..70cdb78454 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,29 +1,185 @@ -evolution (2.21.2-0) experimental; urgency=low +evolution (2.26.0-1) UNRELEASED; urgency=low + + * 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/NEWS.Debian: warn user to make a backup and quit evolution + before upgrading. closes: #519206 + * debian/*.install: upgrade paths to 2.26. + * debian/lintian/*: upgrade paths to 2.26. + + -- Yves-Alexis Perez Thu, 19 Mar 2009 19:21:01 +0100 + +evolution (2.24.5-2) unstable; urgency=low + + * Upload to unstable. + + -- Yves-Alexis Perez Sun, 08 Mar 2009 13:42:30 +0100 + +evolution (2.24.5-1) experimental; urgency=low + + * New upstream release. + * debian/control: + - update build-deps on evolution-data-server. + - update build-deps on libgtkhtml3.14-dev and libgtkhtml-editor-dev + - drop build-dep on gtkhtml3.14. + - add myself to Uploaders:. + - add build-dep on automake and libtool. + - drop obsolete Conflicts/Replaces. + * debian/rules: + - run autoreconf at build time to relibtoolize the package. + - ignore plugin folder in dh_makeshlibs. + * debian/lintian/evolution-plugins: + - update overrides for private rpaths. + * debian/evolution-plugins-experimental.install + - install lintian override file. + - ship email-custom-header, evolution-webdav and templates plugin. + + -- Yves-Alexis Perez Sat, 28 Feb 2009 20:34:59 +0100 + +evolution (2.22.3.1-1) unstable; urgency=medium + + [ Pedro Fragoso ] + * New upstream bugfix release (Closes: #488782) + - Fixes security vulnerabilities CVE-2008-1108 and CVE-2008-1109 + (Closes: #484639) + - Set urgency to medium + * debian/control: + - Add myself to Uploaders + - Bump Standards-Version to 3.8.0 (no changes) + + -- Heikki Henriksen Sun, 06 Jul 2008 13:51:11 +0200 + +evolution (2.22.2-1) unstable; urgency=low * New upstream release - * Bump build-depends on the following: - - gnome-icon-theme (>= 2.19.91) - - libgnome-pilot2-dev (>= 2.0.15) - - libbonobo2-dev (>= 2.16.0) - - evolution-data-server-dev (>= 2.21.0) + - bugfixes and translation updates + * Remove debian/lintian/evolution + - private-dir rpaths are finally ignored with lintian >= 1.23.49 + + -- Heikki Henriksen Mon, 26 May 2008 22:45:36 +0200 + +evolution (2.22.1.1-1) unstable; urgency=low + + [ Heikki Henriksen ] + * debian/evolution-mail.desktop: + Set X-GNOME-Bugzilla-Component=BugBuddyBugs (closes: #477213) + + [ Oystein Gisnas ] + * New upstream bugfix release + + -- Oystein Gisnas Sun, 04 May 2008 18:16:59 +0200 + +evolution (2.22.1-1) unstable; urgency=low + + [ Pedro Fragoso ] + * New upstream bugfix release + - 35_fix_tnef_locale.patch, Dropped, merged upstream + + [ Heikki Henriksen ] + * 2.22.1 fixes subject in composer window (closes: #475370) + + -- Heikki Henriksen Thu, 10 Apr 2008 19:43:54 +0200 + +evolution (2.22.0-3) unstable; urgency=low + + * Upload to unstable + * Add patch 35_fix_tnef_locale.patch + - fixes locale-bug in tnef-attachments (closes: #464670) + * Update DM-Upload-Allowed according to change in dpkg 1.14.16 and bump + build-dep on dpkg-dev + * Bump build-dep on cdbs to get dh_icons in postinst (closes: #473029) + * Update evolution.menu to follow newest menu sub-policy and use + Applications/Network/Communication (fixes lintian-warning) + * Convert copyright to UTF-8 (fixes lintian-warning) + * Update versioned dirs in lintian-overrides + * Add lintian override for desktop-command-not-in-package in + evolution-common, and install in evolution-common.install + + -- Heikki Henriksen Sat, 05 Apr 2008 19:25:32 +0200 + +evolution (2.22.0-2) experimental; urgency=low + + * Bump build-dep libcamel1.2-dev to >= 2.21.92 (closes: #472991) + * Fix file path to Google Calendar plugin (closes: #473309) + + -- Oystein Gisnas Mon, 31 Mar 2008 14:51:04 +0200 + +evolution (2.22.0-1) experimental; urgency=low + + [ Heikki Henriksen ] + * New upstream release + * Acknowledge NMU from Security Team: + - remove 80_CVE-2008-0072.patch: applied upstream + * Bump Standards-version to 3.7.3 + * Upgrade build-dep: + - libsoup2.4-dev from libsoup2.2-dev + * Bump build-deps: + - libglib2.0-dev (>= 2.15.3) - libgtk2.0-dev (>= 2.12.0) - - libnotify-dev (>= 0.3.0), - - libdbus-1-dev (>= 1.0.0) - - gtkhtml3.14 (>= 3.16.0) - and corresponding depends where necessary - * Add conflict on plugins older than source-package - * Remove patch applied upstread: - - 70_no-mail-remote-plugin.patch - * Update version in desktop-file - * Update base-version to 2.22 in *.install - * Update ELIBDIR in rules - * Add depend on -dbg for the experimental branch + - evolution-data-server-dev (>= 2.21.92) + - evolution-data-server-dev (<< 2.23.0) + - gnome-icon-theme (>= 2.19.91) + - libbonobo2-dev (>= 2.20.3) + - libgtkhtml3.14-dev (>= 3.17.5) + - libgnome-pilot2-dev (>= 2.0.15) + - libnotify-dev (>= 0.3.0) + * Add build-dep: + - pilot-link + * Update base plugins: + - add google-account-setup + - add bogo-junk-plugin + - wait and evaluate on mono + * Update standard plugins: + - add audio-inline + - remove bogo-junk-plugin + - rename new-mail-notify to mail-notification + - add attachment-reminder + - add face + - add backup-restore + * Update experimental plugins: + - remove backup-restore + - add external-editor + - add tnef-attachments + * Remove patch: + - 70_no-mail-remote-plugin.patch - mail-remote-plugin never worked and is + removed upstream - -- Heikki Henriksen Wed, 14 Nov 2007 23:27:32 +0100 + [ Oystein Gisnas ] + * Bump e-d-s build-deps to 2.21.92 + * Sync build-deps of -dev packages with pkg-config files -evolution (2.12.1-0) unstable; urgency=low + -- Oystein Gisnas Tue, 18 Mar 2008 00:46:53 +0100 - * New upstream release +evolution (2.12.3-1.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix Encrypted Message Version Format String Vulnerability + (CVE-2008-0072). + + -- Thijs Kinkhorst Tue, 04 Mar 2008 21:27:27 +0100 + +evolution (2.12.3-1) unstable; urgency=low + + [ Heikki Henriksen ] + * Conflict with older evolution-plugins and evolution-plugins-experimental + to ensure full upgrades (closes: #454473) + * Add recommends evolution-webcal (closes: #455598) + + [ Oystein Gisnas ] + * New upstream release (bugfixes and translations) + (closes: #454435, #458728, #443483) + * Remove configure flags --with-nspr-includes and --with-nss-includes + (closes: #461312, #460615, #460683) + + -- Oystein Gisnas Tue, 22 Jan 2008 08:19:08 +0100 + +evolution (2.12.2-1) unstable; urgency=low + + [ Heikki Henriksen ] + * New upstream release (bugfixes and translations) (closes: #446890) * Swap bogofilter and spamassassin recommmends, since bogofilter is quite lightweight (closes: #435635) * Versioned build-dependency on eds-dev and dependency on eds (closes: @@ -38,10 +194,15 @@ evolution (2.12.1-0) unstable; urgency=low - 50_filter_missing_gettext.patch - 50_libnssckbi-location.patch - 60_new_addressbook_set_relative_url.patch + * Add Dm-Upload-Allowed, Homepage, Vcs-Browser and Vcs-Svn fields in control + * Add build-dep on libytnef0-dev for experimental plugin tnef-attachments + * Add tnef-attachments to plugins-experimental + * Add build-dep on gtk-doc-tools to build gtk-doc development documentation + * Enable building of gtk-doc in rules + * Update lintian overrides (version-bumps in rpaths) + * Update evolution-mail.desktop - -- Heikki Henriksen Tue, 13 Nov 2007 22:30:10 +0100 - - + -- Oystein Gisnas Mon, 03 Dec 2007 18:06:48 +0100 evolution (2.12.0-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 42f4983474..6631bbf2a0 100644 --- a/debian/control +++ b/debian/control @@ -6,30 +6,39 @@ Uploaders: Jordi Mallach , Margarita Manterola , Loic Minier , Heikki Henriksen , - Oystein Gisnas + Oystein Gisnas , + Pedro Fragoso , + Yves-Alexis Perez +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 +Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution Build-Depends: debhelper (>= 5.0.0), - cdbs (>= 0.4.37), - dpkg-dev (>= 1.3.19), + cdbs (>= 0.4.52), + dpkg-dev (>= 1.14.16), scrollkeeper, flex, bison, intltool (>= 0.35.0), libtool, - pkg-config, + pkg-config (>= 0.16.0), gnome-icon-theme (>= 2.19.91), gnome-doc-utils (>= 0.3.2), + gtk-doc-tools (>= 0.6), libatk1.0-dev, libldap2-dev, - libgtkhtml3.14-dev (>= 3.14.0), + libgtkhtml3.14-dev (>= 3.26.0), + libgtkhtml-editor-dev (>= 3.26.0), libgnome-pilot2-dev (>= 2.0.15), libkrb5-dev, libnss3-dev, psmisc, - libglib2.0-dev, + libglib2.0-dev (>= 2.15.3), liborbit2-dev (>= 1:2.9.8), - libbonobo2-dev (>= 2.16.0), - evolution-data-server-dev (>= 2.21.0), - evolution-data-server-dev (<< 2.23.0), + libbonobo2-dev (>= 2.20.3), + 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), @@ -41,52 +50,54 @@ 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 (>= 1.8.0), - libedataserver1.2-dev (>= 1.11.2), - libegroupwise1.2-dev (>= 1.9.4), - libedataserverui1.2-dev (>= 1.9.4), + 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), libgnome2-dev, - libecal1.2-dev (>= 1.9.4), - libebook1.2-dev (>= 1.9.4), + libecal1.2-dev (>= 2.23.91), + libebook1.2-dev (>= 2.23.91), libdbus-glib-1-dev, libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libnotify-dev (>= 0.3.0), - libsoup2.2-dev (>= 2.2.2), - libdbus-1-dev (>= 1.0.0), - libexchange-storage1.2-dev (>= 1.9.4), - gtkhtml3.14 (>= 3.16.0), - libgstreamer0.10-dev -Standards-Version: 3.7.2 + libsoup2.4-dev, + libdbus-1-dev, + libexchange-storage1.2-dev (>= 2.23.91), + libgstreamer0.10-dev, + libytnef0-dev, + pilot-link, + automake, + libtool, + libical-dev, + libicu-dev Package: evolution Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - evolution-dbg (= ${binary:Version}), evolution-common (= ${source:Version}), - evolution-data-server (>= 2.21.0), - evolution-data-server (<< 2.23.0), - gtkhtml3.14 (>= 3.16.0), + evolution-data-server (>= 2.26.0), + evolution-data-server (<< 2.27.0), gnome-icon-theme (>= 2.19.91), dbus -Recommends: gnome-pilot-conduits (>= 2.0.15), +Recommends: gnome-pilot-conduits (>= 2.0.9), gnome-desktop-data, - evolution-plugins (>= 2.21.0), + evolution-plugins, + evolution-webcal, yelp, bogofilter | spamassassin Suggests: bug-buddy, gnupg, gnome-spell (>= 1.0.4), network-manager, - evolution-exchange (>= 2.21.0), + evolution-exchange, + evolution-dbg, evolution-plugins-experimental Provides: mail-reader, imap-client -Replaces: evolution-plugins (<= 2.6.1-2), - evolution-common (<< 2.6.2-3) -Conflicts: evolution-exchange (<< 2.21.0), - evolution-plugins (<< 2.21.0), - evolution-plugins-experimental (<< 2.21.0) Description: groupware suite with mail client and organizer Evolution is a groupware suite which integrates mail, calendar, address book, to-do list and memo tools. @@ -119,13 +130,15 @@ Description: groupware suite with mail client and organizer - publish-calendar - caldav - imap-features + - google-account-setup - sa-junk-plugin + - bogo-junk-plugin - exchange-operations + - mono Package: evolution-common Architecture: all Depends: ${misc:Depends} -Replaces: evolution (<< 2.6.2-1) Recommends: evolution Description: architecture independent files for Evolution Evolution is a groupware suite which integrates mail, calendar, @@ -141,8 +154,9 @@ Depends: evolution (= ${binary:Version}), ${misc:Depends}, libgnome2-dev, libgnomeui-dev, - libbonoboui2-dev (>= 2.4.2), - libcamel1.2-dev (>= 1.8.0) + libbonoboui2-dev (>= 2.20.3), + libcamel1.2-dev, + libxml2-dev Description: development library files for Evolution Evolution is a groupware suite which integrates mail, calendar, address book, to-do list and memo tools. @@ -183,18 +197,21 @@ Description: standard plugins for Evolution - copy-tool - mail-to-task - mark-calendar-offline + - audio-inline - mailing-list-actions - - new-mail-notify - default-mailer - import-ics-attachments - prefer-plain + - mail-notification + - attachment-reminder + - face + - backup-restore Package: evolution-plugins-experimental Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, evolution (= ${binary:Version}), -Replaces: evolution-plugins (<< 2.6.2-1) Description: experimental plugins for Evolution Evolution is a groupware suite which integrates mail, calendar, address book, to-do list and memo tools. @@ -205,8 +222,12 @@ Description: experimental plugins for Evolution Evolution. Use with care. . The following plugins are included. - - backup-restore - folder-unsubscribe - mail-to-meeting - save-attachments + - external-editor - ipod-sync + - tnef-attachments + - email-custom-headers + - evolution-webdav + - templates diff --git a/debian/copyright b/debian/copyright index 6662f74c24..24e31afdf2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -67,15 +67,15 @@ Translations Gediminas Paulauskas GNOME PL Team Gustavo Maciel Dias Vieira - Héctor García Alvarez - Jesús Bravo Álvarez + Héctor García Alvarez + Jesús Bravo Ãlvarez Keld Simonsen Kjartan Maraas Matthias Warkus Spiros Papadimitriou Sung-Hyun Nam Szabolcs BAN - Tiago Antão + Tiago Antão Duarte Loreto Valek Filippov Vincent Renardias diff --git a/debian/evolution-common.install b/debian/evolution-common.install index 9073c1df02..5af4030edd 100644 --- a/debian/evolution-common.install +++ b/debian/evolution-common.install @@ -6,3 +6,4 @@ 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/ diff --git a/debian/evolution-mail.desktop b/debian/evolution-mail.desktop index de47b705d3..11f4a5a75b 100644 --- a/debian/evolution-mail.desktop +++ b/debian/evolution-mail.desktop @@ -38,10 +38,10 @@ Exec=evolution --component=mail Icon=evolution Terminal=false Type=Application -Categories=GNOME;Application;Network; +Categories=GNOME;Network; StartupNotify=true X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=Evolution -X-GNOME-Bugzilla-Component=Miscellaneous -X-GNOME-Bugzilla-Version=2.22.x -X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.22;evolution-alarm-notify; +X-GNOME-Bugzilla-Component=BugBuddyBugs +X-GNOME-Bugzilla-Version=2.26.x +X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.26;evolution-alarm-notify; diff --git a/debian/evolution-plugins-experimental.install b/debian/evolution-plugins-experimental.install index 8a4ed07790..e922bd8640 100644 --- a/debian/evolution-plugins-experimental.install +++ b/debian/evolution-plugins-experimental.install @@ -1 +1,3 @@ -debian/tmp/usr/lib/evolution/2.22/plugins/*{backup-restore,folder-unsubscribe,mail-to-meeting,save-attachments,ipod-sync}*.{so,eplug,xml,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/ diff --git a/debian/evolution-plugins.install b/debian/evolution-plugins.install index 0eeae60e45..5835c264f0 100644 --- a/debian/evolution-plugins.install +++ b/debian/evolution-plugins.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/evolution/2.22/plugins/*{attachment-reminder,audio-inline,bbdb,bogo-junk-plugin,subject-thread,save-calendar,select-one-source,copy-tool,face,mail-to-task,mark-calendar-offline,mailing-list-actions,mail-notification,new-mail-notify,default-mailer,mail-attachments-import-ics,prefer-plain}*.{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/ diff --git a/debian/evolution.install b/debian/evolution.install index 68e7e6c4aa..a5cfd49dcd 100644 --- a/debian/evolution.install +++ b/debian/evolution.install @@ -1,16 +1,15 @@ debian/tmp/etc/gconf -debian/tmp/usr/lib/evolution/2.22/*.so.* -debian/tmp/usr/lib/evolution/2.22/components/*.so -debian/tmp/usr/lib/evolution/2.22/conduits/*.so -debian/tmp/usr/lib/evolution/2.22/csv2vcard -debian/tmp/usr/lib/evolution/2.22/killev -debian/tmp/usr/lib/evolution/2.22/evolution-addressbook-export -debian/tmp/usr/lib/evolution/2.22/evolution-addressbook-clean -debian/tmp/usr/lib/evolution/2.22/evolution-alarm-notify -debian/tmp/usr/lib/evolution/2.22/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.22/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,sa-junk-plugin,exchange,folder-permissions,folder-subscription}*.so +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/ -debian/lintian/evolution usr/share/lintian/overrides/ diff --git a/debian/evolution.links b/debian/evolution.links index f673db27a8..393e65800a 100644 --- a/debian/evolution.links +++ b/debian/evolution.links @@ -1,3 +1,3 @@ -/usr/lib/evolution/2.12/csv2vcard /usr/bin/csv2vcard -/usr/lib/evolution/2.12/evolution-addressbook-export /usr/bin/evolution-addressbook-export -/usr/share/man/man1/evolution.1.gz /usr/share/man/man1/evolution-2.12.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 diff --git a/debian/evolution.menu b/debian/evolution.menu index 54492b5a0e..7f0efc622b 100644 --- a/debian/evolution.menu +++ b/debian/evolution.menu @@ -1,3 +1,3 @@ -?package(evolution):needs="X11" section="Apps/Net" \ +?package(evolution):needs="X11" section="Applications/Network/Communication" \ title="Evolution" command="/usr/bin/evolution" \ hints="Gnome,Mail,Calendar" icon="/usr/share/pixmaps/evolution.xpm" diff --git a/debian/lintian/evolution b/debian/lintian/evolution deleted file mode 100644 index 8ad3975830..0000000000 --- a/debian/lintian/evolution +++ /dev/null @@ -1,4 +0,0 @@ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.10/conduits/libeaddress_conduit.so /usr/lib/evolution/2.10:/usr/lib/ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.10/conduits/libecalendar_conduit.so /usr/lib/evolution/2.10:/usr/lib/ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.10/conduits/libememo_conduit.so /usr/lib/evolution/2.10:/usr/lib/ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.10/conduits/libetodo_conduit.so /usr/lib/evolution/2.10:/usr/lib/ diff --git a/debian/lintian/evolution-common b/debian/lintian/evolution-common new file mode 100644 index 0000000000..13653b8e25 --- /dev/null +++ b/debian/lintian/evolution-common @@ -0,0 +1 @@ +evolution-common: desktop-command-not-in-package /usr/share/applications/evolution.desktop evolution diff --git a/debian/lintian/evolution-plugins b/debian/lintian/evolution-plugins index 32cf1b8612..66378f40cf 100644 --- a/debian/lintian/evolution-plugins +++ b/debian/lintian/evolution-plugins @@ -1 +1,16 @@ -evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.10/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so /usr/lib/evolution/2.10:/usr/lib/evolution/2.10/components +# 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 + diff --git a/debian/lintian/evolution-plugins-experimental b/debian/lintian/evolution-plugins-experimental new file mode 100644 index 0000000000..ddec4513bd --- /dev/null +++ b/debian/lintian/evolution-plugins-experimental @@ -0,0 +1,3 @@ +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 diff --git a/debian/rules b/debian/rules index d17a70966a..6482df20d6 100755 --- a/debian/rules +++ b/debian/rules @@ -9,23 +9,21 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg') -DEB_SHLIBDEPS_INCLUDE := debian/evolution/usr/lib/evolution/2.12 -DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' --noscripts -DEB_DH_MAKESHLIBS_ARGS_evolution-plugins += --noscripts -DEB_DH_MAKESHLIBS_ARGS_evolution-plugins-experimental += --noscripts -ELIBDIR := usr/lib/evolution/2.22 +ELIBDIR := usr/lib/evolution/2.26 + +DEB_SHLIBDEPS_INCLUDE := debian/evolution/usr/lib/evolution/2.26 +DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' --noscripts -X $(ELIBDIR)/components +DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins + CFLAGS += -fPIC DEB_CONFIGURE_EXTRA_FLAGS += \ - --with-nspr-includes=/usr/include/nspr \ - --with-nss-includes=/usr/include/nss \ --with-openldap \ --enable-nls \ --without-openssl-includes \ --without-openssl-libs \ - --disable-gtk-doc \ --enable-pilot-conduits \ --enable-cairo-calendar \ --enable-exchange=yes \ @@ -36,7 +34,12 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --sysconfdir=/etc \ --enable-nntp \ --libexecdir=/usr/lib \ - --enable-plugins=experimental + --enable-plugins=experimental \ + --without-weather + +configure: + dh_testdir + autoreconf -vfi clean:: find -name '*.schemas' | xargs rm -f diff --git a/debian/watch b/debian/watch index 68bc1914f3..784102b0e0 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://ftp.gnome.org/pub/GNOME/sources/evolution/([\d\.]+)[0123456789]/evolution-([\d\.]+)\.tar\.gz debian uupdate +http://ftp.gnome.org/pub/GNOME/sources/evolution/([\d\.]+)[02468]/evolution-([\d\.]+)\.tar\.gz debian uupdate