[pkg-java] r3819 - in trunk/classpath/debian: . patches

mkoch at alioth.debian.org mkoch at alioth.debian.org
Wed Jul 11 22:58:07 UTC 2007


Author: mkoch
Date: 2007-07-11 22:58:07 +0000 (Wed, 11 Jul 2007)
New Revision: 3819

Added:
   trunk/classpath/debian/classpath-gtkpeer.install
   trunk/classpath/debian/classpath-qtpeer.install
   trunk/classpath/debian/patches/00list
   trunk/classpath/debian/patches/10_appletviewer.dpatch
Modified:
   trunk/classpath/debian/README.Debian
   trunk/classpath/debian/changelog
   trunk/classpath/debian/classpath.install
   trunk/classpath/debian/control
   trunk/classpath/debian/gcjwebplugin.install
   trunk/classpath/debian/rules
Log:
classpath (2:0.95-1) unstable; urgency=low

  * New upstream release. Closes: #426141.
    - fixes NPE in BasicToolBarUI.setBorderToNonRollover.
      Closes: #387425.
    - fixes FTBFS in gcjwebplugin.cc. Closes: #427183.
    - fixes includes for XPCOM headers. Closes: #414106.
    - fixes menubar. Closes: #413295.
  * debian/control: Use ${source:Version} instead of ${Source-Version}.
  * debian/rules: Make "${MAKE} distclean" more safe.

 -- Michael Koch <konqueror at gmx.de>  Thu, 28 Jun 2007 07:05:44 +0200

classpath (2:0.93-1) experimental; urgency=low

  * Upload to experimental.
  * New upstream release.
  * Updated config.guess and config.sub.

 -- Michael Koch <konqueror at gmx.de>  Sat, 17 Feb 2007 08:56:00 +0100

classpath (2:0.92-4) unstable; urgency=low

  * Include /usr/lib/classpath/libgconfpeer.so.0.0.0 (Closes: #387318).
  * Always build-depend on libxul-dev, all architectures have it now
    (Closes: #372851).
  * Corrected Conflicts and Replaces for classpath-qtpeer: epoch was
    missing.
  * Don't set links for libjawt.so. Not needed anymore.

 -- Michael Koch <konqueror at gmx.de>  Sun, 14 Jan 2007 21:35:45 +0100

classpath (2:0.92-3.1) unstable; urgency=low

  * Non-maintainer upload.
  * Corrected Conflicts and Replaces for classpath-gtkpeer: epoch was
    missing. (Closes: #387983)

 -- Franz Pletz <fpletz at franz-pletz.org>  Sun, 15 Oct 2006 15:59:02 +0200

classpath (2:0.92-3) unstable; urgency=low

  * Build tools correctly on binary-arch-only builds (Closes: #387033).
  * Added /usr/lib/classpath/libgconfpeer.so to classpath package
    (Closes: #387318).
  * Build-Depends on libmagic-dev.

 -- Michael Koch <konqueror at gmx.de>  Wed, 13 Sep 2006 16:35:23 +0000

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

  * debian/control: Added Build-Depends on libgconf2-dev (Closes: #386940).
  * debian/control: classpath-gtkpeer, classpath-qtpeer: Added Replaces on
    classpath (<< 0.92-1) and Conflicts (<< 0.92-1) (Closes: #386917, #386919).

 -- Michael Koch <konqueror at gmx.de>  Mon, 11 Sep 2006 17:28:17 +0000

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

  * New upstream release (Closes: #385369, #384354).
    - Adjusted debian/patches/10_appletviewer.dpatch to patch gappletviewer.
  * debian/control: Don't Build-Depends on cdbs.

 -- Michael Koch <konqueror at gmx.de>  Sat,  9 Sep 2006 07:39:01 +0000

classpath (2:0.91+cvs20060611-2) experimental; urgency=low

  * Honors disabled Java setting in Firefox (Closes: #266906).
  * debian/control: Moved gcjwebplugin to Section: net.
  * debian/control: Don't Build-Depends on sound dependencies on kfreebsd-i386,
    kfreebsd-amd64 and hurd-i386.
  * debian/rules: Enable sound support only on linux (Closes: #372851).
  * debian/README.Debian: Removed description for enabling Graphics2D support.
    It's used by default now.
  * debian/control: Build-Depends on libxul-dev (Closes: #373791).

 -- Michael Koch <konqueror at gmx.de>  Sun, 18 Jun 2006 11:04:50 +0000



Modified: trunk/classpath/debian/README.Debian
===================================================================
--- trunk/classpath/debian/README.Debian	2007-07-11 22:56:19 UTC (rev 3818)
+++ trunk/classpath/debian/README.Debian	2007-07-11 22:58:07 UTC (rev 3819)
@@ -1,31 +1,14 @@
 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
+applications, the GTK peer provided by the classpath-gtkpeer package and the
+Qt peer provided by the classpath-qtpeer package. By default the GTK peer is
+installed and used.  To enable the Qt peer you need to install the
+classpath-qtpeer package and pass the following to the runtime using
 this version of GNU classpath:
 
   -Dawt.toolkit=gnu.java.awt.peer.qt.QtToolkit

Modified: trunk/classpath/debian/changelog
===================================================================
--- trunk/classpath/debian/changelog	2007-07-11 22:56:19 UTC (rev 3818)
+++ trunk/classpath/debian/changelog	2007-07-11 22:58:07 UTC (rev 3819)
@@ -1,3 +1,81 @@
+classpath (2:0.95-1) unstable; urgency=low
+
+  * New upstream release. Closes: #426141.
+    - fixes NPE in BasicToolBarUI.setBorderToNonRollover.
+      Closes: #387425.
+    - fixes FTBFS in gcjwebplugin.cc. Closes: #427183.
+    - fixes includes for XPCOM headers. Closes: #414106.
+    - fixes menubar. Closes: #413295.
+  * debian/control: Use ${source:Version} instead of ${Source-Version}.
+  * debian/rules: Make "${MAKE} distclean" more safe.
+
+ -- Michael Koch <konqueror at gmx.de>  Thu, 28 Jun 2007 07:05:44 +0200
+
+classpath (2:0.93-1) experimental; urgency=low
+
+  * Upload to experimental.
+  * New upstream release.
+  * Updated config.guess and config.sub.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 17 Feb 2007 08:56:00 +0100
+
+classpath (2:0.92-4) unstable; urgency=low
+
+  * Include /usr/lib/classpath/libgconfpeer.so.0.0.0 (Closes: #387318).
+  * Always build-depend on libxul-dev, all architectures have it now
+    (Closes: #372851).
+  * Corrected Conflicts and Replaces for classpath-qtpeer: epoch was
+    missing.
+  * Don't set links for libjawt.so. Not needed anymore.
+
+ -- Michael Koch <konqueror at gmx.de>  Sun, 14 Jan 2007 21:35:45 +0100
+
+classpath (2:0.92-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Corrected Conflicts and Replaces for classpath-gtkpeer: epoch was
+    missing. (Closes: #387983)
+
+ -- Franz Pletz <fpletz at franz-pletz.org>  Sun, 15 Oct 2006 15:59:02 +0200
+
+classpath (2:0.92-3) unstable; urgency=low
+
+  * Build tools correctly on binary-arch-only builds (Closes: #387033).
+  * Added /usr/lib/classpath/libgconfpeer.so to classpath package
+    (Closes: #387318).
+  * Build-Depends on libmagic-dev.
+
+ -- Michael Koch <konqueror at gmx.de>  Wed, 13 Sep 2006 16:35:23 +0000
+
+classpath (2:0.92-2) unstable; urgency=low
+
+  * debian/control: Added Build-Depends on libgconf2-dev (Closes: #386940).
+  * debian/control: classpath-gtkpeer, classpath-qtpeer: Added Replaces on
+    classpath (<< 0.92-1) and Conflicts (<< 0.92-1) (Closes: #386917, #386919).
+
+ -- Michael Koch <konqueror at gmx.de>  Mon, 11 Sep 2006 17:28:17 +0000
+
+classpath (2:0.92-1) unstable; urgency=low
+
+  * New upstream release (Closes: #385369, #384354).
+    - Adjusted debian/patches/10_appletviewer.dpatch to patch gappletviewer.
+  * debian/control: Don't Build-Depends on cdbs.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat,  9 Sep 2006 07:39:01 +0000
+
+classpath (2:0.91+cvs20060611-2) experimental; urgency=low
+
+  * Honors disabled Java setting in Firefox (Closes: #266906).
+  * debian/control: Moved gcjwebplugin to Section: net.
+  * debian/control: Don't Build-Depends on sound dependencies on kfreebsd-i386,
+    kfreebsd-amd64 and hurd-i386.
+  * debian/rules: Enable sound support only on linux (Closes: #372851).
+  * debian/README.Debian: Removed description for enabling Graphics2D support.
+    It's used by default now.
+  * debian/control: Build-Depends on libxul-dev (Closes: #373791).
+
+ -- Michael Koch <konqueror at gmx.de>  Sun, 18 Jun 2006 11:04:50 +0000
+
 classpath (2:0.91+cvs20060611-1) experimental; urgency=low
 
   * New upstream release

Added: trunk/classpath/debian/classpath-gtkpeer.install
===================================================================
--- trunk/classpath/debian/classpath-gtkpeer.install	                        (rev 0)
+++ trunk/classpath/debian/classpath-gtkpeer.install	2007-07-11 22:58:07 UTC (rev 3819)
@@ -0,0 +1 @@
+usr/lib/classpath/libgtkpeer.*

Added: trunk/classpath/debian/classpath-qtpeer.install
===================================================================
--- trunk/classpath/debian/classpath-qtpeer.install	                        (rev 0)
+++ trunk/classpath/debian/classpath-qtpeer.install	2007-07-11 22:58:07 UTC (rev 3819)
@@ -0,0 +1 @@
+usr/lib/classpath/libqtpeer.*

Modified: trunk/classpath/debian/classpath.install
===================================================================
--- trunk/classpath/debian/classpath.install	2007-07-11 22:56:19 UTC (rev 3818)
+++ trunk/classpath/debian/classpath.install	2007-07-11 22:58:07 UTC (rev 3819)
@@ -1,4 +1,17 @@
-usr/lib/classpath/jarsigner
-usr/lib/classpath/keytool
-usr/lib/classpath/lib*
-usr/share/info/vmintegration.info
+usr/lib/classpath/gjar
+usr/lib/classpath/gjarsigner
+usr/lib/classpath/gjavah
+usr/lib/classpath/gkeytool
+usr/lib/classpath/gnative2ascii
+usr/lib/classpath/gorbd
+usr/lib/classpath/grmic
+usr/lib/classpath/grmid
+usr/lib/classpath/grmiregistry
+usr/lib/classpath/gserialver
+usr/lib/classpath/gtnameserv
+usr/lib/classpath/libgconfpeer*
+usr/lib/classpath/libgj*
+usr/lib/classpath/libj*
+
+usr/share/info/cp-tools.info
+usr/share/info/cp-vmintegration.info

Modified: trunk/classpath/debian/control
===================================================================
--- trunk/classpath/debian/control	2007-07-11 22:56:19 UTC (rev 3818)
+++ trunk/classpath/debian/control	2007-07-11 22:58:07 UTC (rev 3819)
@@ -3,16 +3,16 @@
 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), dssi-dev, ladspa-sdk, libjack0.100.0-dev
+Build-Depends: debhelper (>= 4.0.0), ecj-bootstrap, zip, libgtk2.0-dev, libgconf2-dev, libart-2.0-dev, libx11-dev, libice-dev, libxt-dev, libxtst-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libcairo2-dev, dpatch, libqt4-dev (>= 4.1.0), dssi-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], ladspa-sdk [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libjack0.100.0-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxul-dev, libmagic-dev
 Build-Depends-Indep: gjdoc (>= 0.7.5-4)
 Standards-Version: 3.7.2
 
 Package: classpath
 Architecture: any
-Depends: libgcj-common, classpath-common (>= 2:0.13-1), ${shlibs:Depends}
+Depends: libgcj-common, classpath-common (>= 2:0.13-1), classpath-gtkpeer (= ${binary:Version}), ${shlibs:Depends}
 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 
+ GNU classpath provides a free replacement for Sun's proprietary class 
  libraries so that the GNU system can run programs written in the Java 
  language. 
  .
@@ -22,38 +22,127 @@
  GNU Classpath can be used to run Java applications without depending on 
  proprietary software.
 
+Package: classpath-gtkpeer
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: classpath (<< 2:0.92-1)
+Conflicts: classpath (<< 2:0.92-1)
+Description: clean room standard Java libraries - GTK AWT peer
+ GNU classpath provides 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 proprietary class libraries.
+ .
+ GNU Classpath can be used to run Java applications without depending on 
+ proprietary software.
+ .
+ This package contains the GTK AWT peer to run GUI applications.
+
+Package: classpath-qtpeer
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: classpath (<< 2:0.92-1)
+Conflicts: classpath (<< 2:0.92-1)
+Description: clean room standard Java libraries - QT AWT peer
+ GNU classpath provides 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 proprietary class libraries.
+ .
+ GNU Classpath can be used to run Java applications without depending on 
+ proprietary software.
+ .
+ This package contains the QT AWT peer to run GUI applications.
+ .
+  Homepage: http://www.classpath.org/
+
 Package: classpath-common
 Architecture: all
 Conflicts: libgcj3 (<= 1:3.2-0pre1), jamvm (<< 1.3.2-2)
 Replaces: classpath (<= 2:0.07-2)
-Description: architecture independent files
- Contains the GNU Classpath .class files in the glibj.zip archive
+Description: clean room standard Java libraries - architecture independent files
+ GNU classpath provides 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 proprietary class libraries.
+ .
+ GNU Classpath can be used to run Java applications without depending on 
+ proprietary software.
+ .
+ This package contains the GNU Classpath .class files in the glibj.zip archive
+ .
+  Homepage: http://www.classpath.org/
 
 Package: classpath-common-unzipped
 Architecture: all
-Description: architecture independent files
- Contains the GNU Classpath .class files unzipped.
+Description: clean room standard Java libraries - architecture independent files
+ GNU classpath provides 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 proprietary class libraries.
+ .
+ GNU Classpath can be used to run Java applications without depending on 
+ proprietary software.
+ .
+ This package contains the GNU Classpath .class files in the glibj.zip archive
+ .
+  Homepage: http://www.classpath.org/
 
 Package: classpath-doc
 Architecture: all
 Section: doc
-Description: free Java API documentation
- This documentation is generated from the GNU Classpath
+Description: clean room standard Java libraries - free Java API documentation
+ GNU classpath provides 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 proprietary class libraries.
+ .
+ GNU Classpath can be used to run Java applications without depending on 
+ proprietary software.
+ .
+ This package contains the documentation is generated from the GNU Classpath
  implementation of the Java runtime libraries.
+ .
+  Homepage: http://www.classpath.org/
 
 Package: jikes-classpath
 Architecture: all
 Depends: jikes, classpath, java-common
 Provides: java-compiler
-Description: wrapper for jikes using classes from Classpath package
+Description: clean room standard Java libraries - wrapper for jikes
+ GNU classpath provides 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 proprietary class libraries.
+ .
+ GNU Classpath can be used to run Java applications without depending on 
+ proprietary software.
+ .
  This package provides a jikes wrapper called jikes-classpath that will 
  include GNU Java's classes from the classpath package in jikes' 
  bootclasspath.
+ .
+  Homepage: http://www.classpath.org/
 
 Package: gcjwebplugin
 Architecture: any
+Section: net
 Depends: ${shlibs:Depends}, cacao | jamvm
 Recommends: mozilla-firefox | www-browser
 Description: web browser plugin to execute Java (tm) applets
- gcjwebplugin is a little web browser plugin to execute Java (tm) applets.
+ gcjwebplugin is a little web browser plugin to execute Java applets.
  It is targeted for Mozilla and compatible browsers that support the NPAPI.
+ .
+  Homepage: http://www.classpath.org/

Modified: trunk/classpath/debian/gcjwebplugin.install
===================================================================
--- trunk/classpath/debian/gcjwebplugin.install	2007-07-11 22:56:19 UTC (rev 3818)
+++ trunk/classpath/debian/gcjwebplugin.install	2007-07-11 22:58:07 UTC (rev 3819)
@@ -1,2 +1,6 @@
-usr/lib/classpath/appletviewer usr/lib/classpath
-usr/lib/libgcjwebplugin.so usr/lib/classpath
+usr/lib/classpath/gappletviewer usr/lib/classpath
+
+usr/share/man/man1/gappletviewer.1
+
+usr/lib/classpath/libgcjwebplugin.la usr/lib/classpath
+usr/lib/classpath/libgcjwebplugin.so usr/lib/classpath

Added: trunk/classpath/debian/patches/00list
===================================================================
--- trunk/classpath/debian/patches/00list	                        (rev 0)
+++ trunk/classpath/debian/patches/00list	2007-07-11 22:58:07 UTC (rev 3819)
@@ -0,0 +1 @@
+10_appletviewer.dpatch

Added: trunk/classpath/debian/patches/10_appletviewer.dpatch
===================================================================
--- trunk/classpath/debian/patches/10_appletviewer.dpatch	                        (rev 0)
+++ trunk/classpath/debian/patches/10_appletviewer.dpatch	2007-07-11 22:58:07 UTC (rev 3819)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_test.dpatch by  <konqueror at gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds runtime selection of the runtime to the appletviewer tool
+
+ at DPATCH@
+--- classpath/tools/gappletviewer.in.orig	2006-06-17 11:20:28.000000000 +0000
++++ classpath/tools/gappletviewer.in	2006-06-11 14:46:00.000000000 +0000
+@@ -43,4 +43,10 @@
+ tools_dir=@datadir@/@PACKAGE@
+ tools_cp=${tools_dir}/tools.zip
+ 
+-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.appletviewer.Main "$@"
++if [ -x /usr/bin/cacao ]; then
++  JAVACMD=/usr/bin/cacao
++else
++  JAVACMD=/usr/bin/jamvm
++fi
++
++exec $JAVACMD -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.appletviewer.Main "$@"

Modified: trunk/classpath/debian/rules
===================================================================
--- trunk/classpath/debian/rules	2007-07-11 22:56:19 UTC (rev 3818)
+++ trunk/classpath/debian/rules	2007-07-11 22:58:07 UTC (rev 3819)
@@ -7,6 +7,7 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -15,13 +16,10 @@
 	INSTALL_PROGRAM += -s
 endif
 
-# Workaround a jikes bug on arm (jikes gets into an endless loop)
-# (http://oss.software.ibm.com/developerworks/bugs/?func=detailbug&bug_id=3973&group_id=10)
-DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-ifeq ($(DEB_BUILD_ARCH),arm)
-	OPT_COMPILER=--with-gcj
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+	OPT_ALSA=--enable-dssi --enable-alsa
 else
-	OPT_COMPILER=--with-jikes=/usr/bin/jikes
+	OPT_ALSA=--disable-dssi --disable-alsa
 endif
 
 config.status: patch configure
@@ -36,12 +34,10 @@
 		--infodir=\$${prefix}/share/info \
 		--disable-dependency-tracking \
 		--with-glibj=both \
-		$(OPT_COMPILER) \
 		--enable-plugin \
 		--enable-qt-peer \
-		--enable-dssi \
-		--enable-jni \
-		--with-gjdoc
+		$(OPT_ALSA) \
+		--enable-jni
 	touch configured-stamp
 
 configure-native-only: patch configure
@@ -50,18 +46,16 @@
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr \
+		--bindir=/usr/lib/classpath \
 		--includedir=\$${prefix}/include/classpath \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		--disable-dependency-tracking \
-		--with-glibj=none \
-		$(OPT_COMPILER) \
+		--with-glibj=zip \
 		--enable-gtk-cairo \
 		--enable-qt-peer \
-		--enable-dssi \
+		$(OPT_ALSA) \
 		--enable-jni
-	sed -e 's/^\(SUBDIRS.*\) tools/\1/' < Makefile > Makefile.tmp
-	mv Makefile.tmp Makefile
 	touch configured-stamp
 
 build:
@@ -81,7 +75,7 @@
 	dh_testroot
 	rm -f build-stamp 
 
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean
 
 patch: patch-stamp
@@ -113,7 +107,7 @@
 	cp $(CURDIR)/debian/wrappers/jikes-classpath debian/tmp/usr/bin
 	
 	# Remove hacking guide
-	rm $(CURDIR)/debian/tmp/usr/share/info/hacking.info
+	rm $(CURDIR)/debian/tmp/usr/share/info/cp-hacking.info
 
 binary-indep: build-real install
 	dh_testdir
@@ -122,8 +116,10 @@
 	# Move examples
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/classpath-doc
 	mv $(CURDIR)/debian/tmp/usr/share/classpath/examples $(CURDIR)/debian/tmp/usr/share/doc/classpath-doc/examples
-	cp -r $(CURDIR)/doc/api/html $(CURDIR)/debian/tmp/usr/share/doc/classpath-doc/api
 	
+	# Install javadocs
+	#cp -r $(CURDIR)/doc/api/html $(CURDIR)/debian/tmp/usr/share/doc/classpath-doc/api
+	
 	dh_install -i --sourcedir=debian/tmp
 	dh_installdocs -i
 	dh_installexamples -i




More information about the pkg-java-commits mailing list