[pkg-java] r12139 - trunk/java-common/debian

[Niels Thykier]

Author: nthykier-guest
Date: 2010-04-12 12:47:14 +0000 (Mon, 12 Apr 2010)
New Revision: 12139

Modified:
   trunk/java-common/debian/changelog
   trunk/java-common/debian/control
   trunk/java-common/debian/rules
Log:
Removed need for dpsyco-devel and added sh4 to the openjdk-6 arch list.

Modified: trunk/java-common/debian/changelog
===================================================================
--- trunk/java-common/debian/changelog	2010-04-12 11:19:54 UTC (rev 12138)
+++ trunk/java-common/debian/changelog	2010-04-12 12:47:14 UTC (rev 12139)
@@ -8,6 +8,10 @@
   * Applied patch from Thierry Basque that fixes the --list
     argument for update-java-alternatives. (Closes: #563070)
   * Updated the off-line copy of the Debian Java FAQ.
+  * Added sh4 to the list of architectures that support openjdk-6.
+    (Closes: #577482)
+  * Removed useless commands from debian/rules and removed B-D on
+    dpsyco-devel.
 
  -- Niels Thykier <niels at thykier.net>  Tue, 06 Apr 2010 21:45:15 +0200
 

Modified: trunk/java-common/debian/control
===================================================================
--- trunk/java-common/debian/control	2010-04-12 11:19:54 UTC (rev 12138)
+++ trunk/java-common/debian/control	2010-04-12 12:47:14 UTC (rev 12139)
@@ -5,7 +5,7 @@
 Uploaders: Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>, Torsten Werner <twerner at debian.org>,
  Niels Thykier <niels at thykier.net>
 Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: debiandoc-sgml, docbook-utils, docbook-xml, dpsyco-devel, lynx
+Build-Depends-Indep: debiandoc-sgml, docbook-utils, docbook-xml, lynx
 Standards-Version: 3.8.4
 DM-Upload-Allowed: yes
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java-common

Modified: trunk/java-common/debian/rules
===================================================================
--- trunk/java-common/debian/rules	2010-04-12 11:19:54 UTC (rev 12138)
+++ trunk/java-common/debian/rules	2010-04-12 12:47:14 UTC (rev 12139)
@@ -25,7 +25,7 @@
 dversion	= 1.5-$(jrel)
 jvmdir		= java-gcj
 
-ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 armel i386 ia64 lpia mips mipsel powerpc s390 sparc))
+ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 armel i386 ia64 lpia mips mipsel powerpc s390 sparc sh4))
   p_jre		= openjdk-6-jre
   p_jhl		= openjdk-6-jre-headless
   p_jdk		= openjdk-6-jdk
@@ -68,8 +68,6 @@
 	dh_installdocs -i
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/java-common
 
-	dpsch-backupclean
-
 	touch install-stamp
 
 install-arch:
@@ -125,7 +123,6 @@
 	ln -sf ../$(p_doc)/api debian/default-jdk-doc/usr/share/doc/default-jre-headless/api
 	ln -sf ../$(p_doc)/api debian/default-jdk-doc/usr/share/doc/default-jdk-doc/api
 	dh_installexamples -i
-	dpsch-cvsclean
 	dh_installmenu -i
 	dh_installman -i
 	dh_installchangelogs -i