diff -Nru classworlds-1.1-final/debian/changelog classworlds-1.1-final/debian/changelog
--- classworlds-1.1-final/debian/changelog	2011-05-03 08:25:29.000000000 +0000
+++ classworlds-1.1-final/debian/changelog	2011-05-01 21:56:52.000000000 +0000
@@ -1,3 +1,18 @@
+classworlds (1.1-final-5) unstable; urgency=low
+
+  * Team upload.
+  * Switch to 3.0 (quilt) source format.
+  * Bump Standards-Version to 3.9.2:
+    - Add Vcs-* fields.
+    - Add Homepage field.
+    - Drop duplicate section field on package.
+  * d/control: Build-Depends on default-jdk-doc instead of openjdk-6-doc
+    (Closes: #567268).
+  * d/rules: Strip "-final" from version number to generate correct JAR name
+    (Closes: #614541)
+
+ -- Damien Raude-Morvan <drazzib@debian.org>  Sun, 01 May 2011 23:56:39 +0200
+
 classworlds (1.1-final-4) unstable; urgency=low
 
   [ Michael Koch ]
diff -Nru classworlds-1.1-final/debian/control classworlds-1.1-final/debian/control
--- classworlds-1.1-final/debian/control	2011-05-03 08:25:29.000000000 +0000
+++ classworlds-1.1-final/debian/control	2011-05-01 21:56:14.000000000 +0000
@@ -5,13 +5,15 @@
 Uploaders: Trygve Laugstøl <trygvis@inamo.no>, Paul Cager <paul-debian@home.paulcager.org>,
  Torsten Werner <twerner@debian.org>
 Build-Depends-Indep: ant, ant-optional, libxalan2-java, maven-ant-helper (>> 4),
- maven-repo-helper, openjdk-6-doc
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk, quilt
-Standards-Version: 3.8.1
+ maven-repo-helper, default-jdk-doc
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk
+Standards-Version: 3.9.2
+Homepage: http://classworlds.codehaus.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/classworlds/
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/classworlds/
 
 Package: libclassworlds-java
 Architecture: all
-Section: java
 Depends: ${misc:Depends}
 Suggests: libclassworlds-java-doc
 Description: framework for container developers requiring manipulation of ClassLoaders
@@ -29,7 +31,7 @@
 Package: libclassworlds-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, classpath-doc
+Depends: ${misc:Depends}, default-jdk-doc
 Suggests: libclassworlds-java
 Description: Documentation for the Classworlds Java library
  Classworlds is a framework for container developers who require complex
diff -Nru classworlds-1.1-final/debian/rules classworlds-1.1-final/debian/rules
--- classworlds-1.1-final/debian/rules	2011-05-03 08:25:29.000000000 +0000
+++ classworlds-1.1-final/debian/rules	2011-05-01 21:54:11.000000000 +0000
@@ -2,10 +2,9 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
+VERSION              := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -s "s/-final//")
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := ant-trax ant-nodeps xalan2
 DEB_ANT_BUILD_TARGET := package javadoc
@@ -24,4 +23,4 @@
 	dh_install -plib$(PACKAGE)-java-doc build/api usr/share/doc/lib$(PACKAGE)-java
 
 clean::
-	-rm -rf debian/tmp
+	mh_clean
diff -Nru classworlds-1.1-final/debian/source/format classworlds-1.1-final/debian/source/format
--- classworlds-1.1-final/debian/source/format	1970-01-01 00:00:00.000000000 +0000
+++ classworlds-1.1-final/debian/source/format	2011-05-03 08:25:30.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)