diff -Nru jcc-2.21/debian/changelog jcc-2.21/debian/changelog
--- jcc-2.21/debian/changelog	2015-10-01 07:49:42.000000000 +0000
+++ jcc-2.21/debian/changelog	2016-03-21 19:02:27.000000000 +0000
@@ -1,9 +1,18 @@
-jcc (2.21-1ubuntu1) wily; urgency=medium
+jcc (2.21-1.1) unstable; urgency=medium
 
-  * Merge with Debian; no remaining changes.
-  * Fix build on ppc64el. Closes: #799713.
+  * Non-maintainer upload.
+  * d/rules: Fix build on ppc64el by changing JAVAARCH variable to ppc64le.
+    Thanks to Fernando Seiti Furusato for the report and patch.
+    (Closes: #799713)
+  * Build-depend on default-jdk instead of openjdk-7-jdk.
+    Depend on default-jdk | java7-sdk for jcc binary package.
+    Thanks to Matthias Klose for the report. (Closes: #814165)
+  * d/rules: Use default-java instead of a specific JDK version.
+  * d/control: Use https and cgit.
+  * Ensure that the package can be built twice in a row by removing
+    JCC.egg-info/SOURCES.txt in dh_auto_clean override too.
 
- -- Matthias Klose <doko@ubuntu.com>  Thu, 01 Oct 2015 09:49:05 +0200
+ -- Markus Koschany <apo@debian.org>  Mon, 21 Mar 2016 19:53:15 +0100
 
 jcc (2.21-1) unstable; urgency=low
 
diff -Nru jcc-2.21/debian/control jcc-2.21/debian/control
--- jcc-2.21/debian/control	2014-09-21 19:48:55.000000000 +0000
+++ jcc-2.21/debian/control	2016-03-21 19:02:27.000000000 +0000
@@ -3,16 +3,16 @@
 Priority: extra
 Maintainer: Ludovico Cavedon <cavedon@debian.org>
 Build-Depends: debhelper (>= 9), python-setuptools (>= 0.6a9),
-  openjdk-7-jdk, python-all-dev
+  default-jdk, python-all-dev
 Standards-Version: 3.9.6
 Homepage: http://lucene.apache.org/pylucene/jcc/
-Vcs-Git: git://anonscm.debian.org/collab-maint/jcc.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/jcc.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/jcc.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/jcc.git
 X-Python-Version: >= 2.3
 
 Package: jcc
 Architecture: any
-Depends: openjdk-7-jdk, ${shlibs:Depends}, ${python:Depends},
+Depends: default-jdk | java7-sdk, ${shlibs:Depends}, ${python:Depends},
  ${misc:Depends}
 Breaks: ${python:Breaks}
 Description: code generator producing a Python extension from Java classes
diff -Nru jcc-2.21/debian/rules jcc-2.21/debian/rules
--- jcc-2.21/debian/rules	2015-10-01 07:50:02.000000000 +0000
+++ jcc-2.21/debian/rules	2016-03-21 19:02:27.000000000 +0000
@@ -21,13 +21,13 @@
   JAVAARCH :=ppc64le
 endif
 
-JAVA_LIB_PATH := /usr/lib/jvm/java-7-openjdk-$(DEB_HOST_ARCH)/jre/lib/$(JAVAARCH)
+JAVA_LIB_PATH := /usr/lib/jvm/default-java/jre/lib/$(JAVAARCH)
 
 export JCC_ARGSEP=;
 export JCC_LFLAGS := -L$(JAVA_LIB_PATH);-ljava;-L$(JAVA_LIB_PATH)/server;-ljvm;-Wl,-rpath=$(JAVA_LIB_PATH):$(JAVA_LIB_PATH)/server
 
 export JCC_CFLAGS := -fdollars-in-identifiers
-export JCC_JDK := /usr/lib/jvm/java-7-openjdk-$(DEB_HOST_ARCH)
+export JCC_JDK := /usr/lib/jvm/default-java
 
 # For shared mode we need patch http://bugs.python.org/setuptools/issue43 for setuptools to be applied
 export NO_SHARED=1
@@ -43,3 +43,4 @@
 	dh_auto_clean
 	rm -rf build/*
 	rm -f jcc/config.py
+	$(RM) JCC.egg-info/SOURCES.txt