This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository antlr.
commit 9b4ac97a8bb8fa911ce3ba9231d89d9a98384fab
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Wed Jan 27 08:28:33 2016 +0000
Removed the C# package (Closes: #812637)
---
debian/antlr-cil-2.7.pc | 8 --------
debian/changelog | 8 ++++++++
debian/control | 15 +--------------
debian/libantlr2.7-cil.dirs | 1 -
debian/libantlr2.7-cil.install | 3 ---
debian/libantlr2.7-cil.installcligac | 2 --
debian/libantlr2.7-cil.links | 1 -
debian/patches/antlr-cs-signing.patch | 32 --------------------------------
debian/patches/series | 1 -
debian/rules | 19 -------------------
10 files changed, 9 insertions(+), 81 deletions(-)
diff --git a/debian/antlr-cil-2.7.pc b/debian/antlr-cil-2.7.pc
deleted file mode 100644
index 445e747..0000000
--- a/debian/antlr-cil-2.7.pc
+++ /dev/null
@@ -1,8 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/lib/cli/antlr-2.7
-
-Name: Antlr
-Description: language tool for constructing recognizers, compilers etc
-Version: 2.7
-Libs: -r:${libdir}/antlr.runtime.dll -r:${libdir}/antlr.astframe.dll
diff --git a/debian/changelog b/debian/changelog
index 7fc4fe8..82e646d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+antlr (2.7.7+dfsg-7) unstable; urgency=medium
+
+ * Team upload.
+ * Removed the C# package (Closes: #812637)
+ * Rebuild with GCC 5 (Closes: #793215)
+
+ -- Emmanuel Bourg <ebo...@apache.org> Wed, 27 Jan 2016 09:27:20 +0100
+
antlr (2.7.7+dfsg-6) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 52a6c92..994f60b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Torsten Werner <twer...@debian.org>
Build-Depends: debhelper (>= 9), default-jdk, python (>= 2.6.6-3~),
autotools-dev, python-all-dev (>= 2.3.5-11), sharutils
-Build-Depends-Indep: maven-repo-helper, nant, cli-common-dev (>= 0.7),
mono-devel | c-sharp-compiler, libmono-winforms2.0-cil
+Build-Depends-Indep: maven-repo-helper
Standards-Version: 3.9.6
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/antlr
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/antlr
@@ -56,19 +56,6 @@ Description: language tool for constructing recognizers,
compilers etc
.
These are the static libraries for C++.
-Package: libantlr2.7-cil
-Section: cli-mono
-Architecture: all
-Depends: ${misc:Depends}, ${cli:Depends}
-Recommends: antlr
-Description: language tool for constructing recognizers, compilers etc
- ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is
- a language tool that provides a framework for constructing recognizers,
- compilers, and translators from grammatical descriptions containing C++
- or Java actions [You can use PCCTS 1.xx to generate C-based parsers].
- .
- This package contains the C# (CLI) libraries.
-
Package: antlr-doc
Section: doc
Architecture: all
diff --git a/debian/libantlr2.7-cil.dirs b/debian/libantlr2.7-cil.dirs
deleted file mode 100644
index d12d2a0..0000000
--- a/debian/libantlr2.7-cil.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/cli/antlr-2.7
diff --git a/debian/libantlr2.7-cil.install b/debian/libantlr2.7-cil.install
deleted file mode 100644
index 921cc9d..0000000
--- a/debian/libantlr2.7-cil.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/antlr-cil-2.7.pc /usr/lib/pkgconfig
-lib/antlr.astframe.dll /usr/lib/cli/antlr-2.7
-lib/antlr.runtime.dll /usr/lib/cli/antlr-2.7
diff --git a/debian/libantlr2.7-cil.installcligac
b/debian/libantlr2.7-cil.installcligac
deleted file mode 100644
index 649c9d1..0000000
--- a/debian/libantlr2.7-cil.installcligac
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/lib/cli/antlr-2.7/antlr.astframe.dll
-/usr/lib/cli/antlr-2.7/antlr.runtime.dll
diff --git a/debian/libantlr2.7-cil.links b/debian/libantlr2.7-cil.links
deleted file mode 100644
index 4916c3e..0000000
--- a/debian/libantlr2.7-cil.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/pkgconfig/antlr-cil-2.7.pc usr/lib/pkgconfig/antlr-cil.pc
diff --git a/debian/patches/antlr-cs-signing.patch
b/debian/patches/antlr-cs-signing.patch
deleted file mode 100644
index d0b46b0..0000000
--- a/debian/patches/antlr-cs-signing.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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]
diff --git a/debian/patches/series b/debian/patches/series
index f000f90..f61c4f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
gcc.diff
bin___antlr.diff
-antlr-cs-signing.patch
antlr-config.patch
diff --git a/debian/rules b/debian/rules
index 80d380a..d67a360 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export MONO_SHARED_DIR = $(shell pwd)/debian
PACKAGE := antlr
VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut
-d' ' -f2 | cut -d- -f1 | cut -d+ -f1)
@@ -12,7 +11,6 @@ configure-stamp:
dh_testdir
cp /usr/share/misc/config.* scripts
JAVAC='/usr/lib/jvm/default-java/bin/javac -source 1.4' CLASSPATH=`pwd`
JAVA=/usr/lib/jvm/default-java/bin/java \
- CSHARPC=mono-csc \
./configure \
--prefix=/usr \
--mandir=\$${prefix}/share/man
@@ -22,7 +20,6 @@ build-indep: configure build-stamp-indep
build-stamp-indep:
dh_testdir
$(MAKE) -f debian/Makefile.debian build_antlr
- $(MAKE) -C lib/csharp
touch build-stamp-indep
# Do not depend on build-indep as B-D-I may not be available and
@@ -46,7 +43,6 @@ clean:
-rm -f build-stamp build-stamp-indep configure-stamp
[ ! -f debian/Makefile.debian ] || $(MAKE) -f debian/Makefile.debian
clean
-cd lib/cpp; $(MAKE) clean
- -cd lib/csharp; $(MAKE) clean
-rm -rf lib/cpp/src/.deps
-rm -f lib/cpp/config.sub lib/cpp/config.guess lib/cpp/config.cache
lib/cpp/config.log
-rm -f lib/cpp/scripts/config.sub lib/cpp/scripts/config.guess
lib/cpp/scripts/config.cache lib/cpp/scripts/config.log
@@ -57,7 +53,6 @@ clean:
-rm -f scripts/config.guess scripts.config.sub
-rm -f antlr/Version.java
-rm -f debian/libantlr-pic.a
- -rm -f lib/csharp/antlr.astframe/bin/antlr.astframe.xml
lib/csharp/antlr.runtime/bin/antlr.runtime.xml
-rm -f debian/antlr.snk
-rm -rf debian/.wapi
-rm -rf debian/tmp
@@ -96,20 +91,6 @@ install: build
binary-indep: build-indep install-indep
dh_testdir
dh_testroot
- # C# library
- dh_makeclilibs -V -plibantlr2.7-cil
- dh_installcligac -plibantlr2.7-cil
- dh_clideps -plibantlr2.7-cil
- dh_installdocs -plibantlr2.7-cil
- 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
- dh_md5sums -plibantlr2.7-cil
- dh_builddeb -plibantlr2.7-cil
# antlr-doc
dh_installdocs -pantlr-doc
dh_installexamples -pantlr-doc
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/antlr.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
