[pkg-java] r9431 - trunk/classpath/debian

[Michael Koch]

Author: mkoch
Date: 2009-08-01 20:14:56 +0000 (Sat, 01 Aug 2009)
New Revision: 9431

Modified:
   trunk/classpath/debian/changelog
   trunk/classpath/debian/control
   trunk/classpath/debian/rules
Log:
2:0.98-2 upload

Modified: trunk/classpath/debian/changelog
===================================================================
--- trunk/classpath/debian/changelog	2009-08-01 19:40:31 UTC (rev 9430)
+++ trunk/classpath/debian/changelog	2009-08-01 20:14:56 UTC (rev 9431)
@@ -1,3 +1,11 @@
+classpath (2:0.98-2) unstable; urgency=low
+
+  * Fix build failure when building only arch:any packages
+    (Closes: #539126, #539431).
+  * Build-Depend on xulrunner-dev instead of iceape-dev.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 01 Aug 2009 21:28:05 +0200
+
 classpath (2:0.98-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/classpath/debian/control
===================================================================
--- trunk/classpath/debian/control	2009-08-01 19:40:31 UTC (rev 9430)
+++ trunk/classpath/debian/control	2009-08-01 20:14:56 UTC (rev 9431)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org> 
 Uploaders: Michael Koch <konqueror at gmx.de>, Arnaud Vandyck <avdyk at debian.org>, John Leuner <jewel at debian.org>
-Build-Depends: debhelper (>= 5), ecj [!alpha !arm !hppa !hurd-i386], gcj [!alpha !arm !hppa !hurd-i386], zip, libgtk2.0-dev, libgconf2-dev, libart-2.0-dev, libx11-dev, libice-dev, libxt-dev, libxtst-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libcairo2-dev, dpatch, libqt4-dev (>= 4.1.0), dssi-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], iceape-dev (>=  1.1.9-5), libmagic-dev
+Build-Depends: debhelper (>= 5), ecj [!alpha !arm !hppa !hurd-i386], gcj [!alpha !arm !hppa !hurd-i386], zip, libgtk2.0-dev, libgconf2-dev, libart-2.0-dev, libx11-dev, libice-dev, libxt-dev, libxtst-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libcairo2-dev, dpatch, libqt4-dev (>= 4.1.0), dssi-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], xulrunner-dev (>= 1.9), libmagic-dev
 Build-Depends-Indep: gjdoc (>= 0.7.9)
 Standards-Version: 3.8.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/classpath

Modified: trunk/classpath/debian/rules
===================================================================
--- trunk/classpath/debian/rules	2009-08-01 19:40:31 UTC (rev 9430)
+++ trunk/classpath/debian/rules	2009-08-01 20:14:56 UTC (rev 9431)
@@ -24,6 +24,7 @@
 
 config.status: patch configure
 	dh_testdir
+	CPPFLAGS=-I/usr/include/xulrunner-1.9/unstable \
 	MOC=moc-qt4 ./configure \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
@@ -44,6 +45,7 @@
 
 configure-native-only: patch configure
 	dh_testdir
+	CPPFLAGS=-I/usr/include/xulrunner-1.9/unstable \
 	MOC=moc-qt4 ./configure \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
@@ -53,12 +55,11 @@
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		--disable-dependency-tracking \
-		--with-glibj=none \
+		--with-glibj=both \
 		--disable-tools \
 		--disable-examples \
 		--disable-regen-headers \
 		--without-gjdoc \
-		--enable-gtk-cairo \
 		--enable-qt-peer \
 		$(OPT_ALSA) \
 		--enable-jni