[pkg-java] r5681 - trunk/gjdoc/debian

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-02-13 08:56:03 +0000 (Wed, 13 Feb 2008)
New Revision: 5681

Modified:
   trunk/gjdoc/debian/changelog
   trunk/gjdoc/debian/control
   trunk/gjdoc/debian/rules
Log:
gjdoc (0.7.8-8) unstable; urgency=low

  * Build using gcj-4.3 on all architectures except alpha.

 -- Matthias Klose <doko at debian.org>  Sun, 27 Jan 2008 22:25:30 +0100



Modified: trunk/gjdoc/debian/changelog
===================================================================
--- trunk/gjdoc/debian/changelog	2008-02-12 22:01:30 UTC (rev 5680)
+++ trunk/gjdoc/debian/changelog	2008-02-13 08:56:03 UTC (rev 5681)
@@ -1,3 +1,9 @@
+gjdoc (0.7.8-8) unstable; urgency=low
+
+  * Build using gcj-4.3 on all architectures except alpha.
+
+ -- Matthias Klose <doko at debian.org>  Sun, 27 Jan 2008 22:25:30 +0100
+
 gjdoc (0.7.8-7) unstable; urgency=low
 
   * debian/scripts/dh_javadoc: Strip lines of read input.

Modified: trunk/gjdoc/debian/control
===================================================================
--- trunk/gjdoc/debian/control	2008-02-12 22:01:30 UTC (rev 5680)
+++ trunk/gjdoc/debian/control	2008-02-13 08:56:03 UTC (rev 5681)
@@ -4,8 +4,8 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Howard <mh at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>
 Build-Depends: debhelper (>> 5), cdbs,
- gcj-4.2 (>= 4.2.1-3) [!alpha !m68k], gcj-4.1 (>= 4.1.2) [alpha m68k],
- libgcj-bc (>= 4.2.1-2) [!alpha !m68k], libgcj-bc (>= 4.1.2) [alpha m68k],
+ gcj-4.3 (>= 4.2.1-3) [!alpha], gcj-4.1 (>= 4.1.2) [alpha],
+ libgcj-bc (>= 4.2.1-2) [!alpha], libgcj-bc (>= 4.1.2) [alpha],
  fastjar, antlr (>= 2.7.1), texlive-latex-base, perl, python, time, sharutils
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/gjdoc
@@ -13,7 +13,7 @@
 
 Package: gjdoc
 Architecture: any
-Depends: debhelper (>> 5), gij | java-gcj-compat | java1-runtime | java2-runtime, antlr, ${shlibs:Depends}
+Depends: debhelper (>> 5), gij | java-gcj-compat-headless | java1-runtime-headless | java2-runtime-headless, antlr, ${shlibs:Depends}
 Conflicts: gjdoc-native
 Replaces: gjdoc-native
 Description: documentation generation framework for java source files

Modified: trunk/gjdoc/debian/rules
===================================================================
--- trunk/gjdoc/debian/rules	2008-02-12 22:01:30 UTC (rev 5680)
+++ trunk/gjdoc/debian/rules	2008-02-13 08:56:03 UTC (rev 5681)
@@ -7,11 +7,11 @@
 VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
 DH_JAVADOC_VER = "0.1"
 
-ifeq (,$(filter $(DEB_HOST_ARCH), alpha m68k))
-  GCC_VERSION   = 4.2
-  LIBGCJ_EXT    = 8
-  LIBGCJ_SOVER  = 81
-  REQ_VERSION   = 4.2.1
+ifeq (,$(filter $(DEB_HOST_ARCH), alpha))
+  GCC_VERSION   = 4.3
+  LIBGCJ_EXT    = 9
+  LIBGCJ_SOVER  = 90
+  REQ_VERSION   = 4.3
 else
   GCC_VERSION   = 4.1
   LIBGCJ_EXT    = 7