[Pkg-mono-svn-commits] rev 976 - gtk-sharp/trunk/debian

Eduard Bloch blade@haydn.debian.org
Sat, 12 Jun 2004 14:15:50 -0600


Author: blade
Date: 2004-06-12 14:15:38 -0600 (Sat, 12 Jun 2004)
New Revision: 976

Modified:
   gtk-sharp/trunk/debian/changelog
   gtk-sharp/trunk/debian/control
   gtk-sharp/trunk/debian/rules
Log:
Switched to debhelper managed dependencies


Modified: gtk-sharp/trunk/debian/changelog
===================================================================
--- gtk-sharp/trunk/debian/changelog	2004-06-12 19:56:45 UTC (rev 975)
+++ gtk-sharp/trunk/debian/changelog	2004-06-12 20:15:38 UTC (rev 976)
@@ -2,8 +2,7 @@
 
   * (NOT RELEASED YET) New upstream release
   * Eduard Bloch
-    + FIXME: dh_movefiles: debian/tmp/usr/share/perl5/GAPI not found (supposed to put it in gtk-sharp-gapi)
-      (currently removed from the .files file)
+    + integration of the new debhelper-managed dependencies
   * Mirco 'meebey' Bauer
     + added proper Conflicts/Replaces for smooth upgrades from older versions
 

Modified: gtk-sharp/trunk/debian/control
===================================================================
--- gtk-sharp/trunk/debian/control	2004-06-12 19:56:45 UTC (rev 975)
+++ gtk-sharp/trunk/debian/control	2004-06-12 20:15:38 UTC (rev 976)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>
 Uploaders: Eduard Bloch <blade@debian.org>, Mirco 'meebey' Bauer <mail@meebey.net>, Michael Schiansky <ms@debian.org>
-Build-Depends: debhelper (>= 4.1.87), autoconf, automake1.4, mono-mcs (>= 0.90) | c-sharp-compiler, mono-gac, monodoc-base (>> 0.16) | monodoc-browser, 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.0.0), libglade2-dev (>= 2.0.0), librsvg2-dev (>= 2.0.1), libgnomedb2-dev (>= 1.0.0), libgail-dev, libgtkhtml3.1-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), libmono-0.95
+Build-Depends: debhelper (>= 4.1.87), autoconf, automake1.4, mono-mcs (>= 0.90) | c-sharp-compiler, mono-gac, monodoc-base (>> 0.16) | monodoc-browser, 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.0.0), libglade2-dev (>= 2.0.0), librsvg2-dev (>= 2.0.1), libgnomedb2-dev (>= 1.0.0), libgail-dev, libgtkhtml3.1-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), libmono-0.95, mono-utils (>= 0.95)
 Build-Conflicts: libgtkhtml3.0-2, libart-2.0-dev (= 2.3.16-3)
 Standards-Version: 3.6.1
 
 Package: gtk-sharp-examples
 Architecture: all
-Depends: libgnome-cil, ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${net:Depends}
 Description: sample applications for the gtk-sharp toolkit
  This package contains some example programs that are distributed with
  the Gtk# assemblies, including source to build them and learn from
@@ -17,8 +17,8 @@
 
 Package: gtk-sharp-gapi
 Architecture: any
+Depends: ${shlibs:Depends}, libxml-libxml-perl, ${net:Depends}
 Provides: gtk-sharp-gapi-${mono:upversion}
-Depends: ${shlibs:Depends}, libgtk-cil, libxml-libxml-perl, mono-jit | cli-virtual-machine
 Description: C Source parser and C# code generator for GObject based APIs
  The gtk-sharp-gapi package includes the parser and code generator used by
  the Gtk# project to parse and bind GObject libraries. Install gtk-sharp-gapi
@@ -27,10 +27,9 @@
 
 Package: libglib-cil
 Architecture: any
-Provides: libglib-cil-${mono:upversion}
 Conflicts: gtk-sharp-glue, glib-sharp
 Replaces: gtk-sharp (<= 0.14), glib-sharp
-Depends: mono-jit | cli-virtual-machine, ${shlibs:Depends}
+Conflicts: gtk-sharp-glue
 Description: a .NET binding for the GLib utility library
  This package provides .NET assemblies that allow .NET / C# programs to use the
  GLib utility library. This is mostly useful for the Gtk+, GNOME and GStreamer
@@ -38,30 +37,28 @@
 
 Package: libgtk-cil
 Architecture: any
+Depends: ${shlibs:Depends}, ${net:Depends}
 Provides: libatk-cil, libpango-cil, libgdk-cil, libgtk-cil-${mono:upversion}
 Conflicts: gtk-sharp-glue, gtk-sharp
 Replaces: gtk-sharp
-Depends: mono-jit | cli-virtual-machine, libglib-cil (= ${Source-Version}), ${shlibs:Depends}
 Description: a .NET binding for the Gtk+ toolkit
  This package provides .NET assemblies that allow .NET / C# programs to use the
  Gtk+ user interface toolkit.
 
 Package: libglade-cil
 Architecture: any
-Provides: libglade-cil-${mono:upversion}
+Depends: ${shlibs:Depends}, ${net:Depends}
 Conflicts: gtk-sharp-glue, glade-sharp
 Replaces: glade-sharp
-Depends: mono-jit | cli-virtual-machine, libgtk-cil (= ${Source-Version}), ${shlibs:Depends}
 Description: a .NET binding for the Glade libraries
  This package provides .NET assemblies that allow .NET / C# programs to use the
  Glade libraries.
 
 Package: libgnome-cil
 Architecture: any
-Provides: libart-cil-${mono:upversion}, libgda-cil-${mono:upversion}, libgtkhtml-cil-${mono:upversion}, libgnomedb-cil-${mono:upversion}, librsvg-cil-${mono:upversion}, libgconf-peditors-cil-${mono:upversion}
 Conflicts: gtk-sharp-glue, gnome-sharp
 Replaces: gnome-sharp
-Depends: mono-jit | cli-virtual-machine, libgtk-cil (= ${Source-Version}), libgconf-cil (= ${Source-Version}), ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${net:Depends}
 Description: a .NET binding for GNOME
  This package provides .NET assemblies that allow .NET / C# programs to use the
  GNOME 2 UI libraries.
@@ -69,17 +66,17 @@
 Package: libvte-cil
 Architecture: any
 Provides: libvte-cil-${mono:upversion}
-Depends: mono-jit | cli-virtual-machine, libatk-cil, libpango-cil, libgdk-cil, libglib-cil (= ${Source-Version}), libgtk-cil (= ${Source-Version}), ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${net:Depends}
 Description: a .NET binding for VTE
  This package provides .NET assemblies that allow .NET / C# programs to use the
  VTE libraries.
 
 Package: libgconf-cil
 Architecture: all
+Depends: ${shlibs:Depends}, ${net:Depends}
 Provides: libgconf-cil-${mono:upversion}
 Conflicts: gtk-sharp-glue, gconf-sharp
 Replaces: gconf-sharp
-Depends: mono-jit | cli-virtual-machine, libglib-cil (= ${Source-Version}), libgconf2-4, ${shlibs:Depends}
 Description: a .NET binding for GConf
  This package provides .NET assemblies that allow .NET / C# programs to use the
  GConf configuration storage system.

Modified: gtk-sharp/trunk/debian/rules
===================================================================
--- gtk-sharp/trunk/debian/rules	2004-06-12 19:56:45 UTC (rev 975)
+++ gtk-sharp/trunk/debian/rules	2004-06-12 20:15:38 UTC (rev 976)
@@ -4,8 +4,8 @@
 export DH_COMPAT=4
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 export MONO_SHARED_DIR=$(CURDIR)/.wabi
-VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
-UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,')
+UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
+NEXTVERSION = $(UPVERSION).zzz
 
 EX_PATH = $(CURDIR)/debian/gtk-sharp-examples/usr/share/dotnet/gtk-sharp-examples
 GAC_PATH = usr/share/dotnet/mono/gac
@@ -74,7 +74,9 @@
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
-	dh_gencontrol -i -- -Vmono:upversion=$(UPVERSION)
+	dh_makenetlibs -i -m $(UPVERSION) -l $(NEXTVERSION)
+	dh_netdeps -i
+	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i
 
@@ -105,6 +107,8 @@
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a
+	dh_makenetlibs -a -m $(UPVERSION) -l $(NEXTVERSION)
+	dh_netdeps -a
 	dh_gencontrol -a -- -Vmono:upversion=$(UPVERSION)
 	dh_md5sums -a
 	dh_builddeb -a