* New upstream development release.

* debian/watch: look in development folder.
* 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.

git-svn-id: file:///svn/pkg-evolution/experimental/evolution@1243 ed03ce00-e4f4-0310-9448-ee38221cb277
This commit is contained in:
Yves-Alexis Perez
2009-06-24 19:44:14 +00:00
parent bfded135eb
commit 6b24890359
11 changed files with 62 additions and 57 deletions

15
debian/changelog vendored
View File

@ -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 <corsac@debian.org> Sun, 07 Jun 2009 19:11:04 +0200
-- Yves-Alexis Perez <corsac@debian.org> Wed, 24 Jun 2009 20:03:02 +0200
evolution (2.26.2-2) unstable; urgency=low

35
debian/control vendored
View File

@ -9,7 +9,7 @@ Uploaders: Jordi Mallach <jordi@debian.org>,
Oystein Gisnas <oystein@gisnas.net>,
Pedro Fragoso <emberez@gmail.com>,
Yves-Alexis Perez <corsac@debian.org>
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

View File

@ -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;

View File

@ -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/

View File

@ -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/

View File

@ -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/

View File

@ -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

View File

@ -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

View File

@ -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

2
debian/rules vendored
View File

@ -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

2
debian/watch vendored
View File

@ -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