r2142 - trunk/classpath/debian

Michael Koch mkoch at costa.debian.org
Sat May 27 18:55:12 UTC 2006 

Author: mkoch
Date: 2006-05-27 18:55:11 +0000 (Sat, 27 May 2006)
New Revision: 2142

Modified:
   trunk/classpath/debian/
   trunk/classpath/debian/README.Debian
   trunk/classpath/debian/changelog
   trunk/classpath/debian/classpath-common.install
   trunk/classpath/debian/control
   trunk/classpath/debian/rules
   trunk/classpath/debian/rules.cdbs
Log:
classpath (2:0.91-3) unstable; urgency=low

  * Install header files to /usr/include/classpath.
  * debian/control: classpath: Conflict with jamvm < 1.4.3 and
    cacao < 0.96 (Closes: #368172).

 -- Michael Koch <konqueror at gmx.de>  Sat, 27 May 2006 17:51:11 +0000

classpath (2:0.91-2) unstable; urgency=low

  * Set the correct version moc for architecture specific builds too.

 -- Michael Koch <konqueror at gmx.de>  Tue, 16 May 2006 05:35:36 +0000

classpath (2:0.91-1) unstable; urgency=low

  * New upstream release
    - crash when using cairo (Closes: #358356)
    - includes java.lang.Thread.UncaughtExceptionHandler (Closes: #356805)
  * debian/rules: Don't build tools.zip when only building architecture
    specific stuff. (Closes: #356353)
  * debian/control: Fixed typo. (Closes: #363202)
  * debian/classpath-common.install: Install tools.zip from correct place.
  * debian/rules: Make sure to build with the correct version of moc.
    (Closes: #356663, #356666)
  * Activated MIDI support. (Closes: #338287)
  * Updated Standards-Version to 3.7.2.

 -- Michael Koch <konqueror at gmx.de>  Mon, 15 May 2006 19:50:11 +0000

classpath (2:0.90-1) unstable; urgency=low

  * New upstream release
  * debian/README.Debian: Clarified usage of Graphics2D support.
  * Enabled DSSI support.

 -- Michael Koch <konqueror at gmx.de>  Mon,  6 Mar 2006 22:46:46 +0000




Property changes on: trunk/classpath/debian
___________________________________________________________________
Name: svn:ignore
   + classpath
classpath-doc
jikes-classpath
tmp
files
classpath-common-unzipped
classpath-common
classpath.substvars


Modified: trunk/classpath/debian/README.Debian
===================================================================
--- trunk/classpath/debian/README.Debian	2006-05-25 16:11:42 UTC (rev 2141)
+++ trunk/classpath/debian/README.Debian	2006-05-27 18:55:11 UTC (rev 2142)
@@ -1,10 +1,32 @@
-AWT backends:
-=============
+AWT backends
+============
 
+Graphics2D support
+------------------
+
+To enable Graphics2D support using cairo you need to pass the following to your
+runtime:
+
+  -Dgnu.java.awt.peer.gtk.Graphics=Graphics2D
+
+This can be done like
+
+  jamvm -Dgnu.java.awt.peer.gtk.Graphics=Graphics2D HelloWorldAWT
+
+or
+
+  cacao -Dgnu.java.awt.peer.gtk.Graphics=Graphics2D HelloWorldAWT
+
+Note that Graphics2D support is experimental and not really supported yet upstream.
+
+
+Qt peer
+-------
+
 This version if GNU classpath provides two different backends for graphical
 applications, the GTK peer and the Qt peer. By default the GTK peer is used.
 To enable the Qt peer you need to pass the following to the runtime using
-this version ov GNU classpath:
+this version of GNU classpath:
 
   -Dawt.toolkit=gnu.java.awt.peer.qt.QtToolkit
 

Modified: trunk/classpath/debian/changelog
===================================================================
--- trunk/classpath/debian/changelog	2006-05-25 16:11:42 UTC (rev 2141)
+++ trunk/classpath/debian/changelog	2006-05-27 18:55:11 UTC (rev 2142)
@@ -1,3 +1,41 @@
+classpath (2:0.91-3) unstable; urgency=low
+
+  * Install header files to /usr/include/classpath.
+  * debian/control: classpath: Conflict with jamvm < 1.4.3 and
+    cacao < 0.96 (Closes: #368172).
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 27 May 2006 17:51:11 +0000
+
+classpath (2:0.91-2) unstable; urgency=low
+
+  * Set the correct version moc for architecture specific builds too.
+
+ -- Michael Koch <konqueror at gmx.de>  Tue, 16 May 2006 05:35:36 +0000
+
+classpath (2:0.91-1) unstable; urgency=low
+
+  * New upstream release
+    - crash when using cairo (Closes: #358356)
+    - includes java.lang.Thread.UncaughtExceptionHandler (Closes: #356805)
+  * debian/rules: Don't build tools.zip when only building architecture
+    specific stuff. (Closes: #356353)
+  * debian/control: Fixed typo. (Closes: #363202)
+  * debian/classpath-common.install: Install tools.zip from correct place.
+  * debian/rules: Make sure to build with the correct version of moc.
+    (Closes: #356663, #356666)
+  * Activated MIDI support. (Closes: #338287)
+  * Updated Standards-Version to 3.7.2.
+
+ -- Michael Koch <konqueror at gmx.de>  Mon, 15 May 2006 19:50:11 +0000
+
+classpath (2:0.90-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/README.Debian: Clarified usage of Graphics2D support.
+  * Enabled DSSI support.
+
+ -- Michael Koch <konqueror at gmx.de>  Mon,  6 Mar 2006 22:46:46 +0000
+
 classpath (2:0.20-2) unstable; urgency=low
 
   * Moved package under maintenance of Debian Java Maintainers.

Modified: trunk/classpath/debian/classpath-common.install
===================================================================
--- trunk/classpath/debian/classpath-common.install	2006-05-25 16:11:42 UTC (rev 2141)
+++ trunk/classpath/debian/classpath-common.install	2006-05-27 18:55:11 UTC (rev 2142)
@@ -1 +1,3 @@
-usr/share/classpath/glibj.zip
+usr/share/classpath/glibj.zip usr/share/classpath/
+usr/share/classpath/tools.zip usr/share/classpath/
+usr/include/classpath/*.h usr/include/classpath

Modified: trunk/classpath/debian/control
===================================================================
--- trunk/classpath/debian/control	2006-05-25 16:11:42 UTC (rev 2141)
+++ trunk/classpath/debian/control	2006-05-27 18:55:11 UTC (rev 2142)
@@ -3,21 +3,21 @@
 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 (>= 4.0.0), jikes (>= 1.19) [!arm], gcj [arm], zip, libgtk2.0-dev, libart-2.0-dev, libx11-dev, libice-dev, libxt-dev, libxtst-dev, libasound2-dev, cdbs, libcairo2-dev, dpatch, libqt4-dev (>= 4.1.0)
+Build-Depends: debhelper (>= 4.0.0), jikes (>= 1.19) [!arm], gcj [arm], zip, libgtk2.0-dev, libart-2.0-dev, libx11-dev, libice-dev, libxt-dev, libxtst-dev, libasound2-dev, cdbs, libcairo2-dev, dpatch, libqt4-dev (>= 4.1.0), dssi-dev, ladspa-sdk, libjack0.100.0-dev
 Build-Depends-Indep: gjdoc (>= 0.7.5-4)
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: classpath
 Architecture: any
 Depends: libgcj-common, classpath-common (>= 2:0.13-1), ${shlibs:Depends}
-Conflicts: libgcj3 (<= 1:3.2-0pre1)
+Conflicts: libgcj3 (<= 1:3.2-0pre1), jamvm (<< 1.4.3), cacao (<< 0.96)
 Description: clean room standard Java libraries
  Our goal is to provide a free replacement for Sun's proprietary class 
  libraries so that the GNU system can run programs written in the Java 
  language. 
  .
  GNU Classpath makes it possible to compile DFSG-free programs written
- in the Java language without depending on proprietrary class libraries.
+ in the Java language without depending on proprietary class libraries.
  .
  GNU Classpath can be used to run Java applications without depending on 
  proprietary software.

Modified: trunk/classpath/debian/rules
===================================================================
--- trunk/classpath/debian/rules	2006-05-25 16:11:42 UTC (rev 2141)
+++ trunk/classpath/debian/rules	2006-05-27 18:55:11 UTC (rev 2142)
@@ -26,10 +26,11 @@
 
 config.status: patch configure
 	dh_testdir
-	./configure \
+	MOC=moc-qt4 ./configure \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr \
+		--includedir=\$${prefix}/include/classpath \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		--disable-dependency-tracking \
@@ -37,16 +38,18 @@
 		$(OPT_COMPILER) \
 		--enable-gtk-cairo \
 		--enable-qt-peer \
+		--enable-dssi \
 		--enable-jni \
 		--with-gjdoc
 	touch configured-stamp
 
 configure-native-only: patch configure
 	dh_testdir
-	./configure \
+	MOC=moc-qt4 ./configure \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr \
+		--includedir=\$${prefix}/include/classpath \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		--disable-dependency-tracking \
@@ -54,7 +57,10 @@
 		$(OPT_COMPILER) \
 		--enable-gtk-cairo \
 		--enable-qt-peer \
+		--enable-dssi \
 		--enable-jni
+	sed -e 's/^\(SUBDIRS.*\) tools/\1/' < Makefile > Makefile.tmp
+	mv Makefile.tmp Makefile
 	touch configured-stamp
 
 build:
@@ -98,6 +104,9 @@
 	# Remove common files with libgcj
 	rm -rf $(CURDIR)/debian/tmp/usr/lib/security
 	
+	# Remove java sources for the tools
+	find $(CURDIR)/debian/tmp/usr/share/classpath/tools/gnu/classpath/tools -name \*.java | xargs rm -f
+	
 	# Install jikes wrapper
 	mkdir $(CURDIR)/debian/tmp/usr/bin
 	cp $(CURDIR)/debian/wrappers/jikes-classpath debian/tmp/usr/bin

Modified: trunk/classpath/debian/rules.cdbs
===================================================================
--- trunk/classpath/debian/rules.cdbs	2006-05-25 16:11:42 UTC (rev 2141)
+++ trunk/classpath/debian/rules.cdbs	2006-05-27 18:55:11 UTC (rev 2142)
@@ -20,6 +20,7 @@
 
 # Workaround a jikes bug on arm (jikes gets into an endless loop).
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_CONFIGURE_SCRIPT_ENV := MOC=moc-qt4
 ifeq ($(DEB_BUILD_ARCH),arm)
 	DEB_CONFIGURE_USER_FLAGS := --with-glibj=both --with-gcj --enable-gtk-cairo
 else

More information about the pkg-java-commits mailing list