[pkg-java] r10459 - in trunk/gjdoc/debian: . scripts

[Michael Koch]

Author: mkoch
Date: 2009-09-18 05:04:25 +0000 (Fri, 18 Sep 2009)
New Revision: 10459

Modified:
   trunk/gjdoc/debian/changelog
   trunk/gjdoc/debian/control
   trunk/gjdoc/debian/rules
   trunk/gjdoc/debian/scripts/dh_javadoc
Log:
gjdoc (0.7.9-4.1) unstable; urgency=low

  * Non-maintainer upload.
  * Apply patch from Rail Aliev <rail at i-rs.ru> to add --sourcedir option back
    (Closes: #541321)

 -- Matthew Johnson <mjj29 at debian.org>  Thu, 13 Aug 2009 22:41:46 +0100

gjdoc (0.7.9-4) unstable; urgency=low

  * Build on hppa using gcj-4.4-jdk.

 -- Matthias Klose <doko at debian.org>  Mon, 04 May 2009 12:01:25 +0000



Modified: trunk/gjdoc/debian/changelog
===================================================================
--- trunk/gjdoc/debian/changelog	2009-09-18 05:00:22 UTC (rev 10458)
+++ trunk/gjdoc/debian/changelog	2009-09-18 05:04:25 UTC (rev 10459)
@@ -1,3 +1,17 @@
+gjdoc (0.7.9-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Apply patch from Rail Aliev <rail at i-rs.ru> to add --sourcedir option back
+    (Closes: #541321)
+
+ -- Matthew Johnson <mjj29 at debian.org>  Thu, 13 Aug 2009 22:41:46 +0100
+
+gjdoc (0.7.9-4) unstable; urgency=low
+
+  * Build on hppa using gcj-4.4-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Mon, 04 May 2009 12:01:25 +0000
+
 gjdoc (0.7.9-2) unstable; urgency=low
 
   * Build on alpha again. Closes: #454807.

Modified: trunk/gjdoc/debian/control
===================================================================
--- trunk/gjdoc/debian/control	2009-09-18 05:00:22 UTC (rev 10458)
+++ trunk/gjdoc/debian/control	2009-09-18 05:04:25 UTC (rev 10459)
@@ -4,7 +4,7 @@
 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.3 (>= 4.2.1-3),
+ gcj-4.3 (>= 4.2.1-3) [!hppa], gcj-4.4-jdk [hppa],
  libgcj-bc (>= 4.2.1-2),
  fastjar, antlr (>= 2.7.1), texlive-latex-base, perl, python, time, sharutils
 Standards-Version: 3.7.3

Modified: trunk/gjdoc/debian/rules
===================================================================
--- trunk/gjdoc/debian/rules	2009-09-18 05:00:22 UTC (rev 10458)
+++ trunk/gjdoc/debian/rules	2009-09-18 05:04:25 UTC (rev 10459)
@@ -7,10 +7,17 @@
 VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
 DH_JAVADOC_VER = "0.1"
 
-GCC_VERSION   = 4.3
-LIBGCJ_EXT    = 9
-LIBGCJ_SOVER  = 90
-REQ_VERSION   = 4.3
+ifneq (,$(findstring $(DEB_HOST_ARCH),hppa))
+  GCC_VERSION   = 4.4
+  LIBGCJ_EXT    = 10
+  LIBGCJ_SOVER  = 10
+  REQ_VERSION   = 4.4
+else
+  GCC_VERSION   = 4.3
+  LIBGCJ_EXT    = 9
+  LIBGCJ_SOVER  = 90
+  REQ_VERSION   = 4.3
+endif
 
 GCJ = gcj-$(GCC_VERSION)
 GCJSUBDIR = /usr/lib/gcj-$(GCC_VERSION)-$(LIBGCJ_SOVER)
@@ -33,7 +40,7 @@
 DEB_CONFIGURE_USER_FLAGS = --disable-native --enable-xmldoclet
 
 build-native-stamp:
-ifneq (,$(findstring $(DEB_HOST_ARCH),arm hppa))
+ifneq (,$(findstring $(DEB_HOST_ARCH),arm))
 	@echo 'gjdoc is not built anymore on this architecture.'
 	@echo 'People insist on 100% compatible packages without providing any help.'
 	@echo 'The porter lists are quiet on the topic of better gij/gcj support for

Modified: trunk/gjdoc/debian/scripts/dh_javadoc
===================================================================
--- trunk/gjdoc/debian/scripts/dh_javadoc	2009-09-18 05:00:22 UTC (rev 10458)
+++ trunk/gjdoc/debian/scripts/dh_javadoc	2009-09-18 05:04:25 UTC (rev 10459)
@@ -89,7 +89,9 @@
 
 use Cwd;
 
-init();
+init(options => {
+        "sourcedir=s" => \$dh{SOURCEDIR},
+});
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);