diff -u openjdk-6-6b18-1.8/debian/rules openjdk-6-6b18-1.8/debian/rules
--- openjdk-6-6b18-1.8/debian/rules
+++ openjdk-6-6b18-1.8/debian/rules
@@ -842,8 +842,15 @@
 	@echo "downloading openjdk source from hg to create zipfile: $(OPENJDK_SRC_ZIP)"
 	$(MAKE) -C build $@
 
+patch-debian:
+	@echo "patch-debian"
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+
+unpatch-debian:
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+
 patch: stamps/patch
-stamps/patch: stamps/unpack
+stamps/patch: patch-debian stamps/unpack
 ifeq ($(STAGE1_JAVA),gcj)
 	$(MAKE) -C build stamps/patch-ecj.stamp
 endif
@@ -1121,7 +1128,7 @@
 	echo "jtreg harness not run for this build" > jtreg_output-$(VMNAME)
 endif
 
-clean: debian-clean
+clean: unpatch-debian debian-clean
 	dh_testdir
 	dh_testroot
 	rm -rf stamps build build-*
diff -u openjdk-6-6b18-1.8/debian/changelog openjdk-6-6b18-1.8/debian/changelog
--- openjdk-6-6b18-1.8/debian/changelog
+++ openjdk-6-6b18-1.8/debian/changelog
@@ -1,3 +1,10 @@
+openjdk-6 (6b18-1.8-1.1) unreleased; urgency=low
+
+  * Non-maintainer upload.
+  * Fix Hitachi SH configury. Closes: #575346.
+
+ -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Tue, 20 Apr 2010 01:20:39 +0000
+
 openjdk-6 (6b18-1.8-1) unstable; urgency=low
 
   * Upload to unstable.
only in patch2:
unchanged:
--- openjdk-6-6b18-1.8.orig/configure
+++ openjdk-6-6b18-1.8/configure
@@ -7877,7 +7877,7 @@
       CROSS_TARGET_ARCH=s390x
       ARCHFLAG="-m64"
        ;;
-    sh*-*-*)
+    sh*)
       BUILD_ARCH_DIR=sh
       INSTALL_ARCH_DIR=sh
       JRE_ARCH_DIR=sh
--- openjdk-6-6b18-1.8.orig/debian/patches/series
+++ openjdk-6-6b18-1.8/debian/patches/series
@@ -0,0 +1 @@
+sh4_configure.diff
--- openjdk-6-6b18-1.8.orig/debian/patches/sh4_configure.diff
+++ openjdk-6-6b18-1.8/debian/patches/sh4_configure.diff
@@ -0,0 +1,11 @@
+--- a/acinclude.m4	2010-04-22 04:39:17.000000000 +0000
++++ b/acinclude.m4	2010-04-22 04:39:32.000000000 +0000
+@@ -85,7 +85,7 @@
+       CROSS_TARGET_ARCH=s390x
+       ARCHFLAG="-m64"
+        ;;
+-    sh*-*-*)
++    sh*)
+       BUILD_ARCH_DIR=sh
+       INSTALL_ARCH_DIR=sh
+       JRE_ARCH_DIR=sh
only in patch2:
unchanged:
--- openjdk-6-6b18-1.8.orig/.pc/.quilt_series
+++ openjdk-6-6b18-1.8/.pc/.quilt_series
@@ -0,0 +1 @@
+series