CVS gjdoc/debian

Fri Oct 14 20:26:55 UTC 2005

Update of /cvsroot/pkg-java/gjdoc/debian
In directory haydn:/tmp/cvs-serv8209/debian

Modified Files:
	changelog control copyright rules 
Log Message:
gjdoc (0.7.6-1) unstable; urgency=low

  * New upstream release
    - Removed debian/patches/gjdoc-posix.patch. Applied upstream.
  * Build-Depends on libgcj6 directly with using ${shlips:Depends}
    (Closes: #330140).

 -- Michael Koch <konqueror at gmx.de>  Fri, 14 Oct 2005 19:07:19 +0000

gjdoc (0.7.5-5) unstable; urgency=low

  * debian/rules: Set GCJ variable to point to /usr/bin/gcj-4.0 before running
    configure

 -- Michael Koch <konqueror at gmx.de>  Fri, 23 Sep 2005 21:53:15 +0000

gjdoc (0.7.5-4) unstable; urgency=low

  * Build-Depends on libgcj6-dev, gij-4.0, fastjar instead of java-gc-compat
    and sablvm (Closes: #328929)
  * Reworked debian/rules for new Build-Depends

 -- Michael Koch <konqueror at gmx.de>  Sun, 18 Sep 2005 16:27:24 +0000

gjdoc (0.7.5-3) unstable; urgency=low

  * Build-Depends on java-gcj-compat instead of java-gcj-compat-dev
  * debian/rules: Use gcj-wrapper-4.0 as javac to build the package

 -- Michael Koch <konqueror at gmx.de>  Sat, 17 Sep 2005 07:33:49 +0000

gjdoc (0.7.5-2) unstable; urgency=low

  * Depends on java-gcj-compat | java1-runtime (Closes: #245204, #319168)
  * Moved Build-Depends-Indep to Build-Depends
  * Build-Depends on java-gcj-compat-dev instead of kaffe, jikes, fastjar
  * debian/rules: Use commands from java-gcj-compat-dev
  * debian/rules: Dont delete files installed to /usr/lib
  * debian/control: Make gjdoc an architecture dependant package
  * Fixed address of FSF in debian/copyright
  * Updated Standards-Version to 3.6.2

 -- Michael Koch <konqueror at gmx.de>  Wed, 14 Sep 2005 19:12:57 +0000

gjdoc (0.7.5-1) unstable; urgency=low

  * New upstream release (Closes: #306371, #308913, #309219)
  * Removed debian/patches/10_gjdoc_sh_in.patch
  * Removed debian/patches/gjdoc-checkparamslength.patch
  * Removed debian/patches/gjdoc-parameterimpl.patch
  * Added debian/patches/gjdoc-posix.patch (Closes: #309903)

 -- Michael Koch <konqueror at gmx.de>  Sat, 18 Jun 2005 20:18:03 +0200

gjdoc (0.7.4-1) unstable; urgency=low

  * New upstream release

 -- Michael Koch <konqueror at gmx.de>  Sun,  1 May 2005 15:24:50 +0000

gjdoc (0.7.3-1) unstable; urgency=low

  * New upstream release

--- /cvsroot/pkg-java/gjdoc/debian/changelog	2005/03/15 19:44:03	1.6
+++ /cvsroot/pkg-java/gjdoc/debian/changelog	2005/10/14 20:26:54	1.7
@@ -1,3 +1,63 @@
+gjdoc (0.7.6-1) unstable; urgency=low
+
+  * New upstream release
+    - Removed debian/patches/gjdoc-posix.patch. Applied upstream.
+  * Build-Depends on libgcj6 directly with using ${shlips:Depends}
+    (Closes: #330140).
+
+ -- Michael Koch <konqueror at gmx.de>  Fri, 14 Oct 2005 19:07:19 +0000
+
+gjdoc (0.7.5-5) unstable; urgency=low
+
+  * debian/rules: Set GCJ variable to point to /usr/bin/gcj-4.0 before running
+    configure
+
+ -- Michael Koch <konqueror at gmx.de>  Fri, 23 Sep 2005 21:53:15 +0000
+
+gjdoc (0.7.5-4) unstable; urgency=low
+
+  * Build-Depends on libgcj6-dev, gij-4.0, fastjar instead of java-gc-compat
+    and sablvm (Closes: #328929)
+  * Reworked debian/rules for new Build-Depends
+
+ -- Michael Koch <konqueror at gmx.de>  Sun, 18 Sep 2005 16:27:24 +0000
+
+gjdoc (0.7.5-3) unstable; urgency=low
+
+  * Build-Depends on java-gcj-compat instead of java-gcj-compat-dev
+  * debian/rules: Use gcj-wrapper-4.0 as javac to build the package
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 17 Sep 2005 07:33:49 +0000
+
+gjdoc (0.7.5-2) unstable; urgency=low
+
+  * Depends on java-gcj-compat | java1-runtime (Closes: #245204, #319168)
+  * Moved Build-Depends-Indep to Build-Depends
+  * Build-Depends on java-gcj-compat-dev instead of kaffe, jikes, fastjar
+  * debian/rules: Use commands from java-gcj-compat-dev
+  * debian/rules: Dont delete files installed to /usr/lib
+  * debian/control: Make gjdoc an architecture dependant package
+  * Fixed address of FSF in debian/copyright
+  * Updated Standards-Version to 3.6.2
+
+ -- Michael Koch <konqueror at gmx.de>  Wed, 14 Sep 2005 19:12:57 +0000
+
+gjdoc (0.7.5-1) unstable; urgency=low
+
+  * New upstream release (Closes: #306371, #308913, #309219)
+  * Removed debian/patches/10_gjdoc_sh_in.patch
+  * Removed debian/patches/gjdoc-checkparamslength.patch
+  * Removed debian/patches/gjdoc-parameterimpl.patch
+  * Added debian/patches/gjdoc-posix.patch (Closes: #309903)
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 18 Jun 2005 20:18:03 +0200
+
+gjdoc (0.7.4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Michael Koch <konqueror at gmx.de>  Sun,  1 May 2005 15:24:50 +0000
+
 gjdoc (0.7.3-1) unstable; urgency=low
 
   * New upstream release
--- /cvsroot/pkg-java/gjdoc/debian/control	2005/03/15 19:44:03	1.4
+++ /cvsroot/pkg-java/gjdoc/debian/control	2005/10/14 20:26:55	1.5
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Howard <mh at debian.org>, Takashi Okamoto <tora at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends-Indep: debhelper (>> 4), cdbs, kaffe (>= 2:1.1.4.PRECVS8-1), jikes, fastjar, antlr (>= 2.7.1), tetex-bin, perl
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>> 4), cdbs, libgcj6-dev, gij-4.0, fastjar, antlr (>= 2.7.1), tetex-bin, perl
+Standards-Version: 3.6.2
 
 Package: gjdoc
-Architecture: all
-Depends: debhelper (>> 4), kaffe (>= 2:1.1.4.PRECVS8-1), antlr
+Architecture: any
+Depends: debhelper (>> 4), java-gcj-compat | java1-runtime, antlr, ${shlibs:Depends}
 Conflicts: gjdoc-native
 Replaces: gjdoc-native
 Description: documentation generation framework for java source files
--- /cvsroot/pkg-java/gjdoc/debian/copyright	2005/03/15 19:44:03	1.2
+++ /cvsroot/pkg-java/gjdoc/debian/copyright	2005/10/14 20:26:55	1.3
@@ -1,25 +1,24 @@
 This package was debianized by Grzegorz Prokopski (Debian Developer) <gadek at debian.org> on
 Mon, 12 Aug 2002 12:44:59 +0200.
 
-It was downloaded from ftp://ftp.gnu.org/pub/gnu/classpath.
+It was downloaded from ftp://ftp.gnu.org/gnu/classpath.
 
-Upstream Authors: (C) 2001 Free Software Foundation
+Upstream Authors: (C) 2001-2005 Free Software Foundation
 
 Copyright:
 
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
-
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 dated June, 1991.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
--- /cvsroot/pkg-java/gjdoc/debian/rules	2005/03/15 19:44:03	1.3
+++ /cvsroot/pkg-java/gjdoc/debian/rules	2005/10/14 20:26:55	1.4
@@ -9,7 +9,6 @@
 
 install/gjdoc::
 	cp debian/scripts/dh_javadoc debian/gjdoc/usr/bin
-	-rm -rf debian/gjdoc/usr/lib
 	mkdir -p debian/gjdoc/usr/share/man/man1
 	pod2man -c Debhelper -r $(DH_JAVADOC_VER) debian/scripts/dh_javadoc debian/gjdoc/usr/share/man/man1/dh_javadoc.1
 	echo "usr/share/java/com-sun-javadoc-$(VERSION).jar usr/share/java/com-sun-javadoc.jar" > debian/links
@@ -19,6 +18,18 @@
 clean::
 	rm -f debian/links
 
-DEB_CONFIGURE_SCRIPT_ENV := JAVA="/usr/lib/kaffe/bin/java" JAVAC="/usr/lib/kaffe/bin/javac" JAR="fastjar"
-DEB_CONFIGURE_USER_FLAGS := --disable-native
+DEB_CONFIGURE_SCRIPT_ENV := JAVA="/usr/bin/gij-wrapper-4.0" JAVAC="/usr/bin/gcj-wrapper-4.0" JAR="/usr/bin/fastjar" GCJ="/usr/bin/gcj-4.0"
 
+ifeq ($(DEB_BUILD_ARCH),m68k)
+DEB_CONFIGURE_USER_FLAGS := --disable-native --enable-xmldoclet
+else
+ifeq ($(DEB_BUILD_ARCH),mips)
+DEB_CONFIGURE_USER_FLAGS := --disable-native --enable-xmldoclet
+else
+ifeq ($(DEB_BUILD_ARCH),mipsel)
+DEB_CONFIGURE_USER_FLAGS := --disable-native --enable-xmldoclet
+else
+DEB_CONFIGURE_USER_FLAGS := --enable-native --enable-xmldoclet
+endif
+endif
+endif

