r2903 - in /unstable/evolution/debian: changelog patches/0001-Add-.desktop-file-actions-for-compose-contacts-calen.patch patches/10_revert_libevolution_avoid-version.patch patches/series

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Tue May 17 21:32:04 UTC 2016 

Author: biebl
Date: Tue May 17 21:32:04 2016
New Revision: 2903

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2903
Log:
Drop 0001-Add-.desktop-file-actions-for-compose-contacts-calen.patch,
merged upstream.

Removed:
    unstable/evolution/debian/patches/0001-Add-.desktop-file-actions-for-compose-contacts-calen.patch
Modified:
    unstable/evolution/debian/changelog
    unstable/evolution/debian/patches/10_revert_libevolution_avoid-version.patch
    unstable/evolution/debian/patches/series

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=2903&op=diff
==============================================================================
--- unstable/evolution/debian/changelog	(original)
+++ unstable/evolution/debian/changelog	Tue May 17 21:32:04 2016
@@ -1,6 +1,8 @@
 evolution (3.20.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop 0001-Add-.desktop-file-actions-for-compose-contacts-calen.patch,
+    merged upstream.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 17 May 2016 23:28:08 +0200
 

Modified: unstable/evolution/debian/patches/10_revert_libevolution_avoid-version.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/10_revert_libevolution_avoid-version.patch?rev=2903&op=diff
==============================================================================
--- unstable/evolution/debian/patches/10_revert_libevolution_avoid-version.patch	(original)
+++ unstable/evolution/debian/patches/10_revert_libevolution_avoid-version.patch	Tue May 17 21:32:04 2016
@@ -6,6 +6,8 @@
 Forwarded: no
 
 ---
+Index: b/addressbook/gui/contact-editor/Makefile.am
+===================================================================
 --- a/addressbook/gui/contact-editor/Makefile.am
 +++ b/addressbook/gui/contact-editor/Makefile.am
 @@ -26,7 +26,7 @@
@@ -17,6 +19,8 @@
  
  libecontacteditor_la_LIBADD =						\
  	$(top_builddir)/e-util/libevolution-util.la			\
+Index: b/addressbook/gui/contact-list-editor/Makefile.am
+===================================================================
 --- a/addressbook/gui/contact-list-editor/Makefile.am
 +++ b/addressbook/gui/contact-list-editor/Makefile.am
 @@ -20,7 +20,7 @@
@@ -28,6 +32,8 @@
  
  libecontactlisteditor_la_LIBADD =				\
  	$(top_builddir)/addressbook/util/libeabutil.la		\
+Index: b/addressbook/importers/Makefile.am
+===================================================================
 --- a/addressbook/importers/Makefile.am
 +++ b/addressbook/importers/Makefile.am
 @@ -19,7 +19,7 @@
@@ -39,6 +45,8 @@
  
  libevolution_addressbook_importers_la_LIBADD = \
  	$(top_builddir)/e-util/libevolution-util.la 			\
+Index: b/addressbook/util/Makefile.am
+===================================================================
 --- a/addressbook/util/Makefile.am
 +++ b/addressbook/util/Makefile.am
 @@ -20,7 +20,7 @@
@@ -50,10 +58,12 @@
  
  libeabutil_la_LIBADD =					\
  	$(top_builddir)/e-util/libevolution-util.la	\
+Index: b/calendar/gui/Makefile.am
+===================================================================
 --- a/calendar/gui/Makefile.am
 +++ b/calendar/gui/Makefile.am
-@@ -207,7 +207,7 @@
- 	$(LIBSOUP_LIBS)							\
+@@ -234,7 +234,7 @@
+ 	$(MATH_LIB)							\
  	$(NULL)
  
 -libevolution_calendar_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
@@ -61,6 +71,8 @@
  
  EXTRA_DIST =	 			\
  	$(ui_DATA)			\
+Index: b/calendar/importers/Makefile.am
+===================================================================
 --- a/calendar/importers/Makefile.am
 +++ b/calendar/importers/Makefile.am
 @@ -16,7 +16,7 @@
@@ -72,6 +84,8 @@
  
  libevolution_calendar_importers_la_LIBADD =			\
  	$(top_builddir)/e-util/libevolution-util.la		\
+Index: b/composer/Makefile.am
+===================================================================
 --- a/composer/Makefile.am
 +++ b/composer/Makefile.am
 @@ -51,7 +51,7 @@
@@ -83,6 +97,8 @@
  
  libevolution_mail_composer_la_LIBADD =			\
  	$(top_builddir)/e-util/libevolution-util.la	\
+Index: b/e-util/Makefile.am
+===================================================================
 --- a/e-util/Makefile.am
 +++ b/e-util/Makefile.am
 @@ -646,7 +646,7 @@
@@ -94,6 +110,8 @@
  
  libevolution_util_la_LIBADD =  \
  	$(top_builddir)/libgnomecanvas/libgnomecanvas.la \
+Index: b/em-format/Makefile.am
+===================================================================
 --- a/em-format/Makefile.am
 +++ b/em-format/Makefile.am
 @@ -98,7 +98,7 @@
@@ -114,9 +132,11 @@
  
  if ENABLE_SMIME
  SMIME_LIBS =						\
+Index: b/libemail-engine/Makefile.am
+===================================================================
 --- a/libemail-engine/Makefile.am
 +++ b/libemail-engine/Makefile.am
-@@ -80,7 +80,7 @@
+@@ -82,7 +82,7 @@
  	$(GNOME_PLATFORM_LIBS) \
  	$(NULL)
  
@@ -125,6 +145,8 @@
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = libemail-engine.pc
+Index: b/libgnomecanvas/Makefile.am
+===================================================================
 --- a/libgnomecanvas/Makefile.am
 +++ b/libgnomecanvas/Makefile.am
 @@ -54,7 +54,7 @@
@@ -136,9 +158,11 @@
  
  BUILT_SOURCES = $(MARSHAL_GENERATED)
  
+Index: b/mail/Makefile.am
+===================================================================
 --- a/mail/Makefile.am
 +++ b/mail/Makefile.am
-@@ -236,7 +236,7 @@
+@@ -238,7 +238,7 @@
  	$(LIBSOUP_LIBS)					\
  	$(NULL)
  
@@ -147,6 +171,8 @@
  
  noinst_PROGRAMS = test-mail-autoconfig
  
+Index: b/mail/importers/Makefile.am
+===================================================================
 --- a/mail/importers/Makefile.am
 +++ b/mail/importers/Makefile.am
 @@ -22,7 +22,7 @@
@@ -158,6 +184,8 @@
  
  libevolution_mail_importers_la_LIBADD =				\
  	$(top_builddir)/e-util/libevolution-util.la		\
+Index: b/shell/Makefile.am
+===================================================================
 --- a/shell/Makefile.am
 +++ b/shell/Makefile.am
 @@ -86,7 +86,7 @@
@@ -169,6 +197,8 @@
  
  libevolution_shell_la_LIBADD =				\
  	$(top_builddir)/e-util/libevolution-util.la	\
+Index: b/smime/gui/Makefile.am
+===================================================================
 --- a/smime/gui/Makefile.am
 +++ b/smime/gui/Makefile.am
 @@ -43,7 +43,7 @@
@@ -180,6 +210,8 @@
  
  ui_DATA = smime-ui.ui
  
+Index: b/smime/lib/Makefile.am
+===================================================================
 --- a/smime/lib/Makefile.am
 +++ b/smime/lib/Makefile.am
 @@ -35,6 +35,6 @@

Modified: unstable/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/series?rev=2903&op=diff
==============================================================================
--- unstable/evolution/debian/patches/series	(original)
+++ unstable/evolution/debian/patches/series	Tue May 17 21:32:04 2016
@@ -1,3 +1,2 @@
-0001-Add-.desktop-file-actions-for-compose-contacts-calen.patch
 02_nss_paths.patch
 10_revert_libevolution_avoid-version.patch

More information about the pkg-evolution-commits mailing list