[Pkg-cli-libs-commits] r3595 - in /packages/gtk-sharp2/trunk/debian: ./ patches/

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Fri Jan 25 16:33:46 UTC 2008


Author: slomo
Date: Fri Jan 25 16:33:46 2008
New Revision: 3595

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3595
Log:
* debian/patches/03_pkgconfig-locations.dpatch,
  debian/patches/01_glue-locations.dpatch,
  debian/patches/02_missing_dllmaps.dpatch,
  debian/rules,
  debian/libglade2.0-cil.install,
  debian/libglib2.0-cil.install,
  debian/libglade2.0-cil.installcligac,
  debian/libglib2.0-cil.installcligac,
  debian/libgtk2.0-cil.install,
  debian/libgtk2.0-cil.installcligac:
  Install assemblies in /usr/lib/cli according to the policy and use
  dh_installcligac to install them into the GACs.

Added:
    packages/gtk-sharp2/trunk/debian/libglade2.0-cil.installcligac
    packages/gtk-sharp2/trunk/debian/libglib2.0-cil.installcligac
    packages/gtk-sharp2/trunk/debian/libgtk2.0-cil.installcligac
    packages/gtk-sharp2/trunk/debian/patches/03_pkgconfig-locations.dpatch
Modified:
    packages/gtk-sharp2/trunk/debian/changelog
    packages/gtk-sharp2/trunk/debian/libglade2.0-cil.install
    packages/gtk-sharp2/trunk/debian/libglib2.0-cil.install
    packages/gtk-sharp2/trunk/debian/libgtk2.0-cil.install
    packages/gtk-sharp2/trunk/debian/patches/00list
    packages/gtk-sharp2/trunk/debian/patches/01_glue-locations.dpatch
    packages/gtk-sharp2/trunk/debian/patches/02_missing_dllmaps.dpatch
    packages/gtk-sharp2/trunk/debian/rules

Modified: packages/gtk-sharp2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/trunk/debian/changelog?rev=3595&op=diff
==============================================================================
--- packages/gtk-sharp2/trunk/debian/changelog (original)
+++ packages/gtk-sharp2/trunk/debian/changelog Fri Jan 25 16:33:46 2008
@@ -7,8 +7,20 @@
     + Update to apply cleanly again.
   * debian/rules:
     + Bump API version to 2.11.91.
-
- -- Sebastian Dröge <slomo at debian.org>  Fri, 25 Jan 2008 06:12:22 +0100
+  * debian/patches/03_pkgconfig-locations.dpatch,
+    debian/patches/01_glue-locations.dpatch,
+    debian/patches/02_missing_dllmaps.dpatch,
+    debian/rules,
+    debian/libglade2.0-cil.install,
+    debian/libglib2.0-cil.install,
+    debian/libglade2.0-cil.installcligac,
+    debian/libglib2.0-cil.installcligac,
+    debian/libgtk2.0-cil.install,
+    debian/libgtk2.0-cil.installcligac:
+    Install assemblies in /usr/lib/cli according to the policy and use
+    dh_installcligac to install them into the GACs.
+
+ -- Sebastian Dröge <slomo at debian.org>  Fri, 25 Jan 2008 17:32:25 +0100
 
 gtk-sharp2 (2.10.2-5) unstable; urgency=low
 

Modified: packages/gtk-sharp2/trunk/debian/libglade2.0-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/trunk/debian/libglade2.0-cil.install?rev=3595&op=diff
==============================================================================
--- packages/gtk-sharp2/trunk/debian/libglade2.0-cil.install (original)
+++ packages/gtk-sharp2/trunk/debian/libglade2.0-cil.install Fri Jan 25 16:33:46 2008
@@ -1,7 +1,5 @@
-debian/tmp/usr/lib/mono/gac/glade-sharp/
-debian/tmp/usr/lib/mono/gac/policy.2.*.glade-sharp/
+debian/tmp/usr/lib/mono/gac/glade-sharp/2.*/* /usr/lib/cli/gtk-sharp-2.0
+debian/tmp/usr/lib/mono/gac/policy.2.*.glade-sharp/0.*/*.dll /usr/lib/cli/gtk-sharp-2.0
 debian/tmp/usr/lib/pkgconfig/glade-sharp-2.0.pc
-debian/tmp/usr/lib/libgladesharpglue-2.so		/usr/lib/mono/gtk-sharp-2.0/
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/glade-sharp.dll
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/policy.2.*.glade-sharp.dll
+debian/tmp/usr/lib/libgladesharpglue-2.so		/usr/lib/cli/gtk-sharp-2.0/
 debian/tmp/usr/share/gapi-2.0/glade-api.xml

Added: packages/gtk-sharp2/trunk/debian/libglade2.0-cil.installcligac
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/trunk/debian/libglade2.0-cil.installcligac?rev=3595&op=file
==============================================================================
--- packages/gtk-sharp2/trunk/debian/libglade2.0-cil.installcligac (added)
+++ packages/gtk-sharp2/trunk/debian/libglade2.0-cil.installcligac Fri Jan 25 16:33:46 2008
@@ -1,0 +1,5 @@
+/usr/lib/cli/gtk-sharp-2.0/glade-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.4.glade-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.6.glade-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.8.glade-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.10.glade-sharp.dll

Modified: packages/gtk-sharp2/trunk/debian/libglib2.0-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/trunk/debian/libglib2.0-cil.install?rev=3595&op=diff
==============================================================================
--- packages/gtk-sharp2/trunk/debian/libglib2.0-cil.install (original)
+++ packages/gtk-sharp2/trunk/debian/libglib2.0-cil.install Fri Jan 25 16:33:46 2008
@@ -1,6 +1,5 @@
-debian/tmp/usr/lib/libglibsharpglue-2.so		/usr/lib/mono/gtk-sharp-2.0/
+debian/tmp/usr/lib/mono/gac/glib-sharp/2.*/* /usr/lib/cli/gtk-sharp-2.0
+debian/tmp/usr/lib/mono/gac/policy.2.*.glib-sharp/0.*/*.dll /usr/lib/cli/gtk-sharp-2.0
+debian/tmp/usr/lib/mono/gac/policy.2.*.glib-sharp/0.*/*.config /usr/lib/cli/gtk-sharp-2.0
 debian/tmp/usr/lib/pkgconfig/glib-sharp-2.0.pc
-debian/tmp/usr/lib/mono/gac/glib-sharp/
-debian/tmp/usr/lib/mono/gac/policy.2.*.glib-sharp/
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/glib-sharp.dll
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/policy.2.*.glib-sharp.dll
+debian/tmp/usr/lib/libglibsharpglue-2.so		/usr/lib/cli/gtk-sharp-2.0/

Added: packages/gtk-sharp2/trunk/debian/libglib2.0-cil.installcligac
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/trunk/debian/libglib2.0-cil.installcligac?rev=3595&op=file
==============================================================================
--- packages/gtk-sharp2/trunk/debian/libglib2.0-cil.installcligac (added)
+++ packages/gtk-sharp2/trunk/debian/libglib2.0-cil.installcligac Fri Jan 25 16:33:46 2008
@@ -1,0 +1,5 @@
+/usr/lib/cli/gtk-sharp-2.0/glib-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.4.glib-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.6.glib-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.8.glib-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.10.glib-sharp.dll

Modified: packages/gtk-sharp2/trunk/debian/libgtk2.0-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/trunk/debian/libgtk2.0-cil.install?rev=3595&op=diff
==============================================================================
--- packages/gtk-sharp2/trunk/debian/libgtk2.0-cil.install (original)
+++ packages/gtk-sharp2/trunk/debian/libgtk2.0-cil.install Fri Jan 25 16:33:46 2008
@@ -1,28 +1,21 @@
 debian/tmp/usr/lib/libgtksharpglue-2.so 	/usr/lib/mono/gtk-sharp-2.0/
 debian/tmp/usr/lib/libgdksharpglue-2.so		/usr/lib/mono/gtk-sharp-2.0/
 debian/tmp/usr/lib/libpangosharpglue-2.so	/usr/lib/mono/gtk-sharp-2.0/
+debian/tmp/usr/lib/mono/gac/gtk-sharp/2.*/* /usr/lib/cli/gtk-sharp-2.0/ 
+debian/tmp/usr/lib/mono/gac/policy.2.*.gtk-sharp/0.*/*.dll /usr/lib/cli/gtk-sharp-2.0/
+debian/tmp/usr/lib/mono/gac/gdk-sharp/2.*/* /usr/lib/cli/gtk-sharp-2.0/
+debian/tmp/usr/lib/mono/gac/policy.2.*.gdk-sharp/0.*/*.dll /usr/lib/cli/gtk-sharp-2.0/
+debian/tmp/usr/lib/mono/gac/atk-sharp/2.*/* /usr/lib/cli/gtk-sharp-2.0/
+debian/tmp/usr/lib/mono/gac/policy.2.*.atk-sharp/0.*/*.dll /usr/lib/cli/gtk-sharp-2.0/
+debian/tmp/usr/lib/mono/gac/pango-sharp/2.*/* /usr/lib/cli/gtk-sharp-2.0/
+debian/tmp/usr/lib/mono/gac/policy.2.*.pango-sharp/0.*/*.dll /usr/lib/cli/gtk-sharp-2.0/
+debian/tmp/usr/lib/mono/gac/gtk-dotnet/2.*/* /usr/lib/cli/gtk-sharp-2.0/
+debian/tmp/usr/lib/mono/gac/policy.2.*.gtk-dotnet/0.*/*.dll /usr/lib/cli/gtk-sharp-2.0/
+debian/tmp/usr/lib/libgtksharpglue-2.so 	/usr/lib/cli/gtk-sharp-2.0/
+debian/tmp/usr/lib/libgdksharpglue-2.so		/usr/lib/cli/gtk-sharp-2.0/
+debian/tmp/usr/lib/libpangosharpglue-2.so	/usr/lib/cli/gtk-sharp-2.0/
 debian/tmp/usr/lib/pkgconfig/gtk-sharp-2.0.pc
 debian/tmp/usr/lib/pkgconfig/gtk-dotnet-2.0.pc
-debian/tmp/usr/lib/mono/gac/gtk-sharp/
-debian/tmp/usr/lib/mono/gac/policy.2.*.gtk-sharp/
-debian/tmp/usr/lib/mono/gac/gdk-sharp/
-debian/tmp/usr/lib/mono/gac/policy.2.*.gdk-sharp/
-debian/tmp/usr/lib/mono/gac/atk-sharp/
-debian/tmp/usr/lib/mono/gac/policy.2.*.atk-sharp/
-debian/tmp/usr/lib/mono/gac/pango-sharp/
-debian/tmp/usr/lib/mono/gac/policy.2.*.pango-sharp/
-debian/tmp/usr/lib/mono/gac/gtk-dotnet/
-debian/tmp/usr/lib/mono/gac/policy.2.*.gtk-dotnet/
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/gtk-sharp.dll
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/policy.2.*.gtk-sharp.dll
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/gdk-sharp.dll
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/policy.2.*.gdk-sharp.dll
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/atk-sharp.dll
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/policy.2.*.atk-sharp.dll
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/pango-sharp.dll
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/policy.2.*.pango-sharp.dll
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/gtk-dotnet.dll
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/policy.2.*.gtk-dotnet.dll
 debian/tmp/usr/share/gapi-2.0/pango-api.xml
 debian/tmp/usr/share/gapi-2.0/atk-api.xml
 debian/tmp/usr/share/gapi-2.0/gdk-api.xml

Added: packages/gtk-sharp2/trunk/debian/libgtk2.0-cil.installcligac
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/trunk/debian/libgtk2.0-cil.installcligac?rev=3595&op=file
==============================================================================
--- packages/gtk-sharp2/trunk/debian/libgtk2.0-cil.installcligac (added)
+++ packages/gtk-sharp2/trunk/debian/libgtk2.0-cil.installcligac Fri Jan 25 16:33:46 2008
@@ -1,0 +1,25 @@
+/usr/lib/cli/gtk-sharp-2.0/gtk-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.4.gtk-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.6.gtk-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.8.gtk-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.10.gtk-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/gdk-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.4.gdk-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.6.gdk-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.8.gdk-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.10.gdk-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/atk-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.4.atk-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.6.atk-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.8.atk-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.10.atk-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/pango-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.4.pango-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.6.pango-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.8.pango-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.10.pango-sharp.dll
+/usr/lib/cli/gtk-sharp-2.0/gtk-dotnet.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.4.gtk-dotnet.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.6.gtk-dotnet.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.8.gtk-dotnet.dll
+/usr/lib/cli/gtk-sharp-2.0/policy.2.10.gtk-dotnet.dll

Modified: packages/gtk-sharp2/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/trunk/debian/patches/00list?rev=3595&op=diff
==============================================================================
--- packages/gtk-sharp2/trunk/debian/patches/00list (original)
+++ packages/gtk-sharp2/trunk/debian/patches/00list Fri Jan 25 16:33:46 2008
@@ -1,3 +1,4 @@
 01_glue-locations
 02_missing_dllmaps
+03_pkgconfig-locations.dpatch
 99_ltmain_as-needed.dpatch

Modified: packages/gtk-sharp2/trunk/debian/patches/01_glue-locations.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/trunk/debian/patches/01_glue-locations.dpatch?rev=3595&op=diff
==============================================================================
--- packages/gtk-sharp2/trunk/debian/patches/01_glue-locations.dpatch (original)
+++ packages/gtk-sharp2/trunk/debian/patches/01_glue-locations.dpatch Fri Jan 25 16:33:46 2008
@@ -8,14 +8,14 @@
    <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
    <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="gdksharpglue-2" target="/usr/lib/cli/gtk-sharp-2.0/libgdksharpglue-2.so"/>
  </configuration>
 --- gtk-sharp-2.3.92/glade/glade-sharp.dll.config.in.old	2005-10-17 21:40:32.432675848 +0200
 +++ gtk-sharp-2.3.92/glade/glade-sharp.dll.config.in	2005-10-17 21:41:51.190702808 +0200
 @@ -1,3 +1,4 @@
  <configuration>
    <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
-+  <dllmap dll="gladesharpglue-2" target="/usr/lib/mono/gtk-sharp-2.0/libgladesharpglue-2.so"/>
++  <dllmap dll="gladesharpglue-2" target="/usr/lib/cli/gtk-sharp-2.0/libgladesharpglue-2.so"/>
  </configuration>
 --- gtk-sharp-2.3.92/glib/glib-sharp.dll.config.in.old	2005-10-17 21:42:41.564044896 +0200
 +++ gtk-sharp-2.3.92/glib/glib-sharp.dll.config.in	2005-10-17 21:43:56.393669064 +0200
@@ -23,7 +23,7 @@
    <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
    <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
    <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
-+  <dllmap dll="glibsharpglue-2" target="/usr/lib/mono/gtk-sharp-2.0/libglibsharpglue-2.so"/>
++  <dllmap dll="glibsharpglue-2" target="/usr/lib/cli/gtk-sharp-2.0/libglibsharpglue-2.so"/>
  </configuration>
 --- gtk-sharp-2.3.92/gtk/gtk-sharp.dll.config.in.old	2005-10-17 21:44:47.114958256 +0200
 +++ gtk-sharp-2.3.92/gtk/gtk-sharp.dll.config.in	2005-10-17 21:45:16.437500552 +0200
@@ -31,7 +31,7 @@
    <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="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="gtksharpglue-2" target="/usr/lib/cli/gtk-sharp-2.0/libgtksharpglue-2.so"/>
  </configuration>
 --- gtk-sharp-2.3.92/pango/pango-sharp.dll.config.in.old	2005-10-17 21:45:26.067036640 +0200
 +++ gtk-sharp-2.3.92/pango/pango-sharp.dll.config.in	2005-10-17 21:45:55.838510688 +0200
@@ -39,5 +39,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="libpangocairo-1.0-0.dll" target="libpangocairo-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="pangosharpglue-2" target="/usr/lib/cli/gtk-sharp-2.0/libpangosharpglue-2.so"/>
  </configuration>

Modified: packages/gtk-sharp2/trunk/debian/patches/02_missing_dllmaps.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/trunk/debian/patches/02_missing_dllmaps.dpatch?rev=3595&op=diff
==============================================================================
--- packages/gtk-sharp2/trunk/debian/patches/02_missing_dllmaps.dpatch (original)
+++ packages/gtk-sharp2/trunk/debian/patches/02_missing_dllmaps.dpatch Fri Jan 25 16:33:46 2008
@@ -12,7 +12,7 @@
  <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"/>
++  <dllmap dll="glibsharpglue-2" target="/usr/lib/cli/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
@@ -20,8 +20,8 @@
 @@ -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"/>
+   <dllmap dll="gdksharpglue-2" target="/usr/lib/cli/gtk-sharp-2.0/libgdksharpglue-2.so"/>
++  <dllmap dll="glibsharpglue-2" target="/usr/lib/cli/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
@@ -29,8 +29,8 @@
 @@ -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"/>
+   <dllmap dll="gtksharpglue-2" target="/usr/lib/cli/gtk-sharp-2.0/libgtksharpglue-2.so"/>
++  <dllmap dll="glibsharpglue-2" target="/usr/lib/cli/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
@@ -38,6 +38,6 @@
 @@ -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"/>
+   <dllmap dll="pangosharpglue-2" target="/usr/lib/cli/gtk-sharp-2.0/libpangosharpglue-2.so"/>
++  <dllmap dll="glibsharpglue-2" target="/usr/lib/cli/gtk-sharp-2.0/libglibsharpglue-2.so"/>
  </configuration>

Added: packages/gtk-sharp2/trunk/debian/patches/03_pkgconfig-locations.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/trunk/debian/patches/03_pkgconfig-locations.dpatch?rev=3595&op=file
==============================================================================
--- packages/gtk-sharp2/trunk/debian/patches/03_pkgconfig-locations.dpatch (added)
+++ packages/gtk-sharp2/trunk/debian/patches/03_pkgconfig-locations.dpatch Fri Jan 25 16:33:46 2008
@@ -1,0 +1,38 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- gtk-sharp2/glib/glib-sharp-2.0.pc.in.old	2008-01-25 06:57:20.000000000 +0100
++++ gtk-sharp2/glib/glib-sharp-2.0.pc.in	2008-01-25 06:57:55.000000000 +0100
+@@ -8,5 +8,5 @@
+ Description: GLib# - .NET Binding for the glib library.
+ Version: @VERSION@
+ Cflags: -I:${gapidir}/glib-api.xml
+-Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/glib-sharp.dll
++Libs: -r:${libdir}/cli/gtk-sharp-2.0/glib-sharp.dll
+ 
+--- gtk-sharp2/glade/glade-sharp-2.0.pc.in.old	2008-01-25 06:58:01.000000000 +0100
++++ gtk-sharp2/glade/glade-sharp-2.0.pc.in	2008-01-25 06:58:13.000000000 +0100
+@@ -9,4 +9,4 @@
+ Version: @VERSION@
+ Requires: gtk-sharp-2.0
+ Cflags: -I:${gapidir}/glade-api.xml
+-Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/glade-sharp.dll
++Libs: -r:${libdir}/cli/gtk-sharp-2.0/glade-sharp.dll
+--- gtk-sharp2/gtk/gtk-sharp-2.0.pc.in.old	2008-01-25 06:58:25.000000000 +0100
++++ gtk-sharp2/gtk/gtk-sharp-2.0.pc.in	2008-01-25 06:58:52.000000000 +0100
+@@ -8,5 +8,5 @@
+ Description: Gtk# - GNOME .NET Binding
+ Version: @VERSION@
+ Cflags: -I:${gapidir}/pango-api.xml -I:${gapidir}/atk-api.xml -I:${gapidir}/gdk-api.xml -I:${gapidir}/gtk-api.xml
+-Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/pango-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/atk-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/gdk-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/gtk-sharp.dll
++Libs: -r:${libdir}/cli/gtk-sharp-2.0/pango-sharp.dll -r:${libdir}/cli/gtk-sharp-2.0/atk-sharp.dll -r:${libdir}/cli/gtk-sharp-2.0/gdk-sharp.dll -r:${libdir}/cli/gtk-sharp-2.0/gtk-sharp.dll
+ Requires: glib-sharp-2.0
+--- gtk-sharp2/gtkdotnet/gtk-dotnet-2.0.pc.in.old	2008-01-25 06:59:09.000000000 +0100
++++ gtk-sharp2/gtkdotnet/gtk-dotnet-2.0.pc.in	2008-01-25 06:59:18.000000000 +0100
+@@ -7,4 +7,4 @@
+ Description: .NET Extensions for Gtk
+ Version: @VERSION@
+ Requires:gtk-sharp-2.0
+-Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gtk-dotnet.dll
++Libs: -r:${libdir}/cli/gtk-sharp-2.0/gtk-dotnet.dll

Modified: packages/gtk-sharp2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/trunk/debian/rules?rev=3595&op=diff
==============================================================================
--- packages/gtk-sharp2/trunk/debian/rules (original)
+++ packages/gtk-sharp2/trunk/debian/rules Fri Jan 25 16:33:46 2008
@@ -59,6 +59,7 @@
 	dh_installchangelogs -i ChangeLog
 	dh_installdocs -i
 	dh_installman -i
+	dh_installcligac -i
 	dh_compress -i
 	dh_fixperms -i
 	dh_clifixperms -i
@@ -79,6 +80,7 @@
 	dh_installchangelogs -a ChangeLog
 	dh_installdocs -a
 	dh_installman -a
+	dh_installcligac -a
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a




More information about the Pkg-cli-libs-commits mailing list