r2104 - in /unstable/evolution-mapi: ./ debian/changelog debian/control debian/patches/01_openchange_1.0_compat debian/rules

[jelmer at users.alioth.debian.org]

Author: jelmer
Date: Mon Mar 26 20:15:23 2012
New Revision: 2104

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2104
Log:
* Update 01_openchange_1.0_compat to check for libmapi version.
 + Build-depend on dh-autoreconf to regenerate configure.

Modified:
    unstable/evolution-mapi/   (props changed)
    unstable/evolution-mapi/debian/changelog
    unstable/evolution-mapi/debian/control
    unstable/evolution-mapi/debian/patches/01_openchange_1.0_compat
    unstable/evolution-mapi/debian/rules

Modified: unstable/evolution-mapi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/changelog?rev=2104&op=diff
==============================================================================
--- unstable/evolution-mapi/debian/changelog (original)
+++ unstable/evolution-mapi/debian/changelog Mon Mar 26 20:15:23 2012
@@ -2,8 +2,10 @@
 
   * Update watch file to look for .tar.xz too.
   * New upstream release.
+  * Update 01_openchange_1.0_compat to check for libmapi version.
+   + Build-depend on dh-autoreconf to regenerate configure.
 
- -- Jelmer Vernooij <jelmer at debian.org>  Mon, 26 Mar 2012 19:31:32 +0200
+ -- Jelmer Vernooij <jelmer at debian.org>  Mon, 26 Mar 2012 22:07:22 +0200
 
 evolution-mapi (3.2.2-1) unstable; urgency=low
 

Modified: unstable/evolution-mapi/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/control?rev=2104&op=diff
==============================================================================
--- unstable/evolution-mapi/debian/control (original)
+++ unstable/evolution-mapi/debian/control Mon Mar 26 20:15:23 2012
@@ -15,6 +15,7 @@
 Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/evolution-mapi
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-evolution/unstable/evolution-mapi
 Build-Depends: debhelper (>= 7),
+               dh-autoreconf,
                cdbs (>= 0.4.37),
                intltool (>= 0.35.5),
                pkg-config,

Modified: unstable/evolution-mapi/debian/patches/01_openchange_1.0_compat
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/patches/01_openchange_1.0_compat?rev=2104&op=diff
==============================================================================
--- unstable/evolution-mapi/debian/patches/01_openchange_1.0_compat (original)
+++ unstable/evolution-mapi/debian/patches/01_openchange_1.0_compat Mon Mar 26 20:15:23 2012
@@ -654,3 +654,15 @@
  G_END_DECLS
  
  #endif
+diff -ur evolution-mapi-3.2.3/configure.ac evolution-mapi-3.2.3.new/configure.ac
+--- evolution-mapi-3.2.3/configure.ac	2011-12-13 09:12:01.000000000 +0100
++++ evolution-mapi-3.2.3.new/configure.ac	2012-03-26 22:08:54.000000000 +0200
+@@ -27,7 +27,7 @@
+ dnl *******************
+ m4_define([eds_minimum_version], [ema_version])
+ m4_define([evo_minimum_version], [ema_version])
+-m4_define([libmapi_minimum_version], [0.11])
++m4_define([libmapi_minimum_version], [1.0])
+ m4_define([glib_minimum_version], [2.16.1])
+ m4_define([gtk_minimum_version], [2.99.2])
+ m4_define([gconf_minimum_version], [2.0.0])

Modified: unstable/evolution-mapi/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/rules?rev=2104&op=diff
==============================================================================
--- unstable/evolution-mapi/debian/rules (original)
+++ unstable/evolution-mapi/debian/rules Mon Mar 26 20:15:23 2012
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_DH_INSTALL_ARGS += --list-missing
 DEB_DH_MAKESHLIBS_ARGS_evolution-mapi += --no-act