r1815 - trunk/cacao/debian

[Michael Koch]

Author: mkoch
Date: 2006-01-26 18:12:19 +0000 (Thu, 26 Jan 2006)
New Revision: 1815

Added:
   trunk/cacao/debian/cacao.lintian-overrides
Modified:
   trunk/cacao/debian/cacao.dirs
   trunk/cacao/debian/control
   trunk/cacao/debian/rules
Log:
Further fixes for new upstream release.


Modified: trunk/cacao/debian/cacao.dirs
===================================================================
--- trunk/cacao/debian/cacao.dirs	2006-01-26 18:09:46 UTC (rev 1814)
+++ trunk/cacao/debian/cacao.dirs	2006-01-26 18:12:19 UTC (rev 1815)
@@ -4,3 +4,4 @@
 usr/lib/jvm/cacao/jre/bin
 usr/lib/jvm/cacao/jre/lib
 usr/lib/jvm/cacao/jre/lib/security
+usr/share/lintian/overrides

Added: trunk/cacao/debian/cacao.lintian-overrides
===================================================================
--- trunk/cacao/debian/cacao.lintian-overrides	2006-01-26 18:09:46 UTC (rev 1814)
+++ trunk/cacao/debian/cacao.lintian-overrides	2006-01-26 18:12:19 UTC (rev 1815)
@@ -0,0 +1,5 @@
+cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/jre/lib/jsse.jar ../../../../../share/classpath/glibj.zip
+cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/jre/lib/rt.jar ../../../../../share/classpath/glibj.zip
+cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/jre/lib/jndi.jar ../../../../../share/classpath/glibj.zip
+cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/jre/lib/jdbc-stdext.jar ../../../../../share/classpath/glibj.zip
+cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/jre/lib/jaas.jar ../../../../../share/classpath/glibj.zip

Modified: trunk/cacao/debian/control
===================================================================
--- trunk/cacao/debian/control	2006-01-26 18:09:46 UTC (rev 1814)
+++ trunk/cacao/debian/control	2006-01-26 18:12:19 UTC (rev 1815)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Stephan Michels <stephan at apache.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.0.0), classpath (>= 0.19), classpath-common (>= 0.19), jikes, zip, zlib1g-dev, binutils-dev, libltdl3-dev
+Build-Depends: debhelper (>= 4.0.0), classpath (>= 0.19), classpath-common (>= 0.19), gcj, jikes-classpath, zlib1g-dev, binutils-dev, libltdl3-dev, zip
 Standards-Version: 3.6.2
 
 Package: cacao

Modified: trunk/cacao/debian/rules
===================================================================
--- trunk/cacao/debian/rules	2006-01-26 18:09:46 UTC (rev 1814)
+++ trunk/cacao/debian/rules	2006-01-26 18:12:19 UTC (rev 1815)
@@ -20,8 +20,8 @@
 
 config.status: configure
 	dh_testdir
-	# Add here commands to configure the package.
 	LDFLAGS="$(LDFLAGS) -Wl,-z,defs" \
+	JAVAC="jikes-classpath" \
 	./configure \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
@@ -36,9 +36,7 @@
 build-stamp:  config.status
 	dh_testdir
 
-	# Add here commands to compile the package.
 	$(MAKE)
-	#docbook-to-man debian/cacao.sgml > cacao.1
 
 	touch build-stamp
 
@@ -47,7 +45,6 @@
 	dh_testroot
 	rm -f build-stamp 
 
-	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
 
 	dh_clean 
@@ -58,7 +55,6 @@
 	dh_clean -k 
 	dh_installdirs
 
-	# Add here commands to install the package into debian/cacao.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/cacao
 
 	# Remove files, which conflicts with other programs
@@ -69,18 +65,17 @@
 	rm -rf $(CURDIR)/debian/cacao/usr/include
 	rm -rf $(CURDIR)/debian/cacao/usr/lib
 
-# Build architecture-independent files here.
+	# Install lintian overrides
+	cp debian/cacao.lintian-overrides debian/cacao/usr/share/lintian/overrides/cacao
+
 binary-indep: build install
-# We have nothing to do by default.
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs
 #	dh_install
-#	dh_installdebconf	
 #	dh_installinfo
 	dh_installman
 	dh_link