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

meebey at users.alioth.debian.org meebey at users.alioth.debian.org
Sat Mar 21 18:08:44 UTC 2009


Author: meebey
Date: Sat Mar 21 18:08:44 2009
New Revision: 4146

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=4146
Log:
  * Use late-GAC install now for all libraries as per Debian CLI Policy and
    with that the new locations (/usr/lib/cli instead of /usr/lib/mono).
    This allows us to install multiple versions of a library at the same
    time when an ABI bump was done, which happened with libgnome2.0-cil ->
    libgnome2.24-cil. This also makes a very smooth transition possible.
  * debian/control:
    + Use multiple lines for build-deps.
    + Removed conflicts libgnome2.0-cil from libgnome2.24-cil as they have
      different assembly versions and are parallel installable now.
    + Bumped Standards-Version to 3.8.1 (no changes needed)
    + Bumped debhelper build-dep to >= 7.
  * debian/MAINTAINERS:
    + Removed (thats what control is for)
  * debian/compat:
    + Bumped to 7
  * debian/patches/00list:
    + Disabled 99_ltmain_as-needed as it has no influence to the binary deps.


Added:
    packages/gnome-sharp2/trunk/debian/libart2.0-cil.installcligac
    packages/gnome-sharp2/trunk/debian/libgconf2.0-cil.installcligac
    packages/gnome-sharp2/trunk/debian/libgnome-vfs2.0-cil.installcligac
    packages/gnome-sharp2/trunk/debian/libgnome2.24-cil.installcligac
    packages/gnome-sharp2/trunk/debian/libgnome2.24-cil.links
    packages/gnome-sharp2/trunk/debian/patches/02_fix_pkg-config_paths.dpatch   (with props)
    packages/gnome-sharp2/trunk/debian/patches/03_fix_gac_policy_filenames.dpatch   (with props)
Removed:
    packages/gnome-sharp2/trunk/debian/MAINTAINERS
Modified:
    packages/gnome-sharp2/trunk/debian/changelog
    packages/gnome-sharp2/trunk/debian/compat
    packages/gnome-sharp2/trunk/debian/control
    packages/gnome-sharp2/trunk/debian/libart2.0-cil.install
    packages/gnome-sharp2/trunk/debian/libgconf2.0-cil.install
    packages/gnome-sharp2/trunk/debian/libgnome-vfs2.0-cil.install
    packages/gnome-sharp2/trunk/debian/libgnome2.24-cil.install
    packages/gnome-sharp2/trunk/debian/patches/00list
    packages/gnome-sharp2/trunk/debian/patches/01_dllmaps.dpatch
    packages/gnome-sharp2/trunk/debian/rules

Modified: packages/gnome-sharp2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/changelog?rev=4146&op=diff
==============================================================================
--- packages/gnome-sharp2/trunk/debian/changelog (original)
+++ packages/gnome-sharp2/trunk/debian/changelog Sat Mar 21 18:08:44 2009
@@ -1,3 +1,25 @@
+gnome-sharp2 (2.24.1-2) unstable; urgency=low
+
+  * Use late-GAC install now for all libraries as per Debian CLI Policy and
+    with that the new locations (/usr/lib/cli instead of /usr/lib/mono).
+    This allows us to install multiple versions of a library at the same
+    time when an ABI bump was done, which happened with libgnome2.0-cil ->
+    libgnome2.24-cil. This also makes a very smooth transition possible.
+  * debian/control:
+    + Use multiple lines for build-deps.
+    + Removed conflicts libgnome2.0-cil from libgnome2.24-cil as they have
+      different assembly versions and are parallel installable now.
+    + Bumped Standards-Version to 3.8.1 (no changes needed)
+    + Bumped debhelper build-dep to >= 7.
+  * debian/MAINTAINERS:
+    + Removed (thats what control is for)
+  * debian/compat:
+    + Bumped to 7
+  * debian/patches/00list:
+    + Disabled 99_ltmain_as-needed as it has no influence to the binary deps.
+
+ -- Mirco Bauer <meebey at debian.org>  Sat, 21 Mar 2009 15:08:16 +0100
+
 gnome-sharp2 (2.24.1-1) experimental; urgency=low
 
   * New upstream release:

Modified: packages/gnome-sharp2/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/compat?rev=4146&op=diff
==============================================================================
--- packages/gnome-sharp2/trunk/debian/compat (original)
+++ packages/gnome-sharp2/trunk/debian/compat Sat Mar 21 18:08:44 2009
@@ -1,1 +1,1 @@
-5
+7

Modified: packages/gnome-sharp2/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/control?rev=4146&op=diff
==============================================================================
--- packages/gnome-sharp2/trunk/debian/control (original)
+++ packages/gnome-sharp2/trunk/debian/control Sat Mar 21 18:08:44 2009
@@ -3,8 +3,27 @@
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 5), cli-common-dev (>= 0.4.6), dpatch, mono-devel (>= 2.0.1), libmono-dev (>= 1.0), pkg-config, libgtk2.0-dev (>= 2.13.0), libglib2.0-dev (>= 2.12.0), libgtk2.0-cil (>= 2.12.2), libglade2.0-cil (>= 2.12.2), gtk-sharp2-gapi (>= 2.12.6), libgnomevfs2-dev (>= 1:2.22.0), libgnomeui-dev (>= 2.23.0), libgnomecanvas2-dev (>= 2.20.0), libart-2.0-dev (>= 2.3.20), libmono0 (>= 1.0), libmono-cairo1.0-cil
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7),
+ cli-common-dev (>= 0.4.6),
+ dpatch,
+ libtool,
+ autoconf,
+ automake,
+ mono-devel (>= 2.0.1),
+ libmono-dev (>= 1.0),
+ pkg-config,
+ libgtk2.0-dev (>= 2.13.0),
+ libglib2.0-dev (>= 2.12.0),
+ libgtk2.0-cil (>= 2.12.2),
+ libglade2.0-cil (>= 2.12.2),
+ gtk-sharp2-gapi (>= 2.12.6),
+ libgnomevfs2-dev (>= 1:2.22.0),
+ libgnomeui-dev (>= 2.23.0),
+ libgnomecanvas2-dev (>= 2.20.0),
+ libart-2.0-dev (>= 2.3.20),
+ libmono0 (>= 1.0),
+ libmono-cairo1.0-cil
+Standards-Version: 3.8.1
 Homepage: http://www.mono-project.com/GtkSharp
 Vcs-Svn: svn://svn.debian.org/pkg-cli-libs/packages/gnome-sharp2/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/
@@ -60,7 +79,6 @@
 Architecture: any
 Suggests: monodoc-gtk2.0-manual
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
-Conflicts: libgnome2.0-cil
 Replaces: gtk-sharp2-gapi (<< 2.10.0-1), libgconf2.0-cil (<< 2.16.1), libgnome2.0-cil
 Description: CLI binding for GNOME 2.24
  This package provides the gnome-sharp assembly that allows CLI (.NET) programs

Modified: packages/gnome-sharp2/trunk/debian/libart2.0-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/libart2.0-cil.install?rev=4146&op=diff
==============================================================================
--- packages/gnome-sharp2/trunk/debian/libart2.0-cil.install (original)
+++ packages/gnome-sharp2/trunk/debian/libart2.0-cil.install Sat Mar 21 18:08:44 2009
@@ -1,6 +1,4 @@
-debian/tmp/usr/lib/mono/gac/art-sharp/
-debian/tmp/usr/lib/mono/gac/policy.2.*.art-sharp/
-debian/tmp/usr/lib/pkgconfig/art-sharp-2.0.pc
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/art-sharp.dll
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/policy.2.*.art-sharp.dll
-debian/tmp/usr/share/gapi-2.0/art-api.xml
+usr/lib/mono/gac/art-sharp/*/*			/usr/lib/cli/gnome-sharp-2.0/
+usr/lib/mono/gac/policy.*.art-sharp/*/*		/usr/lib/cli/gnome-sharp-2.0/
+usr/lib/pkgconfig/art-sharp-2.0.pc
+usr/share/gapi-2.0/art-api.xml

Added: packages/gnome-sharp2/trunk/debian/libart2.0-cil.installcligac
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/libart2.0-cil.installcligac?rev=4146&op=file
==============================================================================
--- packages/gnome-sharp2/trunk/debian/libart2.0-cil.installcligac (added)
+++ packages/gnome-sharp2/trunk/debian/libart2.0-cil.installcligac Sat Mar 21 18:08:44 2009
@@ -1,0 +1,6 @@
+/usr/lib/cli/gnome-sharp-2.0/art-sharp.dll
+/usr/lib/cli/gnome-sharp-2.0/policy.2.6.art-sharp.dll
+/usr/lib/cli/gnome-sharp-2.0/policy.2.4.art-sharp.dll
+/usr/lib/cli/gnome-sharp-2.0/policy.2.8.art-sharp.dll
+/usr/lib/cli/gnome-sharp-2.0/policy.2.16.art-sharp.dll
+/usr/lib/cli/gnome-sharp-2.0/policy.2.20.art-sharp.dll

Modified: packages/gnome-sharp2/trunk/debian/libgconf2.0-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/libgconf2.0-cil.install?rev=4146&op=diff
==============================================================================
--- packages/gnome-sharp2/trunk/debian/libgconf2.0-cil.install (original)
+++ packages/gnome-sharp2/trunk/debian/libgconf2.0-cil.install Sat Mar 21 18:08:44 2009
@@ -1,7 +1,5 @@
-debian/tmp/usr/bin/gconfsharp2-schemagen
-debian/tmp/usr/lib/mono/gac/gconf-sharp/
-debian/tmp/usr/lib/mono/gac/policy.2.*.gconf-sharp/
-debian/tmp/usr/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe
-debian/tmp/usr/lib/pkgconfig/gconf-sharp-2.0.pc
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/gconf-sharp.dll
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/policy.2.*.gconf-sharp.dll
+usr/bin/gconfsharp2-schemagen
+usr/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe
+usr/lib/mono/gac/gconf-sharp/*/*		/usr/lib/cli/gnome-sharp-2.0/
+usr/lib/mono/gac/policy.*.gconf-sharp/*/*	/usr/lib/cli/gnome-sharp-2.0/
+usr/lib/pkgconfig/gconf-sharp-2.0.pc

Added: packages/gnome-sharp2/trunk/debian/libgconf2.0-cil.installcligac
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/libgconf2.0-cil.installcligac?rev=4146&op=file
==============================================================================
--- packages/gnome-sharp2/trunk/debian/libgconf2.0-cil.installcligac (added)
+++ packages/gnome-sharp2/trunk/debian/libgconf2.0-cil.installcligac Sat Mar 21 18:08:44 2009
@@ -1,0 +1,6 @@
+/usr/lib/cli/gnome-sharp-2.0/gconf-sharp.dll
+/usr/lib/cli/gnome-sharp-2.0/policy.2.6.gconf-sharp.dll
+/usr/lib/cli/gnome-sharp-2.0/policy.2.8.gconf-sharp.dll
+/usr/lib/cli/gnome-sharp-2.0/policy.2.4.gconf-sharp.dll
+/usr/lib/cli/gnome-sharp-2.0/policy.2.16.gconf-sharp.dll
+/usr/lib/cli/gnome-sharp-2.0/policy.2.20.gconf-sharp.dll

Modified: packages/gnome-sharp2/trunk/debian/libgnome-vfs2.0-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/libgnome-vfs2.0-cil.install?rev=4146&op=diff
==============================================================================
--- packages/gnome-sharp2/trunk/debian/libgnome-vfs2.0-cil.install (original)
+++ packages/gnome-sharp2/trunk/debian/libgnome-vfs2.0-cil.install Sat Mar 21 18:08:44 2009
@@ -1,6 +1,4 @@
-debian/tmp/usr/lib/mono/gac/gnome-vfs-sharp/
-debian/tmp/usr/lib/mono/gac/policy.2.*.gnome-vfs-sharp/
-debian/tmp/usr/lib/pkgconfig/gnome-vfs-sharp-2.0.pc
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/gnome-vfs-sharp.dll
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/policy.2.*.gnome-vfs-sharp.dll
-debian/tmp/usr/share/gapi-2.0/gnome-vfs-api.xml
+usr/lib/mono/gac/gnome-vfs-sharp/*/*		/usr/lib/cli/gnome-sharp-2.0/
+usr/lib/mono/gac/policy.*.gnome-vfs-sharp/*/*	/usr/lib/cli/gnome-sharp-2.0/
+usr/lib/pkgconfig/gnome-vfs-sharp-2.0.pc
+usr/share/gapi-2.0/gnome-vfs-api.xml

Added: packages/gnome-sharp2/trunk/debian/libgnome-vfs2.0-cil.installcligac
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/libgnome-vfs2.0-cil.installcligac?rev=4146&op=file
==============================================================================
--- packages/gnome-sharp2/trunk/debian/libgnome-vfs2.0-cil.installcligac (added)
+++ packages/gnome-sharp2/trunk/debian/libgnome-vfs2.0-cil.installcligac Sat Mar 21 18:08:44 2009
@@ -1,0 +1,6 @@
+/usr/lib/cli/gnome-sharp-2.0/gnome-vfs-sharp.dll
+/usr/lib/cli/gnome-sharp-2.0/policy.2.4.gnome-vfs-sharp.dll
+/usr/lib/cli/gnome-sharp-2.0/policy.2.6.gnome-vfs-sharp.dll
+/usr/lib/cli/gnome-sharp-2.0/policy.2.8.gnome-vfs-sharp.dll
+/usr/lib/cli/gnome-sharp-2.0/policy.2.16.gnome-vfs-sharp.dll
+/usr/lib/cli/gnome-sharp-2.0/policy.2.20.gnome-vfs-sharp.dll

Modified: packages/gnome-sharp2/trunk/debian/libgnome2.24-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/libgnome2.24-cil.install?rev=4146&op=diff
==============================================================================
--- packages/gnome-sharp2/trunk/debian/libgnome2.24-cil.install (original)
+++ packages/gnome-sharp2/trunk/debian/libgnome2.24-cil.install Sat Mar 21 18:08:44 2009
@@ -1,8 +1,6 @@
-debian/tmp/usr/lib/mono/gac/gnome-sharp/
-debian/tmp/usr/lib/mono/gac/gconf-sharp-peditors/
-debian/tmp/usr/lib/libgnomesharpglue-2.so /usr/lib/mono/gtk-sharp-2.0
-debian/tmp/usr/lib/pkgconfig/gnome-sharp-2.0.pc
-debian/tmp/usr/lib/pkgconfig/gconf-sharp-peditors-2.0.pc
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/gnome-sharp.dll
-debian/tmp/usr/lib/mono/gtk-sharp-2.0/gconf-sharp-peditors.dll
-debian/tmp/usr/share/gapi-2.0/gnome-api.xml
+usr/lib/libgnomesharpglue-2.so			/usr/lib/cli/gnome-sharp-2.24/
+usr/lib/mono/gac/gnome-sharp/*/*		/usr/lib/cli/gnome-sharp-2.24/
+usr/lib/mono/gac/gconf-sharp-peditors/*/*	/usr/lib/cli/gnome-sharp-2.24/
+usr/lib/pkgconfig/gnome-sharp-2.24.pc
+usr/lib/pkgconfig/gconf-sharp-peditors-2.0.pc
+usr/share/gapi-2.0/gnome-api.xml

Added: packages/gnome-sharp2/trunk/debian/libgnome2.24-cil.installcligac
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/libgnome2.24-cil.installcligac?rev=4146&op=file
==============================================================================
--- packages/gnome-sharp2/trunk/debian/libgnome2.24-cil.installcligac (added)
+++ packages/gnome-sharp2/trunk/debian/libgnome2.24-cil.installcligac Sat Mar 21 18:08:44 2009
@@ -1,0 +1,2 @@
+/usr/lib/cli/gnome-sharp-2.24/gnome-sharp.dll
+/usr/lib/cli/gnome-sharp-2.24/gconf-sharp-peditors.dll

Added: packages/gnome-sharp2/trunk/debian/libgnome2.24-cil.links
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/libgnome2.24-cil.links?rev=4146&op=file
==============================================================================
--- packages/gnome-sharp2/trunk/debian/libgnome2.24-cil.links (added)
+++ packages/gnome-sharp2/trunk/debian/libgnome2.24-cil.links Sat Mar 21 18:08:44 2009
@@ -1,0 +1,1 @@
+usr/lib/pkgconfig/gnome-sharp-2.24.pc	usr/lib/pkgconfig/gnome-sharp-2.0.pc

Modified: packages/gnome-sharp2/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/patches/00list?rev=4146&op=diff
==============================================================================
--- packages/gnome-sharp2/trunk/debian/patches/00list (original)
+++ packages/gnome-sharp2/trunk/debian/patches/00list Sat Mar 21 18:08:44 2009
@@ -1,2 +1,3 @@
 01_dllmaps.dpatch
-99_ltmain_as-needed.dpatch
+02_fix_pkg-config_paths.dpatch
+03_fix_gac_policy_filenames.dpatch

Modified: packages/gnome-sharp2/trunk/debian/patches/01_dllmaps.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/patches/01_dllmaps.dpatch?rev=4146&op=diff
==============================================================================
--- packages/gnome-sharp2/trunk/debian/patches/01_dllmaps.dpatch (original)
+++ packages/gnome-sharp2/trunk/debian/patches/01_dllmaps.dpatch Sat Mar 21 18:08:44 2009
@@ -1,13 +1,12 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 
 @DPATCH@
-
-diff -Naur gnome-sharp2-2.24.0.old/gnome/gnome-sharp.dll.config.in gnome-sharp2-2.24.0/gnome/gnome-sharp.dll.config.in
---- gnome-sharp2-2.24.0.old/gnome/gnome-sharp.dll.config.in	2008-03-04 20:52:54.000000000 +0100
-+++ gnome-sharp2-2.24.0/gnome/gnome-sharp.dll.config.in	2008-03-06 09:04:07.000000000 +0100
+diff -urNad gnome-sharp-2.24.1~/gnome/gnome-sharp.dll.config.in gnome-sharp-2.24.1/gnome/gnome-sharp.dll.config.in
+--- gnome-sharp-2.24.1~/gnome/gnome-sharp.dll.config.in	2009-03-21 16:49:26.000000000 +0100
++++ gnome-sharp-2.24.1/gnome/gnome-sharp.dll.config.in	2009-03-21 16:50:14.000000000 +0100
 @@ -6,4 +6,5 @@
    <dllmap dll="gnome-2" target="libgnome-2 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
    <dllmap dll="gnomecanvas-2" target="libgnomecanvas-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/cli/gnome-sharp-2.24/libgnomesharpglue-2.so"/>
  </configuration>

Added: packages/gnome-sharp2/trunk/debian/patches/02_fix_pkg-config_paths.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/patches/02_fix_pkg-config_paths.dpatch?rev=4146&op=file
==============================================================================
--- packages/gnome-sharp2/trunk/debian/patches/02_fix_pkg-config_paths.dpatch (added)
+++ packages/gnome-sharp2/trunk/debian/patches/02_fix_pkg-config_paths.dpatch Sat Mar 21 18:08:44 2009
@@ -1,0 +1,96 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_fix_pkg-config_paths.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gnome-sharp-2.24.1~/art/art-sharp-2.0.pc.in gnome-sharp-2.24.1/art/art-sharp-2.0.pc.in
+--- gnome-sharp-2.24.1~/art/art-sharp-2.0.pc.in	2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/art/art-sharp-2.0.pc.in	2009-03-21 19:03:32.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ gapidir=${prefix}/share/gapi-2.0
+@@ -8,4 +8,4 @@
+ Description: Art# - libart .NET Binding
+ Version: @VERSION@
+ Cflags: -I:${gapidir}/art-api.xml
+-Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/art-sharp.dll
++Libs: -r:${libdir}/cli/gnome-sharp-2.0/art-sharp.dll
+diff -urNad gnome-sharp-2.24.1~/gconf/GConf/Makefile.am gnome-sharp-2.24.1/gconf/GConf/Makefile.am
+--- gnome-sharp-2.24.1~/gconf/GConf/Makefile.am	2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/gconf/GConf/Makefile.am	2009-03-21 19:02:55.000000000 +0100
+@@ -52,8 +52,8 @@
+ $(POLICY_ASSEMBLIES): $(top_builddir)/policy.config gtk-sharp.snk
+ 	@for i in $(POLICY_VERSIONS); do	\
+ 	  echo "Creating policy.$$i.$(ASSEMBLY)";	\
+-	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config;	\
+-	  $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:gtk-sharp.snk;	\
++	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.$(ASSEMBLY_NAME).config;	\
++	  $(AL) -link:policy.$$i.$(ASSEMBLY_NAME).config -out:policy.$$i.$(ASSEMBLY) -keyfile:gtk-sharp.snk;	\
+ 	done
+ 
+ install-data-local:
+diff -urNad gnome-sharp-2.24.1~/gconf/GConf/gconf-sharp-2.0.pc.in gnome-sharp-2.24.1/gconf/GConf/gconf-sharp-2.0.pc.in
+--- gnome-sharp-2.24.1~/gconf/GConf/gconf-sharp-2.0.pc.in	2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/gconf/GConf/gconf-sharp-2.0.pc.in	2009-03-21 19:03:26.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ 
+@@ -6,4 +6,4 @@
+ Name: GConf#
+ Description: GConf# - GConf .NET Binding
+ Version: @VERSION@
+-Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gconf-sharp.dll
++Libs: -r:${libdir}/cli/gnome-sharp-2.0/gconf-sharp.dll
+diff -urNad gnome-sharp-2.24.1~/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in gnome-sharp-2.24.1/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in
+--- gnome-sharp-2.24.1~/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in	2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in	2009-03-21 19:03:20.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ 
+@@ -7,4 +7,4 @@
+ Description: GConf# Property Editing classes - GConf .NET Binding
+ Version: @VERSION@
+ Requires: gnome-sharp-2.0 gconf-sharp-2.0
+-Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gconf-sharp-peditors.dll
++Libs: -r:${libdir}/cli/gnome-sharp-2.0/gconf-sharp-peditors.dll
+diff -urNad gnome-sharp-2.24.1~/gnome/gnome-sharp-2.0.pc.in gnome-sharp-2.24.1/gnome/gnome-sharp-2.0.pc.in
+--- gnome-sharp-2.24.1~/gnome/gnome-sharp-2.0.pc.in	2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/gnome/gnome-sharp-2.0.pc.in	2009-03-21 19:03:07.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ gapidir=${prefix}/share/gapi-2.0
+@@ -9,4 +9,4 @@
+ Version: @VERSION@
+ Requires: gtk-sharp-2.0 art-sharp-2.0 gnome-vfs-sharp-2.0
+ Cflags: -I:${gapidir}/gnome-api.xml
+-Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gnome-sharp.dll
++Libs: -r:${libdir}/cli/gnome-sharp-2.24/gnome-sharp.dll
+diff -urNad gnome-sharp-2.24.1~/gnomevfs/gnome-vfs-sharp-2.0.pc.in gnome-sharp-2.24.1/gnomevfs/gnome-vfs-sharp-2.0.pc.in
+--- gnome-sharp-2.24.1~/gnomevfs/gnome-vfs-sharp-2.0.pc.in	2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/gnomevfs/gnome-vfs-sharp-2.0.pc.in	2009-03-21 19:03:12.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ gapidir=${prefix}/share/gapi-2.0
+@@ -8,4 +8,4 @@
+ Description: GnomeVfs# - GNOME-VFS .NET Binding
+ Version: @VERSION@
+ Cflags: -I:${gapidir}/gnome-vfs-api.xml
+-Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gnome-vfs-sharp.dll
++Libs: -r:${libdir}/cli/gnome-sharp-2.0/gnome-vfs-sharp.dll

Propchange: packages/gnome-sharp2/trunk/debian/patches/02_fix_pkg-config_paths.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/gnome-sharp2/trunk/debian/patches/03_fix_gac_policy_filenames.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/patches/03_fix_gac_policy_filenames.dpatch?rev=4146&op=file
==============================================================================
--- packages/gnome-sharp2/trunk/debian/patches/03_fix_gac_policy_filenames.dpatch (added)
+++ packages/gnome-sharp2/trunk/debian/patches/03_fix_gac_policy_filenames.dpatch Sat Mar 21 18:08:44 2009
@@ -1,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_fix_gac_policy_filenames.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gnome-sharp-2.24.1~/Makefile.include gnome-sharp-2.24.1/Makefile.include
+--- gnome-sharp-2.24.1~/Makefile.include	2008-03-07 03:32:21.000000000 +0100
++++ gnome-sharp-2.24.1/Makefile.include	2009-03-21 17:15:05.000000000 +0100
+@@ -49,8 +49,8 @@
+ $(POLICY_ASSEMBLIES): $(top_builddir)/policy.config $(SNK)
+ 	@for i in $(POLICY_VERSIONS); do	\
+ 	  echo "Creating policy.$$i.$(ASSEMBLY)";	\
+-	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config;	\
+-	  $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:$(SNK);	\
++	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.$(ASSEMBLY_NAME).config;	\
++	  $(AL) -link:policy.$$i.$(ASSEMBLY_NAME).config -out:policy.$$i.$(ASSEMBLY) -keyfile:$(SNK);	\
+ 	done
+ 
+ build_sources = $(patsubst %, $(srcdir)/%, $(sources)) AssemblyInfo.cs

Propchange: packages/gnome-sharp2/trunk/debian/patches/03_fix_gac_policy_filenames.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/gnome-sharp2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/rules?rev=4146&op=diff
==============================================================================
--- packages/gnome-sharp2/trunk/debian/rules (original)
+++ packages/gnome-sharp2/trunk/debian/rules Sat Mar 21 18:08:44 2009
@@ -17,25 +17,33 @@
 config: config-stamp
 config-stamp: patch-stamp
 	dh_testdir
-	CSC=/usr/bin/csc CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --prefix=/usr RUNTIME=/usr/bin/cli
+
+	libtoolize --force --copy
+	aclocal
+	autoheader
+	automake --add-missing --foreign
+	autoconf
+
+	CSC=/usr/bin/csc CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --prefix=/usr
 	touch config-stamp
 
 build-indep: build-indep-stamp
 build-indep-stamp: config-stamp
 	dh_testdir
-	$(MAKE) RUNTIME=/usr/bin/cli
+	$(MAKE)
 	touch build-indep-stamp
 
 build-arch: build-arch-stamp
 build-arch-stamp: config-stamp
 	dh_testdir
-	$(MAKE) RUNTIME=/usr/bin/cli
+	$(MAKE)
 	touch build-arch-stamp
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	-$(MAKE) distclean RUNTIME=/usr/bin/cli
+	[ ! -f Makefile ] || $(MAKE) distclean
+	find . -name "Makefile.in" | xargs rm -rf
 	# gconf clean target is less than perfect
 	-cd gconf && find -name "*.exe" -or -name "*.dll" -delete
 	rm -f config-stamp build-indep-stamp build-arch-stamp
@@ -47,19 +55,18 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp RUNTIME=/usr/bin/cli
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 binary-indep: build-indep install
 	dh_testdir
 	dh_testroot
 	dh_installdirs -i
-	dh_movefiles -i
 	dh_link -i
-	# we must install arch dep and indep here! dh_clideps will get problems otherwise
-	dh_install
+	dh_install -i
 	install -m755 $(CURDIR)/debian/list-examples $(CURDIR)/debian/gnome-sharp2-examples/usr/bin/gnome-sharp2-examples-list
 	dh_installchangelogs -i ChangeLog
 	dh_installdocs -i
+	dh_installcligac -i
 	dh_compress -i
 	dh_fixperms -i
 	dh_clifixperms -i
@@ -73,12 +80,17 @@
 binary-arch: build-arch install
 	dh_testdir
 	dh_testroot
-	dh_movefiles -a
+
+	# fix pkg-config file name of gnome-sharp as 2.24 broke ABI
+	mv $(CURDIR)/debian/tmp/usr/lib/pkgconfig/gnome-sharp-2.0.pc \
+	   $(CURDIR)/debian/tmp/usr/lib/pkgconfig/gnome-sharp-2.24.pc
+
+	dh_installdirs -a
 	dh_link -a
-	# we must install arch dep and indep here! dh_clideps will get problems otherwise
-	dh_install
+	dh_install -a
 	dh_installchangelogs -a ChangeLog
 	dh_installdocs -a
+	dh_installcligac -a
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a




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