[med-svn] r20255 - in trunk/packages/gdcm/prepare-2.6/debian: . patches

[Gert Wollny]

Author: gert-guest
Date: 2015-10-16 20:36:22 +0000 (Fri, 16 Oct 2015)
New Revision: 20255

Modified:
   trunk/packages/gdcm/prepare-2.6/debian/control
   trunk/packages/gdcm/prepare-2.6/debian/patches/add-csharp-keyfile-from-commandline.patch
Log:
Enable delayed signing for C#

Modified: trunk/packages/gdcm/prepare-2.6/debian/control
===================================================================
--- trunk/packages/gdcm/prepare-2.6/debian/control	2015-10-16 19:59:33 UTC (rev 20254)
+++ trunk/packages/gdcm/prepare-2.6/debian/control	2015-10-16 20:36:22 UTC (rev 20255)
@@ -29,12 +29,12 @@
                castxml,
                libsocket++-dev,
                libpapyrus3-dev, 
+               cli-common-dev (>= 0.9) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x],
                mono-devel (>= 2.10.5) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x]
 Build-Depends-Indep: vtk6-doc,
                      doxygen-latex,
                      ghostscript,
-                     graphviz, 
-                     cli-common-dev (>= 0.9) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x]
+                     graphviz
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/gdcm/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/gdcm/trunk/

Modified: trunk/packages/gdcm/prepare-2.6/debian/patches/add-csharp-keyfile-from-commandline.patch
===================================================================
--- trunk/packages/gdcm/prepare-2.6/debian/patches/add-csharp-keyfile-from-commandline.patch	2015-10-16 19:59:33 UTC (rev 20254)
+++ trunk/packages/gdcm/prepare-2.6/debian/patches/add-csharp-keyfile-from-commandline.patch	2015-10-16 20:36:22 UTC (rev 20255)
@@ -1,18 +1,21 @@
-diff -ru gdcm-2.6.0.old/Wrapping/Csharp/AssemblyInfo.cs.in gdcm-2.6.0/Wrapping/Csharp/AssemblyInfo.cs.in
+diff -u gdcm-2.6.0.old/Wrapping/Csharp/AssemblyInfo.cs.in gdcm-2.6.0/Wrapping/Csharp/AssemblyInfo.cs.in
 --- gdcm-2.6.0.old/Wrapping/Csharp/AssemblyInfo.cs.in	2015-09-03 16:42:12.000000000 +0200
-+++ gdcm-2.6.0/Wrapping/Csharp/AssemblyInfo.cs.in	2015-10-16 21:31:58.224804457 +0200
-@@ -70,7 +70,7 @@
++++ gdcm-2.6.0/Wrapping/Csharp/AssemblyInfo.cs.in	2015-10-16 22:33:46.022500023 +0200
+@@ -68,9 +68,9 @@
+ // The following attributes specify the key for the sign of your assembly. See the
+ // .NET Framework documentation for more information about signing.
  // This is not required, if you don't want signing let these attributes like they're.
- [assembly: AssemblyDelaySign(false)]
+-[assembly: AssemblyDelaySign(false)]
++[assembly: AssemblyDelaySign(true)]
  // http://msdn.microsoft.com/en-us/library/6f05ezxy(VS.80).aspx
 -[assembly: AssemblyKeyFile("key.snk")]
 +//[assembly: AssemblyKeyFile("key.snk")]
  //[assembly: AssemblyKeyFile("")]
  //[assembly: AssemblyKeyName("GDCM Key")]
  //[assembly: AssemblyKeyName("")]
-diff -ru gdcm-2.6.0.old/Wrapping/Csharp/CMakeLists.txt gdcm-2.6.0/Wrapping/Csharp/CMakeLists.txt
+diff -u gdcm-2.6.0.old/Wrapping/Csharp/CMakeLists.txt gdcm-2.6.0/Wrapping/Csharp/CMakeLists.txt
 --- gdcm-2.6.0.old/Wrapping/Csharp/CMakeLists.txt	2015-09-03 16:42:12.000000000 +0200
-+++ gdcm-2.6.0/Wrapping/Csharp/CMakeLists.txt	2015-10-16 21:32:17.624490442 +0200
++++ gdcm-2.6.0/Wrapping/Csharp/CMakeLists.txt	2015-10-16 21:47:33.000000000 +0200
 @@ -69,7 +69,7 @@
  
    add_custom_command(