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

Sebastian Dröge slomo-guest at costa.debian.org
Fri Mar 24 19:27:38 UTC 2006


Author: slomo-guest
Date: 2006-03-24 19:27:37 +0000 (Fri, 24 Mar 2006)
New Revision: 2360

Added:
   gtk-sharp/trunk/debian/patches/
   gtk-sharp/trunk/debian/patches/00list
   gtk-sharp/trunk/debian/patches/01_gtkhtml3.8.dpatch
   gtk-sharp/trunk/debian/patches/02_move-glue-libs.dpatch
Modified:
   gtk-sharp/trunk/debian/changelog
   gtk-sharp/trunk/debian/control
   gtk-sharp/trunk/debian/libglade-cil.install
   gtk-sharp/trunk/debian/libglib-cil.install
   gtk-sharp/trunk/debian/libgnome-cil.install
   gtk-sharp/trunk/debian/libgtk-cil.install
   gtk-sharp/trunk/debian/rules
Log:
* build gtk-sharp against gtkhtml3.8 and move it's glue libraries
  to /usr/lib/mono/gtk-sharp


Modified: gtk-sharp/trunk/debian/changelog
===================================================================
--- gtk-sharp/trunk/debian/changelog	2006-03-24 13:14:20 UTC (rev 2359)
+++ gtk-sharp/trunk/debian/changelog	2006-03-24 19:27:37 UTC (rev 2360)
@@ -1,3 +1,14 @@
+gtk-sharp (1:1.0.10-4) unstable; urgency=low
+
+  * Sebastian 'slomo' Dröge
+    + debian/patches/01_gtkhtml3.8.dpatch:
+      - build with gtkhtml3.8 as gtkhtml3.6 is buggy (see #358713) and
+        gtkhtml3.6 will disappear soon anyway
+    + debian/patches/02_move-glue-libs.dpatch:
+      - move glue libraries from /usr/lib to /usr/lib/mono/gtk-sharp
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Fri, 24 Mar 2006 19:52:43 +0100
+
 gtk-sharp (1:1.0.10-3) unstable; urgency=low
 
   * Mirco 'meebey' Bauer

Modified: gtk-sharp/trunk/debian/control
===================================================================
--- gtk-sharp/trunk/debian/control	2006-03-24 13:14:20 UTC (rev 2359)
+++ gtk-sharp/trunk/debian/control	2006-03-24 19:27:37 UTC (rev 2360)
@@ -2,8 +2,8 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
-Uploaders: Eduard Bloch <blade at debian.org>, Mirco Bauer <meebey at meebey.net>, Dave Beckett <dajobe at debian.org>
-Build-Depends: debhelper (>= 5.0.0), cli-common (>= 0.2.0),  mono-mcs (>= 1.0) | c-sharp-compiler, mono-gac, monodoc-base, libmono-dev, libtool, libglib2.0-dev (>= 2.2.0), libgtk2.0-dev, libpango1.0-dev, libatk1.0-dev, libfreetype6-dev, libxml2-dev, libgda2-dev (>= 1.2.1), libglade2-dev (>= 2.0.0), librsvg2-dev (>= 2.0.1), libgnomedb2-dev (>= 1.2.1), libgail-dev, libgtkhtml3.6-dev, libgnomeui-dev (>= 2.2.0), libgnomecanvas2-dev (>= 2.2.0), libgnomeprint2.2-dev, libgnomeprintui2.2-dev (>= 2.2.0), libart-2.0-dev (>= 2.2.0), libvte-dev (>= 0.11.10), libmono0 (>= 1.0), mono-utils (>= 1.0-2), dpatch
+Uploaders: Eduard Bloch <blade at debian.org>, Mirco Bauer <meebey at meebey.net>, Dave Beckett <dajobe at debian.org>, Sebastian Dröge <slomo at ubuntu.com>
+Build-Depends: debhelper (>= 5.0.0), cli-common (>= 0.2.0),  mono-mcs (>= 1.0) | c-sharp-compiler, mono-gac, monodoc-base, libmono-dev, libtool, libglib2.0-dev (>= 2.2.0), libgtk2.0-dev, libpango1.0-dev, libatk1.0-dev, libfreetype6-dev, libxml2-dev, libgda2-dev (>= 1.2.1), libglade2-dev (>= 2.0.0), librsvg2-dev (>= 2.0.1), libgnomedb2-dev (>= 1.2.1), libgail-dev, libgtkhtml3.8-dev, libgnomeui-dev (>= 2.2.0), libgnomecanvas2-dev (>= 2.2.0), libgnomeprint2.2-dev, libgnomeprintui2.2-dev (>= 2.2.0), libart-2.0-dev (>= 2.2.0), libvte-dev (>= 0.11.10), libmono0 (>= 1.0), mono-utils (>= 1.0-2), dpatch
 Standards-Version: 3.6.2
 
 Package: gtk-sharp

Modified: gtk-sharp/trunk/debian/libglade-cil.install
===================================================================
--- gtk-sharp/trunk/debian/libglade-cil.install	2006-03-24 13:14:20 UTC (rev 2359)
+++ gtk-sharp/trunk/debian/libglade-cil.install	2006-03-24 19:27:37 UTC (rev 2360)
@@ -1,4 +1,4 @@
 debian/tmp/usr/lib/mono/gac/glade-sharp
 debian/tmp/usr/lib/pkgconfig/glade-sharp.pc
-debian/tmp/usr/lib/libgladesharpglue.so
+debian/tmp/usr/lib/libgladesharpglue.so /usr/lib/mono/gtk-sharp
 debian/tmp/usr/lib/mono/gtk-sharp/glade-sharp.dll

Modified: gtk-sharp/trunk/debian/libglib-cil.install
===================================================================
--- gtk-sharp/trunk/debian/libglib-cil.install	2006-03-24 13:14:20 UTC (rev 2359)
+++ gtk-sharp/trunk/debian/libglib-cil.install	2006-03-24 19:27:37 UTC (rev 2360)
@@ -1,4 +1,4 @@
 debian/tmp/usr/lib/mono/gac/glib-sharp
-debian/tmp/usr/lib/libglibsharpglue.so
+debian/tmp/usr/lib/libglibsharpglue.so /usr/lib/mono/gtk-sharp
 debian/tmp/usr/lib/mono/gtk-sharp/glib-sharp.dll
 

Modified: gtk-sharp/trunk/debian/libgnome-cil.install
===================================================================
--- gtk-sharp/trunk/debian/libgnome-cil.install	2006-03-24 13:14:20 UTC (rev 2359)
+++ gtk-sharp/trunk/debian/libgnome-cil.install	2006-03-24 19:27:37 UTC (rev 2360)
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libgnomesharpglue.so
+debian/tmp/usr/lib/libgnomesharpglue.so /usr/lib/mono/gtk-sharp
 debian/tmp/usr/lib/mono/gac/gnome-sharp
 debian/tmp/usr/lib/mono/gac/art-sharp
 debian/tmp/usr/lib/mono/gac/gtkhtml-sharp

Modified: gtk-sharp/trunk/debian/libgtk-cil.install
===================================================================
--- gtk-sharp/trunk/debian/libgtk-cil.install	2006-03-24 13:14:20 UTC (rev 2359)
+++ gtk-sharp/trunk/debian/libgtk-cil.install	2006-03-24 19:27:37 UTC (rev 2360)
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/libgtksharpglue.so
-debian/tmp/usr/lib/libgdksharpglue.so
+debian/tmp/usr/lib/libgtksharpglue.so /usr/lib/mono/gtk-sharp
+debian/tmp/usr/lib/libgdksharpglue.so /usr/lib/mono/gtk-sharp
 debian/tmp/usr/lib/mono/gac/gtk-sharp
 debian/tmp/usr/lib/mono/gac/gdk-sharp
 debian/tmp/usr/lib/mono/gac/atk-sharp

Added: gtk-sharp/trunk/debian/patches/00list
===================================================================
--- gtk-sharp/trunk/debian/patches/00list	2006-03-24 13:14:20 UTC (rev 2359)
+++ gtk-sharp/trunk/debian/patches/00list	2006-03-24 19:27:37 UTC (rev 2360)
@@ -0,0 +1,2 @@
+01_gtkhtml3.8
+02_move-glue-libs.dpatch

Added: gtk-sharp/trunk/debian/patches/01_gtkhtml3.8.dpatch
===================================================================
--- gtk-sharp/trunk/debian/patches/01_gtkhtml3.8.dpatch	2006-03-24 13:14:20 UTC (rev 2359)
+++ gtk-sharp/trunk/debian/patches/01_gtkhtml3.8.dpatch	2006-03-24 19:27:37 UTC (rev 2360)
@@ -0,0 +1,146 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+##DP: Fix configure for gtkhtml3.8
+
+ at DPATCH@
+
+--- gtk-sharp-1.0.10/configure.in.old	2005-08-26 14:49:43.299267656 +0200
++++ gtk-sharp-1.0.10/configure.in	2005-08-26 14:49:55.463418424 +0200
+@@ -153,6 +153,12 @@
+ RSVG_REQUIRED_VERSION=2.0.1
+ PKG_CHECK_MODULES(RSVG_DEPENDENCIES, librsvg-2.0 >= $RSVG_REQUIRED_VERSION, enable_rsvg=yes, enable_rsvg=no)
+ 
++GTKHTML_REQUIRED_VERSION=3.7.7
++PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
++if test "x$enable_gtkhtml" = "xyes"; then
++GTKHTML_VERSION=3.8
++GTKHTML_SOVERSION=15
++else	
+ GTKHTML_REQUIRED_VERSION=3.6.0
+ PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.6 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
+ if test "x$enable_gtkhtml" = "xyes"; then
+@@ -183,6 +189,7 @@
+ fi
+ fi
+ fi
++fi
+ AC_SUBST(GTKHTML_VERSION)
+ AC_SUBST(GTKHTML_SOVERSION)
+ 
+--- gtk-sharp-1.0.10/configure.old	2005-08-26 14:49:38.285029936 +0200
++++ gtk-sharp-1.0.10/configure	2005-08-26 14:50:04.546037656 +0200
+@@ -22228,7 +22228,107 @@
+      enable_rsvg=no
+   fi
+ 
++GTKHTML_REQUIRED_VERSION=3.7.7
+ 
++  succeeded=no
++
++  if test -z "$PKG_CONFIG"; then
++    # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++  ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++
++if test -n "$PKG_CONFIG"; then
++  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  fi
++
++  if test "$PKG_CONFIG" = "no" ; then
++     echo "*** The pkg-config script could not be found. Make sure it is"
++     echo "*** in your path, or set the PKG_CONFIG environment variable"
++     echo "*** to the full path to pkg-config."
++     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++  else
++     PKG_CONFIG_MIN_VERSION=0.9.0
++     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++        echo "$as_me:$LINENO: checking for libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION" >&5
++echo $ECHO_N "checking for libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION... $ECHO_C" >&6
++
++        if $PKG_CONFIG --exists "libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION" ; then
++            echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++            succeeded=yes
++
++            echo "$as_me:$LINENO: checking GTKHTML_DEPENDENCIES_CFLAGS" >&5
++echo $ECHO_N "checking GTKHTML_DEPENDENCIES_CFLAGS... $ECHO_C" >&6
++            GTKHTML_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION"`
++            echo "$as_me:$LINENO: result: $GTKHTML_DEPENDENCIES_CFLAGS" >&5
++echo "${ECHO_T}$GTKHTML_DEPENDENCIES_CFLAGS" >&6
++
++            echo "$as_me:$LINENO: checking GTKHTML_DEPENDENCIES_LIBS" >&5
++echo $ECHO_N "checking GTKHTML_DEPENDENCIES_LIBS... $ECHO_C" >&6
++            GTKHTML_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION"`
++            echo "$as_me:$LINENO: result: $GTKHTML_DEPENDENCIES_LIBS" >&5
++echo "${ECHO_T}$GTKHTML_DEPENDENCIES_LIBS" >&6
++        else
++            GTKHTML_DEPENDENCIES_CFLAGS=""
++            GTKHTML_DEPENDENCIES_LIBS=""
++            ## If we have a custom action on failure, don't print errors, but
++            ## do set a variable so people can do so.
++            GTKHTML_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION"`
++
++        fi
++
++
++
++     else
++        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++        echo "*** See http://www.freedesktop.org/software/pkgconfig"
++     fi
++  fi
++
++  if test $succeeded = yes; then
++     enable_gtkhtml=yes
++  else
++     enable_gtkhtml=no
++  fi
++
++if test "x$enable_gtkhtml" = "xyes"; then
++GTKHTML_VERSION=3.8
++GTKHTML_SOVERSION=15
++else
+ GTKHTML_REQUIRED_VERSION=3.6.0
+ 
+   succeeded=no
+@@ -22639,6 +22739,7 @@
+ fi
+ fi
+ fi
++fi
+ 
+ 
+ 

Added: gtk-sharp/trunk/debian/patches/02_move-glue-libs.dpatch
===================================================================
--- gtk-sharp/trunk/debian/patches/02_move-glue-libs.dpatch	2006-03-24 13:14:20 UTC (rev 2359)
+++ gtk-sharp/trunk/debian/patches/02_move-glue-libs.dpatch	2006-03-24 19:27:37 UTC (rev 2360)
@@ -0,0 +1,51 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- gtk-sharp-1.0.10/glib/glib-sharp.dll.config.in.old	2005-10-18 10:51:38.698992016 +0200
++++ gtk-sharp-1.0.10/glib/glib-sharp.dll.config.in	2005-10-18 10:52:10.461163432 +0200
+@@ -2,4 +2,5 @@
+   <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" target="/usr/lib/mono/gtk-sharp/libglibsharpglue.so"/>
+ </configuration>
+--- gtk-sharp-1.0.10/gdk/gdk-sharp.dll.config.in.old	2005-10-18 10:49:59.733037128 +0200
++++ gtk-sharp-1.0.10/gdk/gdk-sharp.dll.config.in	2005-10-18 10:50:45.565069600 +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="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" target="/usr/lib/mono/gtk-sharp/libgdksharpglue.so"/>
+ </configuration>
+--- gtk-sharp-1.0.10/glade/glade-sharp.dll.config.in.old	2005-10-18 10:50:56.493408240 +0200
++++ gtk-sharp-1.0.10/glade/glade-sharp.dll.config.in	2005-10-18 10:51:29.332415952 +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" target="/usr/lib/mono/gtk-sharp/libgladesharpglue.so"/>
+ </configuration>
+--- gtk-sharp-1.0.10/gtk/gtk-sharp.dll.config.in.old	2005-10-18 10:53:05.691767104 +0200
++++ gtk-sharp-1.0.10/gtk/gtk-sharp.dll.config.in	2005-10-18 10:53:39.673601080 +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="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" target="/usr/lib/mono/gtk-sharp/libgtksharpglue.so"/>
+ </configuration>
+--- gtk-sharp-1.0.10/pango/pango-sharp.dll.config.in.old	2005-10-18 10:53:49.979034416 +0200
++++ gtk-sharp-1.0.10/pango/pango-sharp.dll.config.in	2005-10-18 10:54:22.787046840 +0200
+@@ -1,4 +1,5 @@
+ <configuration>
+   <dllmap dll="libglib-2.0-0.dll" target="libglib-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" target="/usr/lib/mono/gtk-sharp/libpangosharpglue.so"/>
+ </configuration>
+--- gtk-sharp-1.0.10/gnome/gnome-sharp.dll.config.in.old	2005-10-18 10:52:20.556628688 +0200
++++ gtk-sharp-1.0.10/gnome/gnome-sharp.dll.config.in	2005-10-18 10:52:57.816964256 +0200
+@@ -8,4 +8,5 @@
+   <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" target="/usr/lib/mono/gtk-sharp/libgnomesharpglue.so"/>
+ </configuration>

Modified: gtk-sharp/trunk/debian/rules
===================================================================
--- gtk-sharp/trunk/debian/rules	2006-03-24 13:14:20 UTC (rev 2359)
+++ gtk-sharp/trunk/debian/rules	2006-03-24 19:27:37 UTC (rev 2360)
@@ -5,10 +5,12 @@
 export MONO_SHARED_DIR=$(CURDIR)
 export MONO_GAC_PREFIX=$(CURDIR)/debian/tmp/usr
 
+include /usr/share/dpatch/dpatch.make
+
 UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
 
 config: config-stamp
-config-stamp:
+config-stamp: patch-stamp
 	dh_testdir
 	mkdir -p $(MONO_SHARED_DIR)/.wapi
 	perl -pe 's,libgda-2\@LIB_PREFIX\@\.1,libgda-2\@LIB_PREFIX\@\.3,;' -i gda/gda-sharp.dll.config.in
@@ -29,7 +31,7 @@
 	$(MAKE) RUNTIME=/usr/bin/cli
 	touch build-arch-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	-$(MAKE) distclean RUNTIME=/usr/bin/cli




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