[Pkg-mono-svn-commits] rev 2470 - in evolution-sharp/trunk/debian: . patches

Sun Apr 23 16:40:44 UTC 2006

Author: jsogo
Date: 2006-04-23 16:40:43 +0000 (Sun, 23 Apr 2006)
New Revision: 2470

Added:
   evolution-sharp/trunk/debian/patches/00list
   evolution-sharp/trunk/debian/patches/fix-dllmappings.dpatch
   evolution-sharp/trunk/debian/patches/fix-glibsharpglue-dllimport.dpatch
Modified:
   evolution-sharp/trunk/debian/changelog
   evolution-sharp/trunk/debian/control
   evolution-sharp/trunk/debian/install
   evolution-sharp/trunk/debian/rules
Log:
 New patches:
   + fix-dllmappings: New. libevolutionglue is being installed in
      /usr/lib/cli/evolution-sharp-2.0
   + fix-glibsharpglue-dllimport: New. Use libglib2.0-cil.
 
 Install GAPI xml files.
		 


Modified: evolution-sharp/trunk/debian/changelog
===================================================================

--- evolution-sharp/trunk/debian/changelog	2006-04-23 16:01:14 UTC (rev 2469)
+++ evolution-sharp/trunk/debian/changelog	2006-04-23 16:40:43 UTC (rev 2470)
@@ -4,10 +4,14 @@
   * Add myself as uploader.
   * Install GAC libraries in /usr/lib/cli/evolution-sharp-2.0, conforming
   to new CLI policy 0.4.0.
-  * debian/patches: 
+  * debian/patches:
      + evolution-sharp.pc: New. Update where libraries are installed.
+     + fix-dllmappings: New. libevolutionglue is being installed in
+     /usr/lib/cli/evolution-sharp-2.0
+     + fix-glibsharpglue-dllimport: New. Use libglib2.0-cil.
+  * Install GAPI xml files.
 
- -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Sun, 23 Apr 2006 17:57:47 +0200
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Sun, 23 Apr 2006 18:35:42 +0200
 
 evolution-sharp (0.10.2-3) unstable; urgency=low
 

Modified: evolution-sharp/trunk/debian/control
===================================================================
--- evolution-sharp/trunk/debian/control	2006-04-23 16:01:14 UTC (rev 2469)
+++ evolution-sharp/trunk/debian/control	2006-04-23 16:40:43 UTC (rev 2470)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libgtk2.0-dev (>= 2.0.0), libgnome2.0-cil, gtk-sharp2-gapi, evolution-dev, evolution-data-server-dev (>= 1.2.3-4.2), cli-common (>= 0.2.0), mono-mcs (>= 1.0) | c-sharp-compiler, libmono-dev (>= 1.0), mono-gac, libgtkhtml3.8-dev
+Build-Depends: debhelper (>= 4.0.0), dpatch, libgtk2.0-dev (>= 2.0.0), libgnome2.0-cil, gtk-sharp2-gapi, evolution-dev, evolution-data-server-dev (>= 1.2.3-4.2), cli-common (>= 0.2.0), mono-mcs (>= 1.0) | c-sharp-compiler, libmono-dev (>= 1.0), mono-gac
 Standards-Version: 3.6.2
 
 Package: libevolution-cil

Modified: evolution-sharp/trunk/debian/install
===================================================================
--- evolution-sharp/trunk/debian/install	2006-04-23 16:01:14 UTC (rev 2469)
+++ evolution-sharp/trunk/debian/install	2006-04-23 16:40:43 UTC (rev 2470)
@@ -1,3 +1,4 @@
-usr/lib/mono/gac /usr/lib/mono
+usr/lib/mono/gac /usr/lib/cli/evolution-sharp-2.0
 usr/lib/pkgconfig/evolution-sharp.pc
-usr/lib/*.so /usr/lib
+usr/lib/*.so /usr/lib/cli/evolution-sharp-2.0
+usr/share/gapi-2.0 /usr/share

Added: evolution-sharp/trunk/debian/patches/00list
===================================================================
--- evolution-sharp/trunk/debian/patches/00list	2006-04-23 16:01:14 UTC (rev 2469)
+++ evolution-sharp/trunk/debian/patches/00list	2006-04-23 16:40:43 UTC (rev 2470)
@@ -0,0 +1,3 @@
+evolution-sharp.pc.dpatch
+fix-dllmappings.dpatch
+fix-glibsharpglue-dllimport.dpatch

Added: evolution-sharp/trunk/debian/patches/fix-dllmappings.dpatch
===================================================================
--- evolution-sharp/trunk/debian/patches/fix-dllmappings.dpatch	2006-04-23 16:01:14 UTC (rev 2469)
+++ evolution-sharp/trunk/debian/patches/fix-dllmappings.dpatch	2006-04-23 16:40:43 UTC (rev 2470)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-dllmappings.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad evolution-sharp-0.10.2~/evolution/evolution-sharp.dll.config.in evolution-sharp-0.10.2/evolution/evolution-sharp.dll.config.in
+--- evolution-sharp-0.10.2~/evolution/evolution-sharp.dll.config.in	2005-07-18 17:21:22.000000000 +0200
++++ evolution-sharp-0.10.2/evolution/evolution-sharp.dll.config.in	2006-04-23 18:27:04.000000000 +0200
+@@ -2,4 +2,5 @@
+   <dllmap dll="ebook" target="libebook at EDS_VERSION@@LIB_PREFIX at .@EBOOK_SOVERSION@@LIB_SUFFIX@"/>
+   <dllmap dll="ecal" target="libecal at EDS_VERSION@@LIB_PREFIX at .@ECAL_SOVERSION@@LIB_SUFFIX@"/>
+   <dllmap dll="edataserver" target="libedataserver at EDS_VERSION@@LIB_PREFIX at .@EDS_SOVERSION@@LIB_SUFFIX@"/>
++  <dllmap dll="evolutionglue" target="/usr/lib/cli/evolution-sharp-2.0/libevolutionglue.so"/>
+ </configuration>


Property changes on: evolution-sharp/trunk/debian/patches/fix-dllmappings.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: evolution-sharp/trunk/debian/patches/fix-glibsharpglue-dllimport.dpatch
===================================================================
--- evolution-sharp/trunk/debian/patches/fix-glibsharpglue-dllimport.dpatch	2006-04-23 16:01:14 UTC (rev 2469)
+++ evolution-sharp/trunk/debian/patches/fix-glibsharpglue-dllimport.dpatch	2006-04-23 16:40:43 UTC (rev 2470)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-glibsharpglue-dllimport.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad evolution-sharp-0.10.2~/evolution/src/GLibUtil.cs evolution-sharp-0.10.2/evolution/src/GLibUtil.cs
+--- evolution-sharp-0.10.2~/evolution/src/GLibUtil.cs	2005-09-12 22:49:54.000000000 +0200
++++ evolution-sharp-0.10.2/evolution/src/GLibUtil.cs	2006-04-23 18:26:01.000000000 +0200
+@@ -13,10 +13,10 @@
+ 		[DllImport("libglib-2.0.so.0")]
+ 		public static extern int g_slist_length (IntPtr slist);
+ 		
+-                [DllImport("glibsharpglue")]
++                [DllImport("glibsharpglue-2")]
+                 public static extern IntPtr gtksharp_slist_get_data (IntPtr slist);
+ 
+-		[DllImport("glibsharpglue")]
++		[DllImport("glibsharpglue-2")]
+ 		public static extern  IntPtr gtksharp_slist_get_next (IntPtr slist);
+  
+ 		[DllImport("libglib-2.0.so.0")]


Property changes on: evolution-sharp/trunk/debian/patches/fix-glibsharpglue-dllimport.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: evolution-sharp/trunk/debian/rules
===================================================================
--- evolution-sharp/trunk/debian/rules	2006-04-23 16:01:14 UTC (rev 2469)
+++ evolution-sharp/trunk/debian/rules	2006-04-23 16:40:43 UTC (rev 2470)
@@ -53,7 +53,7 @@
 	dh_fixperms
 	dh_makeclilibs -V
 	dh_installdeb
-	dh_shlibdeps
+	dh_shlibdeps -l$(CURDIR)/debian/libevolution-cil/$(EVO_LIB_PATH)
 	dh_clideps -d
 	dh_gencontrol
 	dh_md5sums


