[pkg-java] r6502 - trunk/antlr/debian

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-05-30 20:02:51 +0000 (Fri, 30 May 2008)
New Revision: 6502

Modified:
   trunk/antlr/debian/changelog
   trunk/antlr/debian/control
   trunk/antlr/debian/rules
Log:
antlr (2.7.7-6) unstable; urgency=low

  * Made libantlr-cil arch:all, fixed debian/rules to build it only be
    building arch:all stuff and moved all the needed build dependencies to
    Build-Depends-Indep. Closes: 483558.

 -- Michael Koch <konqueror at gmx.de>  Fri, 30 May 2008 21:24:44 +0200



Modified: trunk/antlr/debian/changelog
===================================================================
--- trunk/antlr/debian/changelog	2008-05-28 21:20:47 UTC (rev 6501)
+++ trunk/antlr/debian/changelog	2008-05-30 20:02:51 UTC (rev 6502)
@@ -1,3 +1,11 @@
+antlr (2.7.7-6) unstable; urgency=low
+
+  * Made libantlr-cil arch:all, fixed debian/rules to build it only be
+    building arch:all stuff and moved all the needed build dependencies to
+    Build-Depends-Indep. Closes: 483558.
+
+ -- Michael Koch <konqueror at gmx.de>  Fri, 30 May 2008 21:24:44 +0200
+
 antlr (2.7.7-5) unstable; urgency=low
 
   * Build-Depends on default-jdk-builddep. Closes: #477843

Modified: trunk/antlr/debian/control
===================================================================
--- trunk/antlr/debian/control	2008-05-28 21:20:47 UTC (rev 6501)
+++ trunk/antlr/debian/control	2008-05-30 20:02:51 UTC (rev 6502)
@@ -3,8 +3,8 @@
 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>
-Build-Depends: debhelper (>= 4), default-jdk-builddep, gcj, python, autotools-dev, python-all-dev (>= 2.3.5-11), nant, cli-common-dev, mono-mcs (>= 1.0) | c-sharp-compiler, sharutils
-Build-Depends-Indep: python-support (>= 0.3)
+Build-Depends: debhelper (>= 4), default-jdk-builddep, gcj, python, autotools-dev, python-all-dev (>= 2.3.5-11), sharutils
+Build-Depends-Indep: python-support (>= 0.3), nant, cli-common-dev (>= 0.4.4), mono-mcs (>= 1.0) | c-sharp-compiler
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/antlr
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/antlr
@@ -42,7 +42,7 @@
 
 Package: libantlr2.7-cil
 Section: libdevel
-Architecture: any
+Architecture: all
 Recommends: antlr
 Description: language tool for constructing recognizers, compilers etc
  ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is

Modified: trunk/antlr/debian/rules
===================================================================
--- trunk/antlr/debian/rules	2008-05-28 21:20:47 UTC (rev 6501)
+++ trunk/antlr/debian/rules	2008-05-30 20:02:51 UTC (rev 6502)
@@ -18,6 +18,7 @@
 build-stamp-indep:
 	dh_testdir
 	$(MAKE) -f debian/Makefile.debian build_antlr
+	$(MAKE) -C lib/csharp
 	touch build-stamp-indep
 
 build: configure build-stamp
@@ -29,7 +30,6 @@
 	mv -f lib/cpp/src/libantlr.a debian/libantlr-pic.a
 	$(MAKE) -C lib/cpp clean
 	$(MAKE) -C lib/cpp
-	$(MAKE) -C lib/csharp
 	touch build-stamp
 
 clean:
@@ -58,9 +58,9 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
-	dh_install
-	dh_link
+	dh_installdirs -i
+	dh_install -i
+	dh_link -i
 	$(MAKE) -f debian/Makefile.debian install DESTDIR=`pwd`/debian/antlr
 	install -m644 lib/python/antlr/antlr.py debian/antlr/usr/share/python-support/antlr
 	install -m644 CHANGES.txt debian/antlr/usr/share/doc/antlr/changelog
@@ -70,9 +70,9 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
-	dh_install
-	dh_link
+	dh_installdirs -a
+	dh_install -a
+	dh_link -a
 	$(MAKE) -C lib/cpp install prefix=`pwd`/debian/libantlr-dev/usr
 	install -m755 scripts/antlr-config debian/libantlr-dev/usr/bin
 	install -m755 cantlr debian/cantlr/usr/bin
@@ -83,11 +83,11 @@
 binary-indep: build-indep install-indep
 	dh_testdir 
 	dh_testroot
-#
-# C# library
-	dh_makeclilibs -V
-	dh_installcligac 
-	dh_clideps 
+	
+	# 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
@@ -97,9 +97,8 @@
 	dh_gencontrol -plibantlr2.7-cil
 	dh_md5sums -plibantlr2.7-cil
 	dh_builddeb -plibantlr2.7-cil
-
-#
-#   antlr-doc:
+	
+	# antlr-doc
 	dh_installdocs -pantlr-doc
 	dh_installexamples -pantlr-doc
 	dh_installchangelogs -pantlr-doc
@@ -114,19 +113,17 @@
 	dh_md5sums -pantlr-doc
 	dh_builddeb -pantlr-doc
 	
-#
-# antlr
+	# antlr
 	dh_installman -pantlr
 	dh_installdocs -pantlr
 	dh_installchangelogs -pantlr
 	dh_link -pantlr usr/share/java/antlr.jar usr/share/java/antlr.debug.jar usr/share/java/antlr.jar usr/share/java/antlrall.jar
 	dh_pysupport -pantlr
-	dh_strip
+	dh_strip -pantlr
 	dh_compress -pantlr
 	dh_fixperms -pantlr
 	dh_makeshlibs -pantlr
 	dh_installdeb -pantlr
-#	dh_perl
 	dh_shlibdeps -pantlr
 	dh_gencontrol -pantlr
 	dh_md5sums -pantlr
@@ -134,21 +131,18 @@
 
 
 binary-arch: build install
-#
-# libantlr-dev and cantlr
+	# ibantlr-dev and cantlr
 	dh_testdir
 	dh_testroot
 	dh_installdocs -plibantlr-dev -pcantlr
 	dh_installexamples -plibantlr-dev -pcantlr
 	dh_installman -pcantlr
 	dh_installchangelogs -plibantlr-dev -pcantlr
-#	dh_link
-	dh_strip
+	dh_strip -plibantlr-dev -pcantlr
 	dh_compress -plibantlr-dev -pcantlr
 	dh_fixperms -plibantlr-dev -pcantlr
 	dh_makeshlibs -plibantlr-dev -pcantlr
 	dh_installdeb -plibantlr-dev -pcantlr
-#	dh_perl
 	dh_shlibdeps -plibantlr-dev -pcantlr
 	dh_gencontrol -plibantlr-dev -pcantlr
 	dh_md5sums -plibantlr-dev -pcantlr