r1116 - in /experimental/evolution/debian: changelog control evolution-plugins-experimental.install lintian/evolution-plugins-experimental rules

corsac at users.alioth.debian.org corsac at users.alioth.debian.org
Sat Feb 28 18:10:09 UTC 2009 

Author: corsac
Date: Sat Feb 28 18:10:09 2009
New Revision: 1116

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1116
Log:
  - drop obsolete Conflicts/Replaces.
  - ignore plugin folder in dh_makeshlibs.
  - ship email-custom-header, evolution-webdav and templates plugin. 

Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/control
    experimental/evolution/debian/evolution-plugins-experimental.install
    experimental/evolution/debian/lintian/evolution-plugins-experimental
    experimental/evolution/debian/rules

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=1116&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Sat Feb 28 18:10:09 2009
@@ -1,4 +1,4 @@
-evolution (2.24.3-1) UNRELEASED; urgency=low
+evolution (2.24.5-1) unstable; urgency=low
 
   * New upstream release.
   * debian/control:
@@ -7,14 +7,17 @@
     - 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.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 27 Jan 2009 20:11:50 +0100
+    - ship email-custom-header, evolution-webdav and templates plugin. 
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 28 Feb 2009 15:24:22 +0100
 
 evolution (2.22.3.1-1) unstable; urgency=medium
 

Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=1116&op=diff
==============================================================================
--- experimental/evolution/debian/control (original)
+++ experimental/evolution/debian/control Sat Feb 28 18:10:09 2009
@@ -28,7 +28,7 @@
                gtk-doc-tools (>= 0.6),
                libatk1.0-dev,
                libldap2-dev,
-               libgtkhtml3.14-dev (>= 3.23.5),
+               libgtkhtml3.14-dev (>= 3.24.5),
                libgtkhtml-editor-dev (>= 3.23.5),
                libgnome-pilot2-dev (>= 2.0.15),
                libkrb5-dev,
@@ -37,7 +37,7 @@
                libglib2.0-dev (>= 2.15.3),
                liborbit2-dev (>= 1:2.9.8),
                libbonobo2-dev (>= 2.20.3),
-               evolution-data-server-dev (>= 2.24.3),
+               evolution-data-server-dev (>= 2.24.5),
                evolution-data-server-dev (<< 2.25.0),
                libgtk2.0-dev (>= 2.12.0),
                libbonoboui2-dev (>= 2.4.2),
@@ -96,11 +96,6 @@
           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.90),
-           evolution-plugins (<< 2.21.90),
-           evolution-plugins-experimental (<< 2.21.90)
 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.
@@ -142,7 +137,6 @@
 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,
@@ -216,7 +210,6 @@
 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.
@@ -233,3 +226,6 @@
   - external-editor
   - ipod-sync
   - tnef-attachments
+  - email-custom-headers
+  - evolution-webdav
+  - templates

Modified: experimental/evolution/debian/evolution-plugins-experimental.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-plugins-experimental.install?rev=1116&op=diff
==============================================================================
--- experimental/evolution/debian/evolution-plugins-experimental.install (original)
+++ experimental/evolution/debian/evolution-plugins-experimental.install Sat Feb 28 18:10:09 2009
@@ -1,2 +1,3 @@
-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/tmp/usr/lib/evolution/2.24/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.24/plugins/templates.glade
 debian/lintian/evolution-plugins-experimental usr/share/lintian/overrides/

Modified: experimental/evolution/debian/lintian/evolution-plugins-experimental
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/lintian/evolution-plugins-experimental?rev=1116&op=diff
==============================================================================
--- experimental/evolution/debian/lintian/evolution-plugins-experimental (original)
+++ experimental/evolution/debian/lintian/evolution-plugins-experimental Sat Feb 28 18:10:09 2009
@@ -1,1 +1,3 @@
 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
+evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-email-custom-header.so /usr/lib/evolution/2.24/components
+evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-templates.so /usr/lib/evolution/2.24/components

Modified: experimental/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/rules?rev=1116&op=diff
==============================================================================
--- experimental/evolution/debian/rules (original)
+++ experimental/evolution/debian/rules Sat Feb 28 18:10:09 2009
@@ -9,12 +9,13 @@
 
 UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg')
 
-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.24
+
+DEB_SHLIBDEPS_INCLUDE := debian/evolution/usr/lib/evolution/2.24
+DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' --noscripts -X $(ELIBDIR)/components
+DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins
+
 
 CFLAGS += -fPIC

More information about the pkg-evolution-commits mailing list