diff -Nru objenesis-1.2+full/debian/changelog objenesis-1.2+full/debian/changelog --- objenesis-1.2+full/debian/changelog 2012-06-19 17:26:49.000000000 +0000 +++ objenesis-1.2+full/debian/changelog 2012-06-19 17:56:03.000000000 +0000 @@ -1,8 +1,10 @@ -objenesis (1.2+full-2ubuntu1) quantal; urgency=low +objenesis (1.2+full-3) unstable; urgency=low - * Fix FTBFS with OpenJDK 7 (LP: #888987). + * Team upload. + * Apply patch from Ilya Barygin to fix encoding issue + with Java7. (Closes: #678164, LP: #888987) - -- Ilya Barygin Tue, 19 Jun 2012 21:26:47 +0400 + -- Niels Thykier Tue, 19 Jun 2012 19:55:59 +0200 objenesis (1.2+full-2) unstable; urgency=low diff -Nru objenesis-1.2+full/debian/control objenesis-1.2+full/debian/control --- objenesis-1.2+full/debian/control 2012-06-19 17:14:12.000000000 +0000 +++ objenesis-1.2+full/debian/control 2012-06-19 17:49:22.000000000 +0000 @@ -1,8 +1,7 @@ Source: objenesis Section: java Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Java Maintainers +Maintainer: Debian Java Maintainers Uploaders: Gabriele Giacone <1o5g4r8o@gmail.com> Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) Build-Depends-Indep: libmaven-javadoc-plugin-java, junit (>= 3.8.2), default-jdk-doc diff -Nru objenesis-1.2+full/debian/libobjenesis-java.poms objenesis-1.2+full/debian/libobjenesis-java.poms --- objenesis-1.2+full/debian/libobjenesis-java.poms 2012-04-09 23:17:03.000000000 +0000 +++ objenesis-1.2+full/debian/libobjenesis-java.poms 2012-06-19 17:52:17.000000000 +0000 @@ -2,7 +2,9 @@ # Format of this file is: # [option]* # where option can be: -# --ignore: ignore this POM or +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] # --no-parent: remove the tag from the POM # --package=: an alternative package to use when installing this POM # and its artifact @@ -11,17 +13,17 @@ # --keep-elements=: a list of XML elements to keep in the POM # during a clean operation with mh_cleanpom or mh_installpom # --artifact=: path to the build artifact associated with this POM, -# it will be installed when using the command mh_install +# it will be installed when using the command mh_install. [mh_install] # --java-lib: install the jar into /usr/share/java to comply with Debian # packaging guidelines # --usj-name=: name to use when installing the library in /usr/share/java # --usj-version=: version to use when installing the library in /usr/share/java # --no-usj-versionless: don't install the versionless link in /usr/share/java -# --dest-jar=: the destination for the real jar -# it will be installed with mh_install. +# --dest-jar=: the destination for the real jar. +# It will be installed with mh_install. [mh_install] # --classifier=: Optional, the classifier for the jar. Empty by default. -# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created -# temporarily for certain artifacts such as Javadoc jars. +# --site-xml=: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] # pom.xml --has-package-version main/pom.xml --has-package-version --java-lib diff -Nru objenesis-1.2+full/debian/maven.cleanIgnoreRules objenesis-1.2+full/debian/maven.cleanIgnoreRules --- objenesis-1.2+full/debian/maven.cleanIgnoreRules 2012-04-09 23:17:03.000000000 +0000 +++ objenesis-1.2+full/debian/maven.cleanIgnoreRules 2012-06-19 17:52:17.000000000 +0000 @@ -13,5 +13,5 @@ # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., this dependency is then removed # from the POM before mvn clean is called -# junit junit jar s/3\\..*/3.x/ +# junit junit jar s/3\..*/3.x/ diff -Nru objenesis-1.2+full/debian/maven.ignoreRules objenesis-1.2+full/debian/maven.ignoreRules --- objenesis-1.2+full/debian/maven.ignoreRules 2012-04-09 23:17:03.000000000 +0000 +++ objenesis-1.2+full/debian/maven.ignoreRules 2012-06-19 17:52:17.000000000 +0000 @@ -12,7 +12,7 @@ # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., this dependency is then removed # from the POM -# junit junit jar s/3\\..*/3.x/ +# junit junit jar s/3\..*/3.x/ com.google.code.maven-license-plugin maven-license-plugin * * * * com.keyboardsamurais.maven maven-timestamp-plugin * * * * diff -Nru objenesis-1.2+full/debian/maven.publishedRules objenesis-1.2+full/debian/maven.publishedRules --- objenesis-1.2+full/debian/maven.publishedRules 2012-04-09 23:17:03.000000000 +0000 +++ objenesis-1.2+full/debian/maven.publishedRules 2012-06-19 17:52:17.000000000 +0000 @@ -15,5 +15,5 @@ # All elements much match before a rule can be applied # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., replacing the version with 3.x -# junit junit jar s/3\\..*/3.x/ +# junit junit jar s/3\..*/3.x/ diff -Nru objenesis-1.2+full/debian/maven.rules objenesis-1.2+full/debian/maven.rules --- objenesis-1.2+full/debian/maven.rules 2012-04-09 23:17:03.000000000 +0000 +++ objenesis-1.2+full/debian/maven.rules 2012-06-19 17:52:17.000000000 +0000 @@ -14,7 +14,7 @@ # All elements much match before a rule can be applied # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., replacing the version with 3.x -# junit junit jar s/3\\..*/3.x/ +# junit junit jar s/3\..*/3.x/ junit junit jar s/3\..*/3.x/ * * org.objenesis objenesis-parent pom s/.*/debian/ * *