[pkg-java] r10318 - in trunk/antlr/debian: . patches

[Michael Koch]

Author: mkoch
Date: 2009-09-07 20:24:47 +0000 (Mon, 07 Sep 2009)
New Revision: 10318

Added:
   trunk/antlr/debian/patches/antlr-cs-signing.patch
Modified:
   trunk/antlr/debian/changelog
   trunk/antlr/debian/compat
   trunk/antlr/debian/control
   trunk/antlr/debian/patches/series
   trunk/antlr/debian/rules
Log:
antlr (2.7.7-14) unstable; urgency=low

  * Add debian/patches/antlr-cs-signing.patch to sign C# dlls
    (Closes: #540737).
  * Add debian/patches/antlr-config.patch to support --cxxflags
    for antlr-config (Closes: #523051).
  * Build-Depend on debhelper (>= 5) and cli-common-dev (>= 0.7).
  * Make sure DLLs in libantlr2.7-cli are not executable.
  * Moved source, libantlr-java and libantlr-java-gcj to section java.
  * Moved libantlr2.7-cil to section cli-mono.
  * Updated Standards-Version to 3.8.3.

 -- Michael Koch <konqueror at gmx.de>  Mon, 07 Sep 2009 21:44:27 +0200



Modified: trunk/antlr/debian/changelog
===================================================================
--- trunk/antlr/debian/changelog	2009-09-07 17:09:55 UTC (rev 10317)
+++ trunk/antlr/debian/changelog	2009-09-07 20:24:47 UTC (rev 10318)
@@ -1,3 +1,17 @@
+antlr (2.7.7-14) unstable; urgency=low
+
+  * Add debian/patches/antlr-cs-signing.patch to sign C# dlls
+    (Closes: #540737).
+  * Add debian/patches/antlr-config.patch to support --cxxflags
+    for antlr-config (Closes: #523051).
+  * Build-Depend on debhelper (>= 5) and cli-common-dev (>= 0.7).
+  * Make sure DLLs in libantlr2.7-cli are not executable.
+  * Moved source, libantlr-java and libantlr-java-gcj to section java.
+  * Moved libantlr2.7-cil to section cli-mono.
+  * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de>  Mon, 07 Sep 2009 21:44:27 +0200
+
 antlr (2.7.7-13) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/antlr/debian/compat
===================================================================
--- trunk/antlr/debian/compat	2009-09-07 17:09:55 UTC (rev 10317)
+++ trunk/antlr/debian/compat	2009-09-07 20:24:47 UTC (rev 10318)
@@ -1 +1 @@
-4
+5

Modified: trunk/antlr/debian/control
===================================================================
--- trunk/antlr/debian/control	2009-09-07 17:09:55 UTC (rev 10317)
+++ trunk/antlr/debian/control	2009-09-07 20:24:47 UTC (rev 10318)
@@ -1,11 +1,11 @@
 Source: antlr
-Section: devel
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, John Leuner <jewel at debian.org>, Michael Koch <konqueror at gmx.de>, Barry Hawkins <barry at bytemason.org>, Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 4), default-jdk-builddep, python, autotools-dev, python-all-dev (>= 2.3.5-11), sharutils, java-gcj-compat-dev, quilt
-Build-Depends-Indep: maven-repo-helper, python-support (>= 0.3), nant, cli-common-dev (>= 0.4.4), mono-devel | c-sharp-compiler, libmono-winforms2.0-cil
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 5), default-jdk-builddep, python, autotools-dev, python-all-dev (>= 2.3.5-11), sharutils, java-gcj-compat-dev, quilt
+Build-Depends-Indep: maven-repo-helper, python-support (>= 0.3), nant, cli-common-dev (>= 0.7), mono-devel | c-sharp-compiler, libmono-winforms2.0-cil
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/antlr
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/antlr
 Homepage: http://www.antlr2.org/
@@ -43,7 +43,6 @@
  to be able to bootstrap gcj without a dependency on a java runtime.
 
 Package: libantlr-java-gcj
-Section: devel
 Architecture: any
 Depends: ${misc:Depends}, libantlr-java (>= ${source:Version}),
  ${shlibs:Depends}
@@ -69,7 +68,7 @@
  These are the static libraries for C++.
 
 Package: libantlr2.7-cil
-Section: libdevel
+Section: cli-mono
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: antlr

Added: trunk/antlr/debian/patches/antlr-cs-signing.patch
===================================================================
--- trunk/antlr/debian/patches/antlr-cs-signing.patch	                        (rev 0)
+++ trunk/antlr/debian/patches/antlr-cs-signing.patch	2009-09-07 20:24:47 UTC (rev 10318)
@@ -0,0 +1,32 @@
+--- antlr-2.7.7.orig/lib/csharp/antlr.astframe/AssemblyInfo.cs
++++ antlr-2.7.7/lib/csharp/antlr.astframe/AssemblyInfo.cs
+@@ -31,12 +31,10 @@
+ 
+ [assembly: CLSCompliantAttribute(true)]
+ 
+-#if STRONGNAME
+ #pragma warning disable 1699
+ [assembly: AssemblyDelaySign(false)]
+-[assembly: AssemblyKeyFile("org.antlr.snk")]
++[assembly: AssemblyKeyFile("/usr/share/cli-common/keys/mono.snk")]
+ #pragma warning restore 1699
+-#endif
+ 
+ 
+ #if APTC
+--- antlr-2.7.7.orig/lib/csharp/antlr.runtime/AssemblyInfo.cs
++++ antlr-2.7.7/lib/csharp/antlr.runtime/AssemblyInfo.cs
+@@ -32,12 +32,10 @@
+ 
+ [assembly: CLSCompliantAttribute(true)]
+ 
+-#if STRONGNAME
+ #pragma warning disable 1699
+ [assembly: AssemblyDelaySign(false)]
+-[assembly: AssemblyKeyFile("org.antlr.snk")]
++[assembly: AssemblyKeyFile("/usr/share/cli-common/keys/mono.snk")]
+ #pragma warning restore 1699
+-#endif
+ 
+ #if APTC
+ [assembly: System.Security.AllowPartiallyTrustedCallers]

Modified: trunk/antlr/debian/patches/series
===================================================================
--- trunk/antlr/debian/patches/series	2009-09-07 17:09:55 UTC (rev 10317)
+++ trunk/antlr/debian/patches/series	2009-09-07 20:24:47 UTC (rev 10318)
@@ -1,2 +1,4 @@
 gcc.diff
 bin___antlr.diff
+antlr-cs-signing.patch
+antlr-config.patch

Modified: trunk/antlr/debian/rules
===================================================================
--- trunk/antlr/debian/rules	2009-09-07 17:09:55 UTC (rev 10317)
+++ trunk/antlr/debian/rules	2009-09-07 20:24:47 UTC (rev 10318)
@@ -117,6 +117,7 @@
 	dh_installexamples -plibantlr2.7-cil
 	dh_installchangelogs -plibantlr2.7-cil
 	dh_fixperms -plibantlr2.7-cil
+	chmod a-x debian/libantlr2.7-cil/usr/lib/cli/antlr-2.7/antlr.*.dll
 	dh_compress -plibantlr2.7-cil
 	dh_installdeb -plibantlr2.7-cil
 	dh_gencontrol -plibantlr2.7-cil