[java-policy] 112/198: Removed need for dpsyco-devel and added sh4 to the openjdk-6 arch list.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository java-policy.

commit 4726460c9088a50ae08cedf30bd8ff2fdd0ea0e4
Author: Niels Thykier <nthykier at debian.org>
Date:   Mon Apr 12 12:47:14 2010 +0000

    Removed need for dpsyco-devel and added sh4 to the openjdk-6 arch list.
---
 debian/changelog | 4 ++++
 debian/control   | 2 +-
 debian/rules     | 5 +----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 80474ec..8031ced 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ java-common (0.36) UNRELEASED; urgency=low
   * 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
 
diff --git a/debian/control b/debian/control
index 31bdbe0..1a8c816 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Mailing List <debian-java at lists.debian.org>
 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
diff --git a/debian/rules b/debian/rules
index 8f46568..a7aed43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ provides	= java java2 java5
 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 @@ install-stamp: build-stamp
 	dh_installdocs -i
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/java-common
 
-	dpsch-backupclean
-
 	touch install-stamp
 
 install-arch:
@@ -125,7 +123,6 @@ binary-indep: build-indep install-indep
 	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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-policy.git