r1901 - trunk/antlr/debian

[Michael Koch]

Author: mkoch
Date: 2006-02-11 15:52:34 +0000 (Sat, 11 Feb 2006)
New Revision: 1901

Modified:
   trunk/antlr/debian/changelog
   trunk/antlr/debian/control
   trunk/antlr/debian/rules
Log:
* Fixed build of package to not create dirs outside of package root.
* Fix #352203 for real by Build-Depending on autotools-dev and copying the
  needed files.


Modified: trunk/antlr/debian/changelog
===================================================================
--- trunk/antlr/debian/changelog	2006-02-11 10:02:10 UTC (rev 1900)
+++ trunk/antlr/debian/changelog	2006-02-11 15:52:34 UTC (rev 1901)
@@ -1,3 +1,11 @@
+antlr (2.7.6-4) unstable; urgency=low
+
+  * Fixed build of package to not create dirs outside of package root.
+  * Fix #352203 for real by Build-Depending on autotools-dev and copying the
+    needed files.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 11 Feb 2006 16:42:55 +0000
+
 antlr (2.7.6-3) unstable; urgency=low
 
   * Provide static library compile with PIC (Closes: #351618).

Modified: trunk/antlr/debian/control
===================================================================
--- trunk/antlr/debian/control	2006-02-11 10:02:10 UTC (rev 1900)
+++ trunk/antlr/debian/control	2006-02-11 15:52:34 UTC (rev 1901)
@@ -3,7 +3,7 @@
 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), kaffe, fastjar, classpath, jikes-classpath (>= 2:0.12-1), autotools-dev, gcj, libgcj-dev, python
+Build-Depends: debhelper (>= 4), kaffe, fastjar, classpath, jikes-classpath (>= 2:0.12-1), autotools-dev, gcj, libgcj-dev, python, autotools-dev
 Standards-Version: 3.6.2
 
 Package: antlr

Modified: trunk/antlr/debian/rules
===================================================================
--- trunk/antlr/debian/rules	2006-02-11 10:02:10 UTC (rev 1900)
+++ trunk/antlr/debian/rules	2006-02-11 15:52:34 UTC (rev 1901)
@@ -9,6 +9,7 @@
 configure: configure-stamp
 configure-stamp: autotools
 	dh_testdir
+	cp /usr/share/misc/config.* .
 	BOOTCLASSPATH=/usr/share/classpath/glibj.zip JAVAC=jikes-classpath CLASSPATH=`pwd` JAVA=kaffe \
 	./configure \
 		--prefix=/usr \
@@ -63,7 +64,7 @@
 	dh_installdirs
 	install -m755 lib/python/antlr/antlr.py debian/antlr/usr/lib/python2.3/site-packages
 	install -m755 lib/python/antlr/antlr.py debian/antlr/usr/lib/python2.4/site-packages
-	$(MAKE) -C lib/cpp install prefix=`pwd`/../../debian/libantlr-dev/usr
+	$(MAKE) -C lib/cpp install prefix=`pwd`/debian/libantlr-dev/usr
 	mv -f debian/libantlr-pic.a debian/libantlr-dev/usr/lib/
 	install -m755 scripts/antlr-config debian/libantlr-dev/usr/bin
 	install -m755 cantlr debian/cantlr/usr/bin