r3150 - in /experimental/evolution/debian: changelog control evolution-dev.install evolution-tests.install libevolution.install patches/10_revert_libevolution_avoid-version.patch patches/series rules

jbicha-guest at users.alioth.debian.org jbicha-guest at users.alioth.debian.org
Wed May 3 02:38:41 UTC 2017


Author: jbicha-guest
Date: Wed May  3 02:38:41 2017
New Revision: 3150

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=3150
Log:
New upstream release

  - Switch from autotools to cmake
* Bump e-d-s dependencies and build-dependencies to 3.24.1
* Add evolution-tests package for installed tests
* Drop 10_revert_libevolution_avoid-version.patch:
  - This doesn't directly apply with the cmake conversion and doesn't
    seem useful since the version has been 0 for the past 5 years
* Add Breaks/Replaces from libevolution to evolution-dev for above
* Disable 02_nss_paths.patch since it's not clear whether this
  is still needed

Added:
    experimental/evolution/debian/evolution-tests.install
Removed:
    experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch
Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/control
    experimental/evolution/debian/evolution-dev.install
    experimental/evolution/debian/libevolution.install
    experimental/evolution/debian/patches/series
    experimental/evolution/debian/rules

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=3150&op=diff
==============================================================================
--- experimental/evolution/debian/changelog	(original)
+++ experimental/evolution/debian/changelog	Wed May  3 02:38:41 2017
@@ -1,3 +1,18 @@
+evolution (3.24.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release (LP: #1685683)
+    - Switch from autotools to cmake
+  * Bump e-d-s dependencies and build-dependencies to 3.24.1
+  * Add evolution-tests package for installed tests
+  * Drop 10_revert_libevolution_avoid-version.patch:
+    - This doesn't directly apply with the cmake conversion and doesn't
+      seem useful since the version has been 0 for the past 5 years
+  * Add Breaks/Replaces from libevolution to evolution-dev for above
+  * Disable 02_nss_paths.patch since it's not clear whether this
+    is still needed
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Tue, 02 May 2017 22:17:49 -0400
+
 evolution (3.22.6-1) unstable; urgency=medium
 
   * New upstream release.

Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=3150&op=diff
==============================================================================
--- experimental/evolution/debian/control	(original)
+++ experimental/evolution/debian/control	Wed May  3 02:38:41 2017
@@ -11,21 +11,22 @@
 Homepage: https://wiki.gnome.org/Apps/Evolution
 Vcs-Svn: svn://anonscm.debian.org/pkg-evolution/unstable/evolution
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-evolution/unstable/evolution
-Build-Depends: debhelper (>= 10),
+Build-Depends: cmake,
+               debhelper (>= 10),
                dpkg-dev (>= 1.16.1),
                libchamplain-gtk-0.12-dev,
                libglib2.0-dev (>= 2.46.0),
                libgtk-3-dev (>= 3.10.0),
                libgail-3-dev (>= 3.0.2),
                libgdk-pixbuf2.0-dev (>= 2.24.0),
-               libcamel1.2-dev (>= 3.22.6),
-               libebook1.2-dev (>= 3.22.6),
-               libecal1.2-dev (>= 3.22.6),
-               libedataserver1.2-dev (>= 3.22.6),
-               libedataserverui1.2-dev (>= 3.22.6),
-               libebackend1.2-dev (>= 3.22.6),
-               evolution-data-server-dev (>= 3.22.6),
-               evolution-data-server-dev (<< 3.23),
+               libcamel1.2-dev (>= 3.24.1),
+               libebook1.2-dev (>= 3.24.1),
+               libecal1.2-dev (>= 3.24.1),
+               libedataserver1.2-dev (>= 3.24.1),
+               libedataserverui1.2-dev (>= 3.24.1),
+               libebackend1.2-dev (>= 3.24.1),
+               evolution-data-server-dev (>= 3.24.1),
+               evolution-data-server-dev (<< 3.25),
                libwebkit2gtk-4.0-dev (>= 2.13.90),
                libgcr-3-dev (>= 3.4),
                libgtkspell3-3-dev,
@@ -69,8 +70,8 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          evolution-common (= ${source:Version}),
-         evolution-data-server (>= 3.22.6),
-         evolution-data-server (<< 3.23),
+         evolution-data-server (>= 3.24.1),
+         evolution-data-server (<< 3.25),
          dbus,
          psmisc
 Recommends: evolution-plugins,
@@ -113,6 +114,8 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          evolution-common (= ${source:Version}),
+Breaks: evolution-dev (<< 3.24)
+Replaces: evolution-dev (<< 3.24)
 Description: evolution libraries
  This package contains libraries used by evolution and the Anjal mail client.
 
@@ -195,3 +198,15 @@
  The following plugins are included.
   - external-editor
   - contacts-map
+
+Package: evolution-tests
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+Description: Installed tests for Evolution
+ Evolution is a groupware suite which integrates mail, calendar,
+ address book, to-do list and memo tools.
+ .
+ This package contains test programs, designed to be run as part of a
+ regression testsuite.
+

Modified: experimental/evolution/debian/evolution-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-dev.install?rev=3150&op=diff
==============================================================================
--- experimental/evolution/debian/evolution-dev.install	(original)
+++ experimental/evolution/debian/evolution-dev.install	Wed May  3 02:38:41 2017
@@ -1,4 +1,3 @@
 usr/lib/pkgconfig
 usr/include
-usr/lib/evolution/*.so
 usr/share/gtk-doc

Added: experimental/evolution/debian/evolution-tests.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-tests.install?rev=3150&op=file
==============================================================================
--- experimental/evolution/debian/evolution-tests.install	(added)
+++ experimental/evolution/debian/evolution-tests.install	Wed May  3 02:38:41 2017
@@ -0,0 +1,2 @@
+usr/lib/evolution/installed-tests
+usr/share/installed-tests

Modified: experimental/evolution/debian/libevolution.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/libevolution.install?rev=3150&op=diff
==============================================================================
--- experimental/evolution/debian/libevolution.install	(original)
+++ experimental/evolution/debian/libevolution.install	Wed May  3 02:38:41 2017
@@ -1,4 +1,4 @@
-usr/lib/evolution/*.so.*
+usr/lib/evolution/*.so
 usr/lib/evolution/modules/*.so
 usr/lib/evolution/web-extensions/*.so
 usr/lib/evolution/web-extensions/webkit-editor/*.so

Modified: experimental/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/series?rev=3150&op=diff
==============================================================================
--- experimental/evolution/debian/patches/series	(original)
+++ experimental/evolution/debian/patches/series	Wed May  3 02:38:41 2017
@@ -1,2 +1 @@
-02_nss_paths.patch
-10_revert_libevolution_avoid-version.patch
+#02_nss_paths.patch

Modified: experimental/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/rules?rev=3150&op=diff
==============================================================================
--- experimental/evolution/debian/rules	(original)
+++ experimental/evolution/debian/rules	Wed May  3 02:38:41 2017
@@ -22,15 +22,17 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--libdir=\$${prefix}/lib \
-		--libexecdir=\$${prefix}/lib \
-		--with-openldap \
-		--enable-nls \
-		--enable-plugins=all \
-		--enable-pst-import \
-		--enable-contact-maps \
-		--enable-autoar \
-		--with-sub-version=-$(DEB_REVISION)
+		-DLIBEXEC_INSTALL_DIR=/usr/lib \
+		-DSYSCONF_INSTALL_DIR=/etc \
+		-DWITH_OPENLDAP=ON \
+		-DENABLE_PLUGINS=all \
+		-DENABLE_PST_IMPORT=ON \
+		-DENABLE_CONTACT_MAPS=ON \
+		-DENABLE_AUTOAR=ON \
+		-DENABLE_INSTALLED_TESTS=ON \
+		-DWITH_HELP=ON \
+		-DENABLE_GTK_DOC=ON \
+		-DVERSION_SUBSTRING=-$(DEB_REVISION)
 
 override_dh_install:
 	dh_install --fail-missing -X.la -Xlibevolutiontestsettings.so




More information about the pkg-evolution-commits mailing list