[Pkg-mono-svn-commits] rev 2846 - in gtk-sharp2/trunk/debian: . patches

Sebastian Dröge slomo-guest at alioth.debian.org
Fri Nov 3 00:40:09 CET 2006 

Author: slomo-guest
Date: 2006-11-03 00:40:08 +0100 (Fri, 03 Nov 2006)
New Revision: 2846

Added:
   gtk-sharp2/trunk/debian/patches/02_missing_dllmaps.dpatch
Modified:
   gtk-sharp2/trunk/debian/changelog
   gtk-sharp2/trunk/debian/control
   gtk-sharp2/trunk/debian/patches/00list
   gtk-sharp2/trunk/debian/rules
Log:
* merge in gtk-sharp2 2.8.3-2


Modified: gtk-sharp2/trunk/debian/changelog
===================================================================
--- gtk-sharp2/trunk/debian/changelog	2006-11-02 17:18:26 UTC (rev 2845)
+++ gtk-sharp2/trunk/debian/changelog	2006-11-02 23:40:08 UTC (rev 2846)
@@ -3,7 +3,8 @@
   * Sebastian 'slomo' Dröge:
     + New upstream release
       - Gnome and GTK+ bindings split into separate source packages
-    + debian/patches/01_glue-locations.dpatch:
+    + debian/patches/01_glue-locations.dpatch,
+      debian/patches/02_missing_dllmaps.dpatch:
       - Updated
     + debian/watch:
       - Updated
@@ -15,8 +16,22 @@
       debian/gtk-sharp2-gapi.install:
       - Move gapi XML files to their corresponding library packages
 
- -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Wed, 23 Aug 2006 03:43:35 +0200
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Fri, 03 Nov 2006 00:39:30 +0100
 
+gtk-sharp2 (2.8.3-2) unstable; urgency=medium
+
+  * Mirco 'meebey' Bauer
+    + debian/patches/01_glue-locations.dpatch:
+      - Fixed tag closing, caused parse error for dh_clideps (FTBFS).
+        (Closes: #390116)
+    + debian/patches/02_missing_dllmaps.dpatch:
+      - Adds some missing entries in the DLL maps.
+    + debian/control:
+      - Bumped cli-common-dev build-dep to >= 0.4.6, handles paths now
+        correctly in DLL maps.
+ 
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sat,  30 Sep 2006 01:16:22 +0200
+
 gtk-sharp2 (2.8.3-1) unstable; urgency=low
 
   * Sebastian 'slomo' Dröge

Modified: gtk-sharp2/trunk/debian/control
===================================================================
--- gtk-sharp2/trunk/debian/control	2006-11-02 17:18:26 UTC (rev 2845)
+++ gtk-sharp2/trunk/debian/control	2006-11-02 23:40:08 UTC (rev 2846)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Dave Beckett <dajobe at debian.org>, Mirco Bauer <meebey at meebey.net>, Sebastian Dröge <slomo at ubuntu.com>
-Build-Depends: debhelper (>= 5), cli-common-dev (>= 0.4.0), dpatch, mono-mcs (>= 1.0) | c-sharp-compiler, mono-gac (>= 1.0), monodoc-base (>= 1.0), libmono-dev, pkg-config, libtool, libglib2.0-dev (>= 2.12.0), libgtk2.0-dev (>= 2.10.0), libpango1.0-dev, libglade2-dev (>= 2.3.6), mono-utils (>= 1.0-2), libmono-cairo1.0-cil
+Build-Depends: debhelper (>= 5), cli-common-dev (>= 0.4.6), dpatch, mono-mcs (>= 1.0) | c-sharp-compiler, mono-gac (>= 1.0), monodoc-base (>= 1.0), libmono-dev, pkg-config, libtool, libglib2.0-dev (>= 2.12.0), libgtk2.0-dev (>= 2.10.0), libpango1.0-dev, libglade2-dev (>= 2.3.6), mono-utils (>= 1.0-2), libmono-cairo1.0-cil
 Standards-Version: 3.7.2
 
 Package: gtk-sharp2

Modified: gtk-sharp2/trunk/debian/patches/00list
===================================================================
--- gtk-sharp2/trunk/debian/patches/00list	2006-11-02 17:18:26 UTC (rev 2845)
+++ gtk-sharp2/trunk/debian/patches/00list	2006-11-02 23:40:08 UTC (rev 2846)
@@ -1 +1,2 @@
 01_glue-locations.dpatch
+02_missing_dllmaps.dpatch

Added: gtk-sharp2/trunk/debian/patches/02_missing_dllmaps.dpatch
===================================================================
--- gtk-sharp2/trunk/debian/patches/02_missing_dllmaps.dpatch	2006-11-02 17:18:26 UTC (rev 2845)
+++ gtk-sharp2/trunk/debian/patches/02_missing_dllmaps.dpatch	2006-11-02 23:40:08 UTC (rev 2846)
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_missing_dllmaps.dpatch by Mirco Bauer <meebey at meebey.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gtk-sharp-2.8.3~/atk/atk-sharp.dll.config.in gtk-sharp-2.8.3/atk/atk-sharp.dll.config.in
+--- gtk-sharp-2.8.3~/atk/atk-sharp.dll.config.in	2004-10-29 22:33:07.000000000 +0200
++++ gtk-sharp-2.8.3/atk/atk-sharp.dll.config.in	2006-09-30 02:42:29.000000000 +0200
+@@ -1,4 +1,5 @@
+ <configuration>
+   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
+   <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
++  <dllmap dll="glibsharpglue-2" target="/usr/lib/mono/gtk-sharp-2.0/libglibsharpglue-2.so"/>
+ </configuration>
+diff -urNad gtk-sharp-2.8.3~/gdk/gdk-sharp.dll.config.in gtk-sharp-2.8.3/gdk/gdk-sharp.dll.config.in
+--- gtk-sharp-2.8.3~/gdk/gdk-sharp.dll.config.in	2006-09-30 02:39:53.000000000 +0200
++++ gtk-sharp-2.8.3/gdk/gdk-sharp.dll.config.in	2006-09-30 02:42:14.000000000 +0200
+@@ -4,4 +4,5 @@
+   <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
+   <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
+   <dllmap dll="gdksharpglue-2" target="/usr/lib/mono/gtk-sharp-2.0/libgdksharpglue-2.so"/>
++  <dllmap dll="glibsharpglue-2" target="/usr/lib/mono/gtk-sharp-2.0/libglibsharpglue-2.so"/>
+ </configuration>
+diff -urNad gtk-sharp-2.8.3~/gtk/gtk-sharp.dll.config.in gtk-sharp-2.8.3/gtk/gtk-sharp.dll.config.in
+--- gtk-sharp-2.8.3~/gtk/gtk-sharp.dll.config.in	2006-09-30 02:39:53.000000000 +0200
++++ gtk-sharp-2.8.3/gtk/gtk-sharp.dll.config.in	2006-09-30 02:41:55.000000000 +0200
+@@ -4,4 +4,5 @@
+   <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
+   <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
+   <dllmap dll="gtksharpglue-2" target="/usr/lib/mono/gtk-sharp-2.0/libgtksharpglue-2.so"/>
++  <dllmap dll="glibsharpglue-2" target="/usr/lib/mono/gtk-sharp-2.0/libglibsharpglue-2.so"/>
+ </configuration>
+diff -urNad gtk-sharp-2.8.3~/pango/pango-sharp.dll.config.in gtk-sharp-2.8.3/pango/pango-sharp.dll.config.in
+--- gtk-sharp-2.8.3~/pango/pango-sharp.dll.config.in	2006-09-30 02:39:53.000000000 +0200
++++ gtk-sharp-2.8.3/pango/pango-sharp.dll.config.in	2006-09-30 02:42:52.000000000 +0200
+@@ -3,4 +3,5 @@
+   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
+   <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
+   <dllmap dll="pangosharpglue-2" target="/usr/lib/mono/gtk-sharp-2.0/libpangosharpglue-2.so"/>
++  <dllmap dll="glibsharpglue-2" target="/usr/lib/mono/gtk-sharp-2.0/libglibsharpglue-2.so"/>
+ </configuration>


Property changes on: gtk-sharp2/trunk/debian/patches/02_missing_dllmaps.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: gtk-sharp2/trunk/debian/rules
===================================================================
--- gtk-sharp2/trunk/debian/rules	2006-11-02 17:18:26 UTC (rev 2845)
+++ gtk-sharp2/trunk/debian/rules	2006-11-02 23:40:08 UTC (rev 2846)
@@ -3,7 +3,6 @@
 #export DH_VERBOSE=1
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 export MONO_SHARED_DIR=$(CURDIR)
-export MONO_GAC_PREFIX=$(CURDIR)/debian/tmp/usr
 
 include /usr/share/dpatch/dpatch.make

More information about the Pkg-mono-svn-commits mailing list