[Pkg-cli-libs-commits] [SCM] gnome-sharp2 branch, master, updated. upstream/2.24.1-23-g863308e

[Julian Taylor]

The following commit has been merged in the master branch:
commit aea7e4518f664aaeba82aa0c77c3dfdaeae7d848
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Fri Jun 3 13:50:31 2011 +0000

    refresh 03_fix_gac_policy_filenames.dpatch

diff --git a/debian/patches/03_fix_gac_policy_filenames.dpatch b/debian/patches/03_fix_gac_policy_filenames.dpatch
old mode 100755
new mode 100644
index 0677dd8..3607118
--- a/debian/patches/03_fix_gac_policy_filenames.dpatch
+++ b/debian/patches/03_fix_gac_policy_filenames.dpatch
@@ -1,35 +1,30 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_fix_gac_policy_filenames.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad gnome-sharp-2.24.1~/Makefile.include gnome-sharp-2.24.1/Makefile.include
---- gnome-sharp-2.24.1~/Makefile.include	2008-03-07 03:32:21.000000000 +0100
-+++ gnome-sharp-2.24.1/Makefile.include	2009-03-21 17:15:05.000000000 +0100
+Index: gnome-sharp2/Makefile.include
+===================================================================
+--- gnome-sharp2.orig/Makefile.include	2011-06-05 17:55:28.539439002 +0000
++++ gnome-sharp2/Makefile.include	2011-06-05 17:55:31.000000000 +0000
 @@ -49,8 +49,8 @@
- $(POLICY_ASSEMBLIES): $(top_builddir)/policy.config $(SNK)
- 	@for i in $(POLICY_VERSIONS); do	\
- 	  echo "Creating policy.$$i.$(ASSEMBLY)";	\
--	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config;	\
--	  $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:$(SNK);	\
-+	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.$(ASSEMBLY_NAME).config;	\
-+	  $(AL) -link:policy.$$i.$(ASSEMBLY_NAME).config -out:policy.$$i.$(ASSEMBLY) -keyfile:$(SNK);	\
- 	done
+ policy.%.config: $(top_builddir)/policy.config
+ 	sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@
+ 
+-$(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config $(SNK)
+-	$(AL) -link:policy.$*.config -out:$@ -keyfile:$(SNK)
++$(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.$(ASSEMBLY_NAME).config $(SNK)
++	$(AL) -link:policy.$*.$(ASSEMBLY_NAME).config -out:$@ -keyfile:$(SNK)
  
  build_sources = $(patsubst %, $(srcdir)/%, $(sources)) AssemblyInfo.cs
-diff -urNad gnome-sharp-2.24.1~/gconf/GConf/Makefile.am gnome-sharp-2.24.1/gconf/GConf/Makefile.am
---- gnome-sharp-2.24.1~/gconf/GConf/Makefile.am	2009-03-21 19:02:54.000000000 +0100
-+++ gnome-sharp-2.24.1/gconf/GConf/Makefile.am	2009-03-21 19:02:55.000000000 +0100
+ build_references = $(GTKSHARP_LIBS) $(patsubst %, /r:%, $(references)) $(MONO_CAIRO_LIBS)
+Index: gnome-sharp2/gconf/GConf/Makefile.am
+===================================================================
+--- gnome-sharp2.orig/gconf/GConf/Makefile.am	2011-06-05 18:02:08.959439002 +0000
++++ gnome-sharp2/gconf/GConf/Makefile.am	2011-06-05 18:02:36.479439002 +0000
 @@ -52,8 +52,8 @@
- $(POLICY_ASSEMBLIES): $(top_builddir)/policy.config gtk-sharp.snk
- 	@for i in $(POLICY_VERSIONS); do	\
- 	  echo "Creating policy.$$i.$(ASSEMBLY)";	\
--	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config;	\
--	  $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:gtk-sharp.snk;	\
-+	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.$(ASSEMBLY_NAME).config;	\
-+	  $(AL) -link:policy.$$i.$(ASSEMBLY_NAME).config -out:policy.$$i.$(ASSEMBLY) -keyfile:gtk-sharp.snk;	\
- 	done
+ policy.%.config: $(top_builddir)/policy.config
+ 	sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@
+ 
+-$(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config gtk-sharp.snk
+-	$(AL) -link:policy.$*.config -out:$@ -keyfile:gtk-sharp.snk
++$(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.$(ASSEMBLY_NAME).config gtk-sharp.snk
++	$(AL) -link:policy.$*.$(ASSEMBLY_NAME).config -out:$@ -keyfile:gtk-sharp.snk
  
  install-data-local:
+ 	@if test -n '$(TARGET)'; then							\

-- 
gnome-sharp2