diff -u libini4j-java-0.2.6/debian/rules libini4j-java-0.2.6/debian/rules
--- libini4j-java-0.2.6/debian/rules
+++ libini4j-java-0.2.6/debian/rules
@@ -2,7 +2,7 @@
 
 #export DH_VERBOSE=1
 
-JAVA_HOME=/usr/lib/jvm/java-7-icedtea
+JAVA_HOME=/usr/lib/jvm/java-6-openjdk
 
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -41,0 +42,8 @@
+
+UPSTREAM_VERSION ?= $(shell uscan --dehs --force-download | sed -n 's/<upstream-version>\(.*\)<\/upstream-version>/\1/p')
+
+get-orig-source: 
+	mkdir libini4j-java_$(UPSTREAM_VERSION).orig
+	unzip -d libini4j-java_$(UPSTREAM_VERSION).orig ../ini4j-src-$(UPSTREAM_VERSION).zip
+	tar czf ../libini4j-java_$(UPSTREAM_VERSION).orig.tar.gz libini4j-java_$(UPSTREAM_VERSION).orig
+	rm -r libini4j-java_$(UPSTREAM_VERSION).orig 
diff -u libini4j-java-0.2.6/debian/control libini4j-java-0.2.6/debian/control
--- libini4j-java-0.2.6/debian/control
+++ libini4j-java-0.2.6/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: Marek Slama <marek.slama@sun.com>
 Build-Depends: debhelper (>=5), cdbs (>=0.4.8), ant, ant-optional
-Build-Depends-Indep: icedtea-java7-jdk, jetty, junit, libservlet2.4-java
+Build-Depends-Indep: openjdk-6-jdk, jetty, junit, libservlet2.4-java
 Standards-Version: 3.7.3
 Homepage: http://www.ini4j.org/
 
@@ -12,7 +12,7 @@
 Architecture: all
 Section: libs
 Priority: optional
-Depends: icedtea-java7-jre
+Depends: openjdk-6-jre
 Recommends: jetty, libservlet2.4-java
 Description: Java API for handling Windows ini file format
  The ini4j is a simple Java API for handling configuration
diff -u libini4j-java-0.2.6/debian/changelog libini4j-java-0.2.6/debian/changelog
--- libini4j-java-0.2.6/debian/changelog
+++ libini4j-java-0.2.6/debian/changelog
@@ -1,3 +1,10 @@
+libini4j-java (0.2.6-0ubuntu2) hardy; urgency=low
+
+  * Replace icedtea-java7 dependencies with openjdk-6 (LP: #203636)
+  * Add target get-orig-source to debian/rules
+
+ -- Marek Slama <marek.slama@sun.com>  Thu, 20 Mar 2008 10:00:00 +0100
+
 libini4j-java (0.2.6-0ubuntu1) hardy; urgency=low
 
   * Initial version. (LP: #185943)