[Pkg-cli-libs-commits] r4242 - in /packages/ndesk-dbus/trunk/debian: README.source changelog control patches/00list patches/10_namespace-support.dpatch rules

laney-guest at users.alioth.debian.org laney-guest at users.alioth.debian.org
Thu Oct 15 21:51:14 UTC 2009 

Author: laney-guest
Date: Thu Oct 15 21:51:13 2009
New Revision: 4242

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=4242
Log:
* debian/patches/10_namespace-support.dpatch: Backport patch from upstream
  bug#377672 to fix a crash in the case where we were dealing with
  interfaces which had the same name in different namespaces (LP: #377672)
* debian/control, debian/rules: Use mono-csc as compiler, bump mono-devel
  versioned build-dep to one which provides this
* debian/control, debian/README.source: Standards-Version 3.8.3; add
  README.source 

Added:
    packages/ndesk-dbus/trunk/debian/README.source
    packages/ndesk-dbus/trunk/debian/patches/10_namespace-support.dpatch   (with props)
Modified:
    packages/ndesk-dbus/trunk/debian/changelog
    packages/ndesk-dbus/trunk/debian/control
    packages/ndesk-dbus/trunk/debian/patches/00list
    packages/ndesk-dbus/trunk/debian/rules

Added: packages/ndesk-dbus/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/ndesk-dbus/trunk/debian/README.source?rev=4242&op=file
==============================================================================
--- packages/ndesk-dbus/trunk/debian/README.source (added)
+++ packages/ndesk-dbus/trunk/debian/README.source Thu Oct 15 21:51:13 2009
@@ -1,0 +1,38 @@
+This package uses dpatch to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To get the fully patched source after unpacking the source package, cd
+to the root level of the source package and run:
+
+    debian/rules patch
+
+Removing a patch is as simple as removing its entry from the
+debian/patches/00list file, and please also remove the patch file
+itself.
+
+Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
+where you should replace XX with a new number and patchname with a
+descriptive shortname of the patch. You can then simply edit all the
+files your patch wants to edit, and then simply "exit 0" from the shell
+to actually create the patch file.
+
+To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
+and replace XX_patchname with the actual filename from debian/patches
+you want to use.
+
+To clean up afterwards again, "debian/rules unpatch" will do the
+work for you - or you can of course choose to call
+"fakeroot debian/rules clean" all together.
+
+
+--- 
+
+this documentation is part of dpatch package, and may be used by
+packages using dpatch to comply with policy on README.source. This
+documentation is meant to be useful to users who are not proficient in
+dpatch in doing work with dpatch-based packages. Please send any
+improvements to the BTS of dpatch package.
+
+original text by Gerfried Fuchs, edited by Junichi Uekawa <dancer at debian.org>
+10 Aug 2008.

Modified: packages/ndesk-dbus/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/ndesk-dbus/trunk/debian/changelog?rev=4242&op=diff
==============================================================================
--- packages/ndesk-dbus/trunk/debian/changelog (original)
+++ packages/ndesk-dbus/trunk/debian/changelog Thu Oct 15 21:51:13 2009
@@ -1,3 +1,15 @@
+ndesk-dbus (0.6.0-3) UNRELEASED; urgency=low
+
+  * debian/patches/10_namespace-support.dpatch: Backport patch from upstream
+    bug#377672 to fix a crash in the case where we were dealing with
+    interfaces which had the same name in different namespaces (LP: #377672)
+  * debian/control, debian/rules: Use mono-csc as compiler, bump mono-devel
+    versioned build-dep to one which provides this
+  * debian/control, debian/README.source: Standards-Version 3.8.3; add
+    README.source 
+
+ -- Iain Lane <laney at ubuntu.com>  Thu, 15 Oct 2009 22:50:54 +0100
+
 ndesk-dbus (0.6.0-2) unstable; urgency=low
 
   [ Mirco Bauer ]

Modified: packages/ndesk-dbus/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/ndesk-dbus/trunk/debian/control?rev=4242&op=diff
==============================================================================
--- packages/ndesk-dbus/trunk/debian/control (original)
+++ packages/ndesk-dbus/trunk/debian/control Thu Oct 15 21:51:13 2009
@@ -5,13 +5,13 @@
 Uploaders: Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 5), dpatch
 Build-Depends-Indep: cli-common-dev (>= 0.5.4),
- mono-devel (>= 2.0.1),
+ mono-devel (>= 2.4.2.3),
  libmono-dev (>= 2.0.1),
  libmono-corlib2.0-cil,
  libmono-system2.0-cil,
  libmono2.0-cil,
  pkg-config
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 Homepage: http://www.ndesk.org/DBusSharp
 Vcs-Svn: svn://svn.debian.org/pkg-cli-libs/packages/ndesk-dbus/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/ndesk-dbus/trunk/

Modified: packages/ndesk-dbus/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/ndesk-dbus/trunk/debian/patches/00list?rev=4242&op=diff
==============================================================================
--- packages/ndesk-dbus/trunk/debian/patches/00list (original)
+++ packages/ndesk-dbus/trunk/debian/patches/00list Thu Oct 15 21:51:13 2009
@@ -1,1 +1,2 @@
 01_pkg-config-library-path.dpatch
+10_namespace-support.dpatch

Added: packages/ndesk-dbus/trunk/debian/patches/10_namespace-support.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/ndesk-dbus/trunk/debian/patches/10_namespace-support.dpatch?rev=4242&op=file
==============================================================================
--- packages/ndesk-dbus/trunk/debian/patches/10_namespace-support.dpatch (added)
+++ packages/ndesk-dbus/trunk/debian/patches/10_namespace-support.dpatch Thu Oct 15 21:51:13 2009
@@ -1,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_namespace-support.dpatch by Iain Lane <laney at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+# Description: Crash with interfaces with the same name but in different namespaces
+# Origin: other
+# Bug: https://bugs.launchpad.net/ndesk-dbus/+bug/377672
+
+ at DPATCH@
+diff -urNad ndesk-dbus-0.6.0~/src/TypeImplementer.cs ndesk-dbus-0.6.0/src/TypeImplementer.cs
+--- ndesk-dbus-0.6.0~/src/TypeImplementer.cs	2007-10-11 21:01:11.000000000 +0100
++++ ndesk-dbus-0.6.0/src/TypeImplementer.cs	2009-10-15 22:30:15.462877986 +0100
+@@ -34,7 +34,7 @@
+ 
+ 			InitHack ();
+ 
+-			TypeBuilder typeB = modB.DefineType (declType.Name + "Proxy", TypeAttributes.Class | TypeAttributes.Public, typeof (BusObject));
++			TypeBuilder typeB = modB.DefineType (declType.FullName + "Proxy", TypeAttributes.Class | TypeAttributes.Public, typeof (BusObject));
+ 
+ 			Implement (typeB, declType);
+ 

Propchange: packages/ndesk-dbus/trunk/debian/patches/10_namespace-support.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/ndesk-dbus/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/ndesk-dbus/trunk/debian/rules?rev=4242&op=diff
==============================================================================
--- packages/ndesk-dbus/trunk/debian/rules (original)
+++ packages/ndesk-dbus/trunk/debian/rules Thu Oct 15 21:51:13 2009
@@ -17,7 +17,7 @@
 config: config-stamp
 config-stamp: patch-stamp
 	dh_testdir
-	GMCS=/usr/bin/csc ./configure --prefix=/usr
+	GMCS=/usr/bin/mono-csc ./configure --prefix=/usr
 	touch config-stamp
 
 build: patch-stamp build-stamp

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