[Pkg-mono-svn-commits] rev 2847 - in gnome-sharp2/trunk/debian: .
patches
Sebastian Dröge
slomo-guest at alioth.debian.org
Fri Nov 3 00:42:54 CET 2006
Author: slomo-guest
Date: 2006-11-03 00:42:54 +0100 (Fri, 03 Nov 2006)
New Revision: 2847
Added:
gnome-sharp2/trunk/debian/patches/02_missing_dllmaps.dpatch
Modified:
gnome-sharp2/trunk/debian/changelog
gnome-sharp2/trunk/debian/control
gnome-sharp2/trunk/debian/patches/00list
gnome-sharp2/trunk/debian/patches/01_glue-locations.dpatch
gnome-sharp2/trunk/debian/rules
Log:
* merged with gtk-sharp2 2.8.3-2
Modified: gnome-sharp2/trunk/debian/changelog
===================================================================
--- gnome-sharp2/trunk/debian/changelog 2006-11-02 23:40:08 UTC (rev 2846)
+++ gnome-sharp2/trunk/debian/changelog 2006-11-02 23:42:54 UTC (rev 2847)
@@ -7,18 +7,32 @@
- Updated
+ debian/control:
- Updated Build-Depends
- + debian/patches/01_glue-locations.dpatch:
+ + debian/patches/01_glue-locations.dpatch,
+ debian/patches/02_missing_dllmaps.dpatch:
- Updated
+ debian/rules:
- - Bumped clilibs to >= 2.15
+ - Bumped clilibs to >= 2.16
+ debian/control,
debian/libgnome2.0-cil.install,
debian/libvte2.0-cil.install:
- Move gapi XML files to their corresponding library packages
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org> Fri, 03 Nov 2006 00:42:32 +0100
- -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org> Wed, 23 Aug 2006 03:47:22 +0200
+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: gnome-sharp2/trunk/debian/control
===================================================================
--- gnome-sharp2/trunk/debian/control 2006-11-02 23:40:08 UTC (rev 2846)
+++ gnome-sharp2/trunk/debian/control 2006-11-02 23:42:54 UTC (rev 2847)
@@ -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), libmono-dev (>= 1.0), pkg-config, libtool, libgtk2.0-dev (>= 2.10.0), libglib2.0-dev (>= 2.10.0), libgtk2.0-cil (>= 2.10.0), libglade2.0-cil (>= 2.10.0), gtk-sharp2-gapi, libgnomevfs2-dev (>= 2.15.0), librsvg2-dev (>= 2.0.1), libgtkhtml3.8-dev (>= 3.8.0), libgnomeui-dev (>= 2.15.0), libgnomecanvas2-dev (>= 2.14.0), libgnomeprint2.2-dev (>= 2.10.0) , libgnomeprintui2.2-dev (>= 2.10.0), libart-2.0-dev (>= 2.3.16), libvte-dev (>= 0.13.0), libpanel-applet2-dev (>= 2.14.0), libmono0 (>= 1.0), 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), libmono-dev (>= 1.0), pkg-config, libtool, libgtk2.0-dev (>= 2.10.0), libglib2.0-dev (>= 2.10.0), libgtk2.0-cil (>= 2.10.0), libglade2.0-cil (>= 2.10.0), gtk-sharp2-gapi, libgnomevfs2-dev (>= 2.15.0), librsvg2-dev (>= 2.0.1), libgtkhtml3.8-dev (>= 3.8.0), libgnomeui-dev (>= 2.15.0), libgnomecanvas2-dev (>= 2.14.0), libgnomeprint2.2-dev (>= 2.10.0) , libgnomeprintui2.2-dev (>= 2.10.0), libart-2.0-dev (>= 2.3.16), libvte-dev (>= 0.13.0), libpanel-applet2-dev (>= 2.14.0), libmono0 (>= 1.0), mono-utils (>= 1.0-2), libmono-cairo1.0-cil
Standards-Version: 3.7.2
Package: gnome-sharp2
Modified: gnome-sharp2/trunk/debian/patches/00list
===================================================================
--- gnome-sharp2/trunk/debian/patches/00list 2006-11-02 23:40:08 UTC (rev 2846)
+++ gnome-sharp2/trunk/debian/patches/00list 2006-11-02 23:42:54 UTC (rev 2847)
@@ -1 +1,2 @@
01_glue-locations.dpatch
+02_missing_dllmaps.dpatch
Modified: gnome-sharp2/trunk/debian/patches/01_glue-locations.dpatch
===================================================================
--- gnome-sharp2/trunk/debian/patches/01_glue-locations.dpatch 2006-11-02 23:40:08 UTC (rev 2846)
+++ gnome-sharp2/trunk/debian/patches/01_glue-locations.dpatch 2006-11-02 23:42:54 UTC (rev 2847)
@@ -8,7 +8,7 @@
<dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
<dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
<dllmap dll="gnomeui-2" target="libgnomeui-2 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
-+ <dllmap dll="gnomesharpglue-2" target="/usr/lib/mono/gtk-sharp-2.0/libgnomesharpglue-2.so"/
++ <dllmap dll="gnomesharpglue-2" target="/usr/lib/mono/gtk-sharp-2.0/libgnomesharpglue-2.so"/>
</configuration>
--- gtk-sharp-2.3.92/vte/vte-sharp.dll.config.in.old 2005-10-17 21:46:06.455896600 +0200
+++ gtk-sharp-2.3.92/vte/vte-sharp.dll.config.in 2005-10-17 21:46:33.221827560 +0200
Added: gnome-sharp2/trunk/debian/patches/02_missing_dllmaps.dpatch
===================================================================
--- gnome-sharp2/trunk/debian/patches/02_missing_dllmaps.dpatch 2006-11-02 23:40:08 UTC (rev 2846)
+++ gnome-sharp2/trunk/debian/patches/02_missing_dllmaps.dpatch 2006-11-02 23:42:54 UTC (rev 2847)
@@ -0,0 +1,18 @@
+#! /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~/gnome/gnome-sharp.dll.config.in gtk-sharp-2.8.3/gnome/gnome-sharp.dll.config.in
+--- gtk-sharp-2.8.3~/gnome/gnome-sharp.dll.config.in 2006-09-30 02:39:53.000000000 +0200
++++ gtk-sharp-2.8.3/gnome/gnome-sharp.dll.config.in 2006-09-30 02:44:35.000000000 +0200
+@@ -8,5 +8,7 @@
+ <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
+ <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
+ <dllmap dll="gnomeui-2" target="libgnomeui-2 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
++ <dllmap dll="panel-applet-2" target="libpanel-applet-2 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
+ <dllmap dll="gnomesharpglue-2" target="/usr/lib/mono/gtk-sharp-2.0/libgnomesharpglue-2.so"/>
++ <dllmap dll="glibsharpglue-2" target="/usr/lib/mono/gtk-sharp-2.0/libglibsharpglue-2.so"/>
+ </configuration>
Property changes on: gnome-sharp2/trunk/debian/patches/02_missing_dllmaps.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: gnome-sharp2/trunk/debian/rules
===================================================================
--- gnome-sharp2/trunk/debian/rules 2006-11-02 23:40:08 UTC (rev 2846)
+++ gnome-sharp2/trunk/debian/rules 2006-11-02 23:42:54 UTC (rev 2847)
@@ -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