r1398 - in /experimental/evolution: ./ debian/ debian/lintian/

corsac at users.alioth.debian.org corsac at users.alioth.debian.org
Sat Nov 7 21:44:06 UTC 2009 

Author: corsac
Date: Sat Nov  7 21:44:05 2009
New Revision: 1398

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1398
Log:
prepare 2.29 evolution

Added:
    experimental/evolution/
      - copied from r1396, tags/evolution/2.28.1-1/
    experimental/evolution/debian/libevolution.install
Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/control
    experimental/evolution/debian/evolution-dev.install
    experimental/evolution/debian/evolution-mail.desktop
    experimental/evolution/debian/evolution-plugins-experimental.install
    experimental/evolution/debian/evolution-plugins.install
    experimental/evolution/debian/evolution.install
    experimental/evolution/debian/evolution.links
    experimental/evolution/debian/lintian/evolution-plugins
    experimental/evolution/debian/lintian/evolution-plugins-experimental
    experimental/evolution/debian/rules
    experimental/evolution/debian/watch

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=1398&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Sat Nov  7 21:44:05 2009
@@ -1,3 +1,33 @@
+evolution (2.29.1-1) UNRELEASED; urgency=low
+
+  * New upstream development release.
+  * debian/watch updated to track development releases.
+  * debian/control:
+    - add a new libevolution package to separate the libs from the main
+      package.
+    - update build deps:
+      + drop bonobo, gnomeui, and libexchange-storage ;
+      + add libunique-dev, libcanberra-dev, libcanberra-gtk-dev ;
+      + update gtkhtml and eds to 2.29.1.
+  * debian/{lib,}evolution.install: ship libs in the libevolution package.
+  * debian/rules:
+    - update ELIBDIR to 2.30.
+    - don't build exchange plugin now inexistant.
+    - drop unknown configure options:
+      + --without-openssl-includes, --without-openssl-libs, --disable-openssl
+      + --enable-cairo-calendar, 
+      + --without-krb4,
+      + --enable-ipv6, 
+    - don't build pstimport plugin since we don't have libpst in Debian.
+  * debian/lintian: update paths to 2.29.
+  * debian/*.install: 
+    - update paths to 2.30 ;
+    - move vcard and templates plugin from experimental to base package.
+  * debian/evolution-dev.install:
+    - drop bonobo interface folder.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 07 Nov 2009 14:22:28 +0100
+
 evolution (2.28.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=1398&op=diff
==============================================================================
--- experimental/evolution/debian/control (original)
+++ experimental/evolution/debian/control Sat Nov  7 21:44:05 2009
@@ -28,21 +28,18 @@
                gtk-doc-tools (>= 0.6),
                libatk1.0-dev,
                libldap2-dev,
-               libgtkhtml3.14-dev (>= 3.28.0),
-               libgtkhtml-editor-dev (>= 3.28.0),
+               libgtkhtml3.14-dev (>= 3.29.1),
+               libgtkhtml-editor-dev (>= 3.29.1),
                libgnome-pilot2-dev (>= 2.0.15),
                libkrb5-dev,
                libnss3-dev,
                psmisc,
-               libglib2.0-dev (>= 2.15.3),
+               libglib2.0-dev (>= 2.20.0),
                liborbit2-dev (>= 1:2.9.8),
-               libbonobo2-dev (>= 2.20.3),
-               evolution-data-server-dev (>= 2.28.0),
-               evolution-data-server-dev (<< 2.29.0),
+               evolution-data-server-dev (>= 2.29.1),
+               evolution-data-server-dev (<< 2.30.0),
                libgtk2.0-dev (>= 2.12.0),
-               libbonoboui2-dev (>= 2.4.2),
                libgnomevfs2-dev (>= 2.4),
-               libgnomeui-dev,
                libglade2-dev,
                libgnomecanvas2-dev,
                libxml2-dev,
@@ -50,22 +47,21 @@
                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.28.0),
-               libedataserver1.2-dev (>= 2.28.0),
-               libegroupwise1.2-dev (>= 2.28.0),
-               libedataserverui1.2-dev (>= 2.28.0),
-               libebackend1.2-dev (>= 2.28.0),
-               libgdata1.2-dev (>= 2.28.0),
-               libgdata-google1.2-dev (>= 2.28.0),
+               libcamel1.2-dev (>= 2.29.1),
+               libedataserver1.2-dev (>= 2.29.1),
+               libegroupwise1.2-dev (>= 2.29.1),
+               libedataserverui1.2-dev (>= 2.29.1),
+               libebackend1.2-dev (>= 2.29.1),
+               libgdata1.2-dev (>= 2.29.1),
+               libgdata-google1.2-dev (>= 2.29.1),
                libgnome2-dev,
-               libecal1.2-dev (>= 2.28.0),
-               libebook1.2-dev (>= 2.28.0),
+               libecal1.2-dev (>= 2.29.1),
+               libebook1.2-dev (>= 2.29.1),
                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.28.0),
                libgstreamer0.10-dev,
                libytnef0-dev,
                pilot-link,
@@ -73,18 +69,21 @@
                libtool,
                libical-dev,
                libicu-dev,
-               libgweather-dev (>= 2.24.5),
+               libgweather-dev (>= 2.25.3),
                po-debconf,
                libgnome-desktop-dev (>= 2.26.0),
-               sharutils
+               sharutils,
+               libunique-dev,
+               libcanberra-dev,
+               libcanberra-gtk-dev,
 
 Package: evolution
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          evolution-common (= ${source:Version}),
-         evolution-data-server (>= 2.28.0),
-         evolution-data-server (<< 2.29.0),
+         evolution-data-server (>= 2.29.1),
+         evolution-data-server (<< 2.30.0),
          gnome-icon-theme (>= 2.19.91),
          dbus
 Pre-Depends: debconf (>= 1.4.69) | debconf-2.0
@@ -137,8 +136,15 @@
   - google-account-setup
   - sa-junk-plugin
   - bogo-junk-plugin
-  - exchange-operations
   - mono
+
+Package: libevolution
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Replaces: evolution (<< 2.29.1-1)
+Description: evolution libraries
+ This package contains libraries used by evolution and the anjal mail client.
 
 Package: evolution-common
 Architecture: all
@@ -186,6 +192,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Conflicts: evolution-plugins-experimental (<< 2.29.1-1)
+Replaces: evolution-plugins-experimental (<< 2.29.1-1)
 Recommends: notification-daemon
 Description: standard plugins for Evolution
  Evolution is a groupware suite which integrates mail, calendar,
@@ -212,6 +220,8 @@
   - attachment-reminder
   - face
   - backup-restore
+  - templates
+  - vcard-inline
 
 Package: evolution-plugins-experimental
 Architecture: any
@@ -236,5 +246,3 @@
   - tnef-attachments
   - email-custom-headers
   - evolution-webdav
-  - templates
-  - vcard-inline

Modified: experimental/evolution/debian/evolution-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-dev.install?rev=1398&op=diff
==============================================================================
--- experimental/evolution/debian/evolution-dev.install (original)
+++ experimental/evolution/debian/evolution-dev.install Sat Nov  7 21:44:05 2009
@@ -1,4 +1,3 @@
 debian/tmp/usr/lib/pkgconfig
 debian/tmp/usr/include
-debian/tmp/usr/share/idl
 debian/tmp/usr/lib/evolution/*/*.{a,so}

Modified: experimental/evolution/debian/evolution-mail.desktop
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-mail.desktop?rev=1398&op=diff
==============================================================================
--- experimental/evolution/debian/evolution-mail.desktop (original)
+++ experimental/evolution/debian/evolution-mail.desktop Sat Nov  7 21:44:05 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.28.x
+X-GNOME-Bugzilla-Version=2.29.x
 X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.27;evolution-alarm-notify;

Modified: experimental/evolution/debian/evolution-plugins-experimental.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-plugins-experimental.install?rev=1398&op=diff
==============================================================================
--- experimental/evolution/debian/evolution-plugins-experimental.install (original)
+++ experimental/evolution/debian/evolution-plugins-experimental.install Sat Nov  7 21:44:05 2009
@@ -1,3 +1,3 @@
-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/tmp/usr/lib/evolution/2.30/plugins/*{face,hula-account-setup,folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments,email-custom-header,evolution-webdav,profiler}*.{so,eplug,xml}
+debian/tmp/usr/lib/evolution/2.30/plugins/templates.glade
 debian/lintian/evolution-plugins-experimental usr/share/lintian/overrides/

Modified: experimental/evolution/debian/evolution-plugins.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-plugins.install?rev=1398&op=diff
==============================================================================
--- experimental/evolution/debian/evolution-plugins.install (original)
+++ experimental/evolution/debian/evolution-plugins.install Sat Nov  7 21:44:05 2009
@@ -1,2 +1,2 @@
-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/tmp/usr/lib/evolution/2.30/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,email-custom-header,templates,vcard-inline}*.{so,eplug,xml,glade}
 debian/lintian/evolution-plugins usr/share/lintian/overrides/

Modified: experimental/evolution/debian/evolution.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution.install?rev=1398&op=diff
==============================================================================
--- experimental/evolution/debian/evolution.install (original)
+++ experimental/evolution/debian/evolution.install Sat Nov  7 21:44:05 2009
@@ -1,15 +1,6 @@
 debian/tmp/etc/gconf
-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/etc/xdg
 debian/tmp/usr/bin
-debian/tmp/usr/lib/bonobo
-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/tmp/usr/lib/evolution/2.30/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,webdav,imap-features,google,sa-junk-plugin,bogo-junk-plugin,folder-permissions,folder-subscription}*.{so,eplug,xml,glade}
 debian/evolution-mail.desktop usr/share/applications/
 debian/evolution.xpm usr/share/pixmaps/

Modified: experimental/evolution/debian/evolution.links
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution.links?rev=1398&op=diff
==============================================================================
--- experimental/evolution/debian/evolution.links (original)
+++ experimental/evolution/debian/evolution.links Sat Nov  7 21:44:05 2009
@@ -1,3 +1,3 @@
-/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
+/usr/lib/evolution/2.29/csv2vcard /usr/bin/csv2vcard
+/usr/lib/evolution/2.29/evolution-addressbook-export /usr/bin/evolution-addressbook-export
+/usr/share/man/man1/evolution.1.gz /usr/share/man/man1/evolution-2.29.1.gz

Added: experimental/evolution/debian/libevolution.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/libevolution.install?rev=1398&op=file
==============================================================================
--- experimental/evolution/debian/libevolution.install (added)
+++ experimental/evolution/debian/libevolution.install Sat Nov  7 21:44:05 2009
@@ -1,0 +1,7 @@
+debian/tmp/usr/lib/evolution/2.30/*.so.*
+debian/tmp/usr/lib/evolution/2.30/conduits/*.so
+debian/tmp/usr/lib/evolution/2.30/csv2vcard
+debian/tmp/usr/lib/evolution/2.30/modules/*.so
+debian/tmp/usr/lib/evolution/2.30/evolution-addressbook-export
+debian/tmp/usr/lib/evolution/2.30/evolution-addressbook-clean
+debian/tmp/usr/lib/evolution/2.30/evolution-backup

Modified: experimental/evolution/debian/lintian/evolution-plugins
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/lintian/evolution-plugins?rev=1398&op=diff
==============================================================================
--- experimental/evolution/debian/lintian/evolution-plugins (original)
+++ experimental/evolution/debian/lintian/evolution-plugins Sat Nov  7 21:44:05 2009
@@ -1,7 +1,7 @@
 # Private rpath
-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
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.29/plugins/liborg-gnome-default-mailer.so /usr/lib/evolution/2.29/components
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.29/plugins/liborg-gnome-evolution-attachment-reminder.so /usr/lib/evolution/2.29/components
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.29/plugins/liborg-gnome-face.so /usr/lib/evolution/2.29/components
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.29/plugins/liborg-gnome-mail-to-task.so /usr/lib/evolution/2.29/components
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.29/plugins/liborg-gnome-mailing-list-actions.so /usr/lib/evolution/2.29/components
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.29/plugins/liborg-gnome-prefer-plain.so /usr/lib/evolution/2.29/components

Modified: experimental/evolution/debian/lintian/evolution-plugins-experimental
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/lintian/evolution-plugins-experimental?rev=1398&op=diff
==============================================================================
--- experimental/evolution/debian/lintian/evolution-plugins-experimental (original)
+++ experimental/evolution/debian/lintian/evolution-plugins-experimental Sat Nov  7 21:44:05 2009
@@ -1,5 +1,5 @@
 # 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
+evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.29/plugins/liborg-gnome-email-custom-header.so /usr/lib/evolution/2.29/components
+evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.29/plugins/liborg-gnome-mail-folder-unsubscribe.so /usr/lib/evolution/2.29/components
+evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.29/plugins/liborg-gnome-templates.so /usr/lib/evolution/2.29/components
 

Modified: experimental/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/rules?rev=1398&op=diff
==============================================================================
--- experimental/evolution/debian/rules (original)
+++ experimental/evolution/debian/rules Sat Nov  7 21:44:05 2009
@@ -10,10 +10,11 @@
 UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg')
 
 
-ELIBDIR := usr/lib/evolution/2.28
+ELIBDIR := usr/lib/evolution/2.30
 
 DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR)
-DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' --noscripts -X $(ELIBDIR)/components
+DEB_DH_MAKESHLIBS_ARGS_libevolution += -V'libevolution (>= ${UPSTREAM_VERSION})' --noscripts -X $(ELIBDIR)/modules
+DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})'
 DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins
 
 
@@ -22,19 +23,13 @@
 DEB_CONFIGURE_EXTRA_FLAGS += \
 	--with-openldap \
 	--enable-nls \
-	--without-openssl-includes \
-	--without-openssl-libs \
 	--enable-pilot-conduits \
-	--enable-cairo-calendar \
-	--enable-exchange=yes \
-	--without-krb4 \
 	--with-krb5=/usr \
-	--enable-ipv6 \
-	--disable-openssl \
 	--sysconfdir=/etc \
 	--enable-nntp \
 	--libexecdir=/usr/lib \
-	--enable-plugins=experimental
+	--enable-plugins=experimental \
+	--disable-pst-import
 
 clean::
 	debconf-updatepo

Modified: experimental/evolution/debian/watch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/watch?rev=1398&op=diff
==============================================================================
--- experimental/evolution/debian/watch (original)
+++ experimental/evolution/debian/watch Sat Nov  7 21:44:05 2009
@@ -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

More information about the pkg-evolution-commits mailing list