[Pkg-mono-svn-commits] rev 3394 - in ndesk-dbus-glib/trunk/debian: . patches
Sebastian Dröge
slomo at alioth.debian.org
Tue Oct 16 10:17:24 UTC 2007
Author: slomo
Date: 2007-10-16 10:17:24 +0000 (Tue, 16 Oct 2007)
New Revision: 3394
Removed:
ndesk-dbus-glib/trunk/debian/ndesk-dbus-glib-1.0.pc
ndesk-dbus-glib/trunk/debian/patches/01_native-signatures.dpatch
Modified:
ndesk-dbus-glib/trunk/debian/changelog
ndesk-dbus-glib/trunk/debian/control
ndesk-dbus-glib/trunk/debian/patches/00list
ndesk-dbus-glib/trunk/debian/rules
ndesk-dbus-glib/trunk/debian/watch
Log:
* New upstream release.
* debian/control:
+ Update build dependencies.
* debian/rules:
+ Update for new upstream build system.
+ Call dh_clifixperms instead of manual find magic.
+ Bump clilibs to >= 0.4.0.
* debian/watch:
+ Update location.
* debian/patches/01_native-signatures.dpatch:
+ Dropped, merged upstream.
Modified: ndesk-dbus-glib/trunk/debian/changelog
===================================================================
--- ndesk-dbus-glib/trunk/debian/changelog 2007-10-16 10:14:00 UTC (rev 3393)
+++ ndesk-dbus-glib/trunk/debian/changelog 2007-10-16 10:17:24 UTC (rev 3394)
@@ -1,3 +1,19 @@
+ndesk-dbus-glib (0.4.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ + Update build dependencies.
+ * debian/rules:
+ + Update for new upstream build system.
+ + Call dh_clifixperms instead of manual find magic.
+ + Bump clilibs to >= 0.4.0.
+ * debian/watch:
+ + Update location.
+ * debian/patches/01_native-signatures.dpatch:
+ + Dropped, merged upstream.
+
+ -- Sebastian Dröge <slomo at debian.org> Tue, 16 Oct 2007 12:07:39 +0200
+
ndesk-dbus-glib (0.3-2) unstable; urgency=low
* debian/patches/01_native-signatures.dpatch:
Modified: ndesk-dbus-glib/trunk/debian/control
===================================================================
--- ndesk-dbus-glib/trunk/debian/control 2007-10-16 10:14:00 UTC (rev 3393)
+++ ndesk-dbus-glib/trunk/debian/control 2007-10-16 10:17:24 UTC (rev 3394)
@@ -4,7 +4,7 @@
Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
Uploaders: Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5), dpatch
-Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-gmcs (>= 1.1.13) | c-sharp-2.0-compiler, libmono-corlib2.0-cil, libmono-system2.0-cil, libmono2.0-cil, libglib2.0-dev, libndesk-dbus1.0-cil (>= 0.4), pkg-config
+Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-gmcs (>= 1.1.13) | c-sharp-2.0-compiler, libmono-dev (>= 1.1.13), mono-gac | global-assembly-cache-tool, libmono-corlib2.0-cil, libmono-system2.0-cil, libmono2.0-cil, libglib2.0-dev, libndesk-dbus1.0-cil (>= 0.4), pkg-config
Standards-Version: 3.7.2
Package: libndesk-dbus-glib1.0-cil
Deleted: ndesk-dbus-glib/trunk/debian/ndesk-dbus-glib-1.0.pc
===================================================================
--- ndesk-dbus-glib/trunk/debian/ndesk-dbus-glib-1.0.pc 2007-10-16 10:14:00 UTC (rev 3393)
+++ ndesk-dbus-glib/trunk/debian/ndesk-dbus-glib-1.0.pc 2007-10-16 10:17:24 UTC (rev 3394)
@@ -1,9 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-
-Name: NDesk.DBus.GLib
-Description: GLib integration for NDesk.DBus, the D-Bus IPC library
-Version: 0.3.0
-Requires: ndesk-dbus-1.0
-Libs: -r:${libdir}/cli/ndesk-dbus-glib-1.0/NDesk.DBus.GLib.dll
Modified: ndesk-dbus-glib/trunk/debian/patches/00list
===================================================================
--- ndesk-dbus-glib/trunk/debian/patches/00list 2007-10-16 10:14:00 UTC (rev 3393)
+++ ndesk-dbus-glib/trunk/debian/patches/00list 2007-10-16 10:17:24 UTC (rev 3394)
@@ -1 +0,0 @@
-01_native-signatures.dpatch
Deleted: ndesk-dbus-glib/trunk/debian/patches/01_native-signatures.dpatch
===================================================================
--- ndesk-dbus-glib/trunk/debian/patches/01_native-signatures.dpatch 2007-10-16 10:14:00 UTC (rev 3393)
+++ ndesk-dbus-glib/trunk/debian/patches/01_native-signatures.dpatch 2007-10-16 10:17:24 UTC (rev 3394)
@@ -1,110 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
---- ndesk-dbus-glib-0.3.orig/glib/GLib.IO.cs
-+++ ndesk-dbus-glib-0.3/glib/GLib.IO.cs
-@@ -43,14 +43,12 @@
- }
-
- [DllImport(GLIB)]
-- //static extern int g_io_channel_unix_get_fd (IntPtr channel);
-- static extern int g_io_channel_unix_get_fd (IOChannel channel);
-+ static extern int g_io_channel_unix_get_fd (IntPtr channel);
-
- public int UnixFd
- {
- get {
-- //return g_io_channel_unix_get_fd (Handle);
-- return g_io_channel_unix_get_fd (this);
-+ return g_io_channel_unix_get_fd (Handle);
- }
- }
-
-@@ -65,43 +63,43 @@
-
-
- [DllImport(GLIB)]
-- public static extern uint g_io_channel_get_buffer_size (IOChannel channel);
-+ public static extern uint g_io_channel_get_buffer_size (IntPtr channel);
-
- [DllImport(GLIB)]
-- public static extern void g_io_channel_set_buffer_size (IOChannel channel, uint size);
-+ public static extern void g_io_channel_set_buffer_size (IntPtr channel, uint size);
-
- public uint BufferSize
- {
- get {
-- return g_io_channel_get_buffer_size (this);
-+ return g_io_channel_get_buffer_size (Handle);
- } set {
-- g_io_channel_set_buffer_size (this, value);
-+ g_io_channel_set_buffer_size (Handle, value);
- }
- }
-
- [DllImport(GLIB)]
-- public static extern IOCondition g_io_channel_get_buffer_condition (IOChannel channel);
-+ public static extern IOCondition g_io_channel_get_buffer_condition (IntPtr channel);
-
- public IOCondition BufferCondition
- {
- get {
-- return g_io_channel_get_buffer_condition (this);
-+ return g_io_channel_get_buffer_condition (Handle);
- }
- }
-
- [DllImport(GLIB)]
-- public static extern IOFlags g_io_channel_get_flags (IOChannel channel);
-+ public static extern IOFlags g_io_channel_get_flags (IntPtr channel);
-
- [DllImport(GLIB)]
-- static extern short g_io_channel_set_flags (IOChannel channel, IOFlags flags, IntPtr error);
-+ static extern short g_io_channel_set_flags (IntPtr channel, IOFlags flags, IntPtr error);
-
- public IOFlags Flags
- {
- get {
-- return g_io_channel_get_flags (this);
-+ return g_io_channel_get_flags (Handle);
- } set {
- //TODO: fix return and error
-- g_io_channel_set_flags (this, value, IntPtr.Zero);
-+ g_io_channel_set_flags (Handle, value, IntPtr.Zero);
- }
- }
- }
-@@ -124,13 +122,13 @@
- Returns: the event source id.
- */
- [DllImport(GLIB)]
-- protected static extern uint g_io_add_watch (IOChannel channel, IOCondition condition, IOFunc func, IntPtr user_data);
-+ protected static extern uint g_io_add_watch (IntPtr channel, IOCondition condition, IOFunc func, IntPtr user_data);
-
- public static uint AddWatch (IOChannel channel, IOCondition condition, IOFunc func)
- {
- objs.Add (func);
-
-- return g_io_add_watch (channel, condition, func, IntPtr.Zero);
-+ return g_io_add_watch (channel.Handle, condition, func, IntPtr.Zero);
- }
-
- /*
-@@ -146,14 +144,14 @@
- Returns: the event source id.
- */
- [DllImport(GLIB)]
-- protected static extern uint g_io_add_watch_full (IOChannel channel, int priority, IOCondition condition, IOFunc func, IntPtr user_data, DestroyNotify notify);
-+ protected static extern uint g_io_add_watch_full (IntPtr channel, int priority, IOCondition condition, IOFunc func, IntPtr user_data, DestroyNotify notify);
-
- public static uint AddWatch (IOChannel channel, int priority, IOCondition condition, IOFunc func, DestroyNotify notify)
- {
- objs.Add (func);
- objs.Add (notify);
-
-- return g_io_add_watch_full (channel, priority, condition, func, IntPtr.Zero, notify);
-+ return g_io_add_watch_full (channel.Handle, priority, condition, func, IntPtr.Zero, notify);
- }
-
- [DllImport(GLIB)]
Modified: ndesk-dbus-glib/trunk/debian/rules
===================================================================
--- ndesk-dbus-glib/trunk/debian/rules 2007-10-16 10:14:00 UTC (rev 3393)
+++ ndesk-dbus-glib/trunk/debian/rules 2007-10-16 10:17:24 UTC (rev 3394)
@@ -12,15 +12,21 @@
UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\ -f2 | sed 's,-.*,,')
+config: config-stamp
+config-stamp: patch-stamp
+ dh_testdir
+ ./configure --prefix=/usr
+ touch config-stamp
+
build: patch-stamp build-stamp
-build-stamp:
- cd glib; gmcs -debug -out:NDesk.DBus.GLib.dll -t:library `pkg-config --libs ndesk-dbus-1.0` -keyfile:../ndesk.snk AssemblyInfo.cs GLib.IO.cs GLib.cs
+build-stamp: config-stamp
+ $(MAKE)
touch build-stamp
clean: unpatch
dh_testdir
dh_testroot
- rm -f glib/NDesk.DBus.GLib.dll glib/NDesk.DBus.GLib.dll.mdb
+ [ ! -f Makefile ] || $(MAKE) distclean
rm -rf $(MONO_SHARED_DIR)/.wapi
rm -f build-stamp
dh_clean
@@ -34,9 +40,7 @@
mkdir -p debian/tmp/usr/lib/cli/ndesk-dbus-glib-1.0
cp glib/NDesk.DBus.GLib.dll* debian/tmp/usr/lib/cli/ndesk-dbus-glib-1.0
mkdir -p debian/tmp/usr/lib/pkgconfig
- cp debian/ndesk-dbus-glib-1.0.pc debian/tmp/usr/lib/pkgconfig
- # fix permissions
- find debian/tmp -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" -or -name "*.config" | xargs chmod -x
+ cp ndesk-dbus-glib-1.0.pc debian/tmp/usr/lib/pkgconfig
binary-indep: build install
dh_testdir
@@ -49,7 +53,8 @@
dh_installman
dh_compress
dh_fixperms
- dh_makeclilibs -m0.3
+ dh_clifixperms
+ dh_makeclilibs -m0.4.0
dh_clideps
dh_installdeb
dh_gencontrol
Modified: ndesk-dbus-glib/trunk/debian/watch
===================================================================
--- ndesk-dbus-glib/trunk/debian/watch 2007-10-16 10:14:00 UTC (rev 3393)
+++ ndesk-dbus-glib/trunk/debian/watch 2007-10-16 10:17:24 UTC (rev 3394)
@@ -1,2 +1,2 @@
version=3
-http://www.ndesk.org/archive/dbus-sharp/dbus-sharp-glib-([0-9.]*)\.tar\.gz debian uupdate
+http://www.ndesk.org/archive/dbus-sharp/ndesk-dbus-glib-([0-9.]*)\.tar\.gz debian uupdate
More information about the Pkg-mono-svn-commits
mailing list