The following commit has been merged in the master branch:
commit 82d903d38d46de3404347a9f4311c02153f25e39
Author: Jo Shields <directhex at apebox.org>
Date: Tue Dec 8 13:12:44 2009 +0000
debian/patches/02_provider-factory-path.dpatch:
+ CLI Policy 0.7 install location, with the exception of
Mono.Zeroconf.Providers.AvahiDBus.dll, which is installed
into the wrong place to minimize the degree of upstream
patching which would otherwise be needed.
diff --git a/debian/changelog b/debian/changelog
index 8d07fb9..e472fe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,12 @@ mono-zeroconf (0.9.0-2) UNRELEASED; urgency=low
+ Stop renaming pkg-config file
* debian/libmono-zeroconf1.0-cil.install,
debian/libmono-zeroconf1.0-cil.installcligac,
- debian/patches/01_pkg-config-path.dpatch:
- + CLI Policy 0.7 install location
+ debian/patches/01_pkg-config-path.dpatch,
+ debian/patches/02_provider-factory-path.dpatch:
+ + CLI Policy 0.7 install location, with the exception of
+ Mono.Zeroconf.Providers.AvahiDBus.dll, which is installed
+ into the wrong place to minimize the degree of upstream
+ patching which would otherwise be needed.
* debian/libmono-zeroconf1.0-cil.install,
debian/libmono-zeroconf-cil-dev.install,
debian/control:
diff --git a/debian/libmono-zeroconf1.0-cil.install b/debian/libmono-zeroconf1.0-cil.install
index a7cfcf1..e3ab007 100644
--- a/debian/libmono-zeroconf1.0-cil.install
+++ b/debian/libmono-zeroconf1.0-cil.install
@@ -3,4 +3,4 @@ debian/tmp/usr/lib/mono/gac/policy.1.0.Mono.Zeroconf/*/* /usr/lib/cli/Mono.Zeroc
debian/tmp/usr/lib/mono/gac/policy.2.0.Mono.Zeroconf/*/* /usr/lib/cli/Mono.Zeroconf-1.0/
debian/tmp/usr/lib/mono/gac/policy.3.0.Mono.Zeroconf/*/* /usr/lib/cli/Mono.Zeroconf-1.0/
debian/tmp/usr/lib/mono/gac/policy.4.0.Mono.Zeroconf/*/* /usr/lib/cli/Mono.Zeroconf-1.0/
-debian/tmp/usr/lib/mono-zeroconf/Mono.Zeroconf.Providers.AvahiDBus.dll* /usr/lib/cli/Mono.Zeroconf.Providers.AvahiDBus-1.0/
+debian/tmp/usr/lib/mono-zeroconf/Mono.Zeroconf.Providers.AvahiDBus.dll* /usr/lib/cli/Mono.Zeroconf-1.0/
diff --git a/debian/patches/02_provider-factory-path.dpatch b/debian/patches/02_provider-factory-path.dpatch
index 93ba2ca..8e14322 100644
--- a/debian/patches/02_provider-factory-path.dpatch
+++ b/debian/patches/02_provider-factory-path.dpatch
@@ -13,7 +13,7 @@
- directories.Add(Path.Combine(new_path, "mono-zeroconf"));
+
+ new_path = Path.Combine(new_path, "cli");
-+ directories.Add(Path.Combine(new_path, "mono-zeroconf-1.0"));
++ directories.Add(Path.Combine(new_path, "Mono.Zeroconf-1.0"));
}
foreach(string directory in directories) {
--
mono-zeroconf