r1301 - in /experimental/evolution/debian: changelog control evolution-dev.install patches/01_fix-evolution-cal-shared-module.patch rules

[corsac at users.alioth.debian.org]

Author: corsac
Date: Thu Aug 13 12:27:14 2009
New Revision: 1301

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1301
Log:
* debian/patches:
  - 01_fix-evolution-cal-shared-module added, don't build
    libevolution-cal-shared.so as a module (and make it ship in the
    correct package).                                         closes: #541195
* debian/control:
  - make evolution conflict with evolution-dev (=2.27.90-1) for above fix.

Added:
    experimental/evolution/debian/patches/01_fix-evolution-cal-shared-module.patch
Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/control
    experimental/evolution/debian/evolution-dev.install
    experimental/evolution/debian/rules

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=1301&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Thu Aug 13 12:27:14 2009
@@ -1,3 +1,14 @@
+evolution (2.27.90-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 01_fix-evolution-cal-shared-module added, don't build
+      libevolution-cal-shared.so as a module (and make it ship in the
+      correct package).                                         closes: #541195
+  * debian/control:
+    - make evolution conflict with evolution-dev (=2.27.90-1) for above fix.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 12 Aug 2009 18:50:29 +0200
+
 evolution (2.27.90-1) experimental; urgency=low
 
   * New upstream release candidate.

Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=1301&op=diff
==============================================================================
--- experimental/evolution/debian/control (original)
+++ experimental/evolution/debian/control Thu Aug 13 12:27:14 2009
@@ -101,6 +101,7 @@
           evolution-plugins-experimental
 Provides: mail-reader,
           imap-client
+Conflicts: evolution-dev (= 2.27.90-1)
 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.

Modified: experimental/evolution/debian/evolution-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-dev.install?rev=1301&op=diff
==============================================================================
--- experimental/evolution/debian/evolution-dev.install (original)
+++ experimental/evolution/debian/evolution-dev.install Thu Aug 13 12:27:14 2009
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/evolution/*/*.{a,so}
 debian/tmp/usr/lib/pkgconfig
 debian/tmp/usr/include
 debian/tmp/usr/share/idl
+debian/tmp/usr/lib/evolution/*/*.{a,so}

Added: experimental/evolution/debian/patches/01_fix-evolution-cal-shared-module.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/01_fix-evolution-cal-shared-module.patch?rev=1301&op=file
==============================================================================
--- experimental/evolution/debian/patches/01_fix-evolution-cal-shared-module.patch (added)
+++ experimental/evolution/debian/patches/01_fix-evolution-cal-shared-module.patch Thu Aug 13 12:27:14 2009
@@ -1,0 +1,13 @@
+diff --git a/calendar/gui/Makefile.in b/calendar/gui/Makefile.in
+index c42ee5a..bddc34d 100644
+--- a/calendar/gui/Makefile.in
++++ b/calendar/gui/Makefile.in
+@@ -730,7 +730,7 @@ libevolution_cal_shared_la_LIBADD = \
+ 	$(CAMEL_LIBS)							\
+ 	$(EVOLUTION_CALENDAR_LIBS)
+ 
+-libevolution_cal_shared_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
++libevolution_cal_shared_la_LDFLAGS = $(NO_UNDEFINED)
+ libevolution_calendar_la_LIBADD = \
+ 	$(top_builddir)/calendar/gui/libevolution-cal-shared.la		\
+ 	$(WIN32_BOOTSTRAP_LIBS)						\

Modified: experimental/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/rules?rev=1301&op=diff
==============================================================================
--- experimental/evolution/debian/rules (original)
+++ experimental/evolution/debian/rules Thu Aug 13 12:27:14 2009
@@ -14,7 +14,6 @@
 
 DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR)
 DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' --noscripts -X $(ELIBDIR)/components
-DEB_DH_MAKESHLIBS_ARGS_evolution-dev += -X $(ELIBDIR)/libevolution-cal-shared.so
 DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins