r1106 - 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
Mon Dec 15 21:50:20 UTC 2008 

Author: corsac
Date: Mon Dec 15 21:50:20 2008
New Revision: 1106

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1106
Log:
* 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.
* debian/rules:
  - run autoreconf at build time to relibtoolize the package.
* debian/lintian/evolution-plugins:
  - update overrides for private rpaths.
* debian/evolution-plugins-experimental.install
  - install lintian override file.

Added:
    unstable/evolution/debian/lintian/evolution-plugins-experimental
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/rules

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1106&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Mon Dec 15 21:50:20 2008
@@ -1,3 +1,21 @@
+evolution (2.24.2-1) UNRELEASED; 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.
+  * debian/rules:
+    - run autoreconf at build time to relibtoolize the package.
+  * debian/lintian/evolution-plugins:
+    - update overrides for private rpaths.
+  * debian/evolution-plugins-experimental.install
+    - install lintian override file.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 15 Dec 2008 18:39:44 +0100
+
 evolution (2.22.3.1-1) unstable; urgency=medium
 
   [ Pedro Fragoso ]

Modified: unstable/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/control?rev=1106&op=diff
==============================================================================
--- unstable/evolution/debian/control (original)
+++ unstable/evolution/debian/control Mon Dec 15 21:50:20 2008
@@ -7,7 +7,8 @@
            Loic Minier <lool at dooz.org>,
            Heikki Henriksen <heikkih at gmail.com>,
            Oystein Gisnas <oystein at gisnas.net>,
-           Pedro Fragoso <emberez at gmail.com>
+           Pedro Fragoso <emberez at gmail.com>,
+           Yves-Alexis Perez <corsac at debian.org>
 Standards-Version: 3.8.0
 Dm-Upload-Allowed: yes
 Homepage: http://www.gnome.org/projects/evolution/
@@ -27,7 +28,8 @@
                gtk-doc-tools (>= 0.6),
                libatk1.0-dev,
                libldap2-dev,
-               libgtkhtml3.14-dev (>= 3.17.5),
+               libgtkhtml3.14-dev (>= 3.23.5),
+               libgtkhtml-editor-dev (>= 3.23.5),
                libgnome-pilot2-dev (>= 2.0.15),
                libkrb5-dev,
                libnss3-dev,
@@ -35,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.21.92),
-               evolution-data-server-dev (<< 2.23.0),
+               evolution-data-server-dev (>= 2.23.91),
+               evolution-data-server-dev (<< 2.25.0),
                libgtk2.0-dev (>= 2.12.0),
                libbonoboui2-dev (>= 2.4.2),
                libgnomevfs2-dev (>= 2.4),
@@ -48,32 +50,35 @@
                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.21.92),
-               libedataserver1.2-dev (>= 2.21.92),
-               libegroupwise1.2-dev (>= 2.21.92),
-               libedataserverui1.2-dev (>= 2.21.92),
+               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 (>= 2.21.92),
-               libebook1.2-dev (>= 2.21.92),
+               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.4-dev,
                libdbus-1-dev,
-               libexchange-storage1.2-dev (>= 2.21.92),
-               gtkhtml3.14,
+               libexchange-storage1.2-dev (>= 2.23.91),
                libgstreamer0.10-dev,
                libytnef0-dev,
-               pilot-link
+               pilot-link,
+               automake,
+               libtool
 
 Package: evolution
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          evolution-common (= ${source:Version}),
-         evolution-data-server (>= 2.21.92),
-         evolution-data-server (<< 2.23.0),
-         gtkhtml3.14 (>= 3.17.5),
+         evolution-data-server (>= 2.24.0),
+         evolution-data-server (<< 2.25.0),
          gnome-icon-theme (>= 2.19.91),
          dbus
 Recommends: gnome-pilot-conduits (>= 2.0.9),

Modified: unstable/evolution/debian/evolution-mail.desktop
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution-mail.desktop?rev=1106&op=diff
==============================================================================
--- unstable/evolution/debian/evolution-mail.desktop (original)
+++ unstable/evolution/debian/evolution-mail.desktop Mon Dec 15 21:50:20 2008
@@ -43,5 +43,5 @@
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=Evolution
 X-GNOME-Bugzilla-Component=BugBuddyBugs
-X-GNOME-Bugzilla-Version=2.22.x
-X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.22;evolution-alarm-notify;
+X-GNOME-Bugzilla-Version=2.24.x
+X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.24;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=1106&op=diff
==============================================================================
--- unstable/evolution/debian/evolution-plugins-experimental.install (original)
+++ unstable/evolution/debian/evolution-plugins-experimental.install Mon Dec 15 21:50:20 2008
@@ -1,1 +1,2 @@
-debian/tmp/usr/lib/evolution/2.22/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments}*.{so,eplug,xml}
+debian/tmp/usr/lib/evolution/2.24/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments}*.{so,eplug,xml}
+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=1106&op=diff
==============================================================================
--- unstable/evolution/debian/evolution-plugins.install (original)
+++ unstable/evolution/debian/evolution-plugins.install Mon Dec 15 21:50:20 2008
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/evolution/2.22/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.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/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=1106&op=diff
==============================================================================
--- unstable/evolution/debian/evolution.install (original)
+++ unstable/evolution/debian/evolution.install Mon Dec 15 21:50:20 2008
@@ -1,15 +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.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/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,google,sa-junk-plugin,bogo-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade}
+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/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=1106&op=diff
==============================================================================
--- unstable/evolution/debian/evolution.links (original)
+++ unstable/evolution/debian/evolution.links Mon Dec 15 21:50:20 2008
@@ -1,3 +1,3 @@
-/usr/lib/evolution/2.22/csv2vcard /usr/bin/csv2vcard
-/usr/lib/evolution/2.22/evolution-addressbook-export /usr/bin/evolution-addressbook-export
-/usr/share/man/man1/evolution.1.gz /usr/share/man/man1/evolution-2.22.1.gz
+/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

Modified: unstable/evolution/debian/lintian/evolution-plugins
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/lintian/evolution-plugins?rev=1106&op=diff
==============================================================================
--- unstable/evolution/debian/lintian/evolution-plugins (original)
+++ unstable/evolution/debian/lintian/evolution-plugins Mon Dec 15 21:50:20 2008
@@ -1,2 +1,16 @@
-evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so /usr/lib/evolution/2.22/components
-evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/plugins/liborg-gnome-face.so /usr/lib/evolution/2.22/components
+# 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
+

Added: unstable/evolution/debian/lintian/evolution-plugins-experimental
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/lintian/evolution-plugins-experimental?rev=1106&op=file
==============================================================================
--- unstable/evolution/debian/lintian/evolution-plugins-experimental (added)
+++ unstable/evolution/debian/lintian/evolution-plugins-experimental Mon Dec 15 21:50:20 2008
@@ -1,0 +1,1 @@
+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

Modified: unstable/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/rules?rev=1106&op=diff
==============================================================================
--- unstable/evolution/debian/rules (original)
+++ unstable/evolution/debian/rules Mon Dec 15 21:50:20 2008
@@ -9,12 +9,12 @@
 
 UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg')
 
-DEB_SHLIBDEPS_INCLUDE := debian/evolution/usr/lib/evolution/2.22
+DEB_SHLIBDEPS_INCLUDE := debian/evolution/usr/lib/evolution/2.24
 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.24
 
 CFLAGS += -fPIC
 
@@ -35,5 +35,21 @@
 	--libexecdir=/usr/lib \
 	--enable-plugins=experimental
 
+configure/evolution::
+	dh_testdir
+	autoreconf -vfi
+
 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