Re: Comments regarding jenkins-constant-pool-scanner_1.2-1_i386.changes
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hi Luca On 09/01/14 14:31, Luca Falavigna wrote: please ask upstream to add a COPYING file to better document the license of this project. It's not so immediate to find it. I've raised an issue upstream to request this be added. Is the current reference in pom.xml sufficient for acceptance into the archive, or do you need this update prior to approval? Cheers James - -- James Page Ubuntu and Debian Developer james.p...@ubuntu.com jamesp...@debian.org -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.15 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCAAGBQJSzrQkAAoJEL/srsug59jDm4wQAMysTkZjQACvfPdSmwkzrC4J YPletmH5qWh+MDZsKSvh8HQDCoZGf3bBsKVJrogR6GPnl01UW21fb9LAxWs9uQar Yzh4UOnxRmEW5SixpuPg6LqNW5IBYiou4xQ6ZDjzoj48Keqf66KGgyxvQXxoso7u H3juMEXRoZPNZm9hT+81xNQvjnEmohbDLfkbeSD/serEwzeggT8iSTFUfAb+sUg3 ypMSsPfmuj26HsN9PGBU36CumnX1BIodwo9wrf5zPk+T+n+YOlcJE13yecvd8J+7 jhTkfG+DQRp7sqb9QP2JeagOYZKJN4KDgOFN49gL+tzOKTuepzbm7Sf10j05XkcU wZhxMEZJP/DEH7xYdfgTC0mfhwZQpEduGkG9Em9qK3TVpHSebxmVfdnuUVToQOQO skEzZER2zD8MehM46XW9+08lRzXRXPy/vsyh0SEaGaG2yFLpgLsB2L7ewE19eCcZ M/gPDGzbhsBSkLaB9rNdB4T+3u4nwOJE/GUlWgO5NC4vT66UbHgs6MEOSRqI/Pe0 0WEzBcL1DLXckzOJbtLcU+9lfkpW/xRcoQWq+GTMZ6+IMG3/efT+cPHA8plOnTV5 FOJ7a2DOKO7kAmIYKjwyR5yJ23iv6q2ZItPcnjENZ914dAsuUCNCoBwcmLFJzW+G 11fQOJ7ZMCIxpv/WMJzn =nzYq -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#730457: Vulnerabilities don't impact jenkins core
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hi Moritz Looking at the upstream security advisory, these issues impact plugins that are not packaged either in jenkins or separately in Debian. I think this bug can be closed out. Cheers James - -- James Page Ubuntu and Debian Developer james.p...@ubuntu.com jamesp...@debian.org -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.15 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCAAGBQJSocUxAAoJEL/srsug59jDJi8P/iWWU3KSZTn0IZ2Q9TGbzMA3 yJi8wErOArIrTrjpPTADF/LUNESydR/O1nsQxUowL5cXfZC7ZCV7IY4bm/5SLucO d1tnLEX8l8KNxMYFCo0I/Hb09YD4dOQl3zvtCI+x4YDjLkRhuMS/7t9TreEXDzUp jJW1nWsEI0LcmvElRe6MlKGEVjyRjbCuV4m7hMVi/T091fXihxhZ6GKBg0gJ7lA/ CsiOTkqygnpaAcfwG1qH1MNe8aH6NdJaZENE/2faFBRq2G3aWe7kxla5yC6YeAyV /KJMZFif288i/X50UR+uACAZ3sf/VfO3iVB9aPxIzqvWwMd7A1X2g7RTIIgnxsux P6chFrlTkxU1mmVC0mR29P1UFYVndKogqZ5zQ5rzVmbapGkcWkB+pHyOJ27piaus mSwUf6P+zz198Ae208NX93LyW9WsHAQtU1F3SH7RyxB8woti8t9uDFUy2YvFapOy 0hczNzdk/l56tpKUKhMqpwTjcIJC+xi55vGhcmfRYEv3sm2mvFe4N3Lu3kA0cukj ADusAvfYYzRC+lWxoq+LyBLXOPvme6mLGbnc3SGFzNIODNcuDww0/VDnCnN1yG3E /IacPpcX7jjOkOAt5dmlEkm+At80MpoeuaQIVIovm0jeOvkRM1bKHKwCAQeIY28D dSw5HkgRr/7fBh436Hx6 =GV5A -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#685298: Impossible to simultaneously install libtomcat7-java and libtomcat6-java
I think option 1 is probably the best approach - it's worked well in other areas -- James Page Technical Lead, Ubuntu Server Team On 13 Sep 2013, at 12:19, Emmanuel Bourg ebo...@apache.org wrote: Hi, I started working on the tomcat8 package and I'd like to avoid the same conflict with tomcat7. What would be the best solution? 1. Change the name of the unversioned jars to tomcat8-xxx.jar. That would give the following links in /usr/share/java: tomcat8-catalina-ant.jar - tomcat-catalina-ant-8.0.0.jar tomcat8-catalina-tribes.jar - tomcat-catalina-tribes-8.0.0.jar tomcat8-annotations-api.jar - tomcat-annotations-api-8.0.0.jar tomcat8-api.jar - tomcat-api-8.0.0.jar tomcat8-catalina-ha.jar - tomcat-catalina-ha-8.0.0.jar tomcat8-catalina.jar - tomcat-catalina-8.0.0.jar tomcat8-coyote.jar - tomcat-coyote-8.0.0.jar tomcat8-i18n-es.jar - tomcat-i18n-es-8.0.0.jar tomcat8-i18n-fr.jar - tomcat-i18n-fr-8.0.0.jar tomcat8-i18n-ja.jar - tomcat-i18n-ja-8.0.0.jar tomcat8-jasper-el.jar - tomcat-jasper-el-8.0.0.jar tomcat8-jasper.jar - tomcat-jasper-8.0.0.jar tomcat8-juli.jar - tomcat-juli-8.0.0.jar tomcat8-util.jar - tomcat-util-8.0.0.jar 2. Move the jars and links in a subdirectory of /usr/share/java. /usr/share/java/tomcat8/tomcat-juli.jar - ./tomcat-juli-8.0.0.jar /usr/share/java/tomcat8/tomcat-util.jar - ./tomcat-util-8.0.0.jar 3. Don't put the unversioned links in /usr/share/java. If a reverse dependency requires a stable path for building it could use the Maven repository in /usr/share/maven-repo. The Maven based packages wouldn't be impacted, and the Ant based packages could use a path like: /usr/share/maven-repo/org/apache/tomcat/tomcat-jasper/8.x/tomcat-jasper-8.x.jar What do you think? Emmanuel Bourg __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#719487: maven-debian-helper: Install mojo does not include maven.ignoreRules when processing pom files
Package: maven-debian-helper Version: 1.6.3 Severity: normal Dear Maintainer, I guess through a bug in the maven-debian-helper package, earlier versions of mdh managed to install pom files in /usr/share/maven-repo with the maven.ignoreRules file applied. The current version does not exhibit this behaviour - only maven.rules is applied which then creates maven artifacts which are un-usable on Debian. I noted this while doing updates for jenkins and the maven-hpi-plugin packages. I worked around this by forcing use of mh_installpoms: # Install POM files directly binary-post-install/libjenkins-java:: mh_installpoms -plibjenkins-java this ensures that .ignoreRules is used. Cheers James -- System Information: Debian Release: wheezy/sid APT prefers saucy-updates APT policy: (500, 'saucy-updates'), (500, 'saucy-security'), (500, 'saucy'), (100, 'saucy-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.10.0-6-generic (SMP w/4 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages maven-debian-helper depends on: ii default-jdk 1:1.7-48 ii libmaven-clean-plugin-java 2.5-1 ii libmaven-compiler-plugin-java 2.0.2-6 ii libmaven-jar-plugin-java2.2-6 ii libmaven-resources-plugin-java 2.3-7 ii libmaven-site-plugin-java 2.1-2 ii libplexus-velocity-java 1.1.7-5 ii libsurefire-java2.10-4 ii maven-repo-helper 1.8.3 ii maven2 2.2.1-14 ii velocity1.7-4 maven-debian-helper recommends no packages. Versions of packages maven-debian-helper suggests: pn apt-file none ii devscripts2.13.2 pn libmaven-javadoc-plugin-java none ii subversion1.7.9-1+nmu3ubuntu1 -- no debconf information __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#714596: Bootstrapping jenkins
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hi Thomas I don't think its feasible to remove the circular dependency in Jenkins due to the complexity of dependencies and the age of the project upstream. I did give some thought how to work around this. Its probably possible to build jenkins without the modules that are causing the circular dependency; they would have to be patched out of war/pom.xml. Once you have this version, you can build the modules and then a second rebuild with the BD's back in place will fix things up. I appreciate this is less than ideal. Cheers James - -- James Page Ubuntu and Debian Developer james.p...@ubuntu.com jamesp...@debian.org -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQIcBAEBCAAGBQJSCUolAAoJEL/srsug59jDXpIQAJyQS0vYVFrRNBzekhpJZrAA XhynuFcTJCbj+EJ80uLYAn+EHtbdXhiHhsW0TxZ8xFUF6Z2kBw6RpkPXIfQ/BEHp NB5YniZ3LX9aAbX0XBrCZvyjSEaut7PZwsh8/QGwIaYQApzxeZ0zHfEl7GhlbIZN oOB2ucNHGQbX9KIjGUsl6v+WI7uxWuvYw/xCor18yxfa5cHEHjzRF4DbiCvqNHMD 82MnPlY39XvTehtPVYng0aKTEmbuZYrW+n9sbV1b9n+GU7Wz4tgnuvIXFfIBgBeu j7JwRTB4kcg2yF2kffLUHVGzf3ckFfKQiI62h61gq7GKSZ5khtOf65Pz/I353HQP rktpMy6ukLj9W5ImRv2/7xTYQ+mHGOlz4x6HT+gutwbjBHJ9yXSzqSAlI56X946O +djhbU17EZA/ShwZxNnQ1s6Bo5VGBdDhnzTNFOCumfYHWi+/9uuTp5wLSRbN108m WiPPa3HtSvv0FGLvMdyR12EAMN6M4Ss6q+LRQlPhzFzhDNuI1xaFoltpvQxiQ2Rc MfWeNhSuMjaKRusw+v54vJt1zc193yJI3wvZZgx8C7UwJQXSuC8ilKqZ4YZGgNMA 4JXGErxTwPnvW80O/UOVZMvaDeDh2PSpyn+ptt5gFR2D/TynOCJvc/Zr2j9lQRun 98yXF9h0tDJy7dDIMv9l =Wd1v -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#713381: FTBFS in jjenkins - ant problem
This is actually a problem in the ant package; the artifacts versions are not being rewritten to 4.x for junit4 dependencies. -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#712589: libcommons-compress-java: Ensure JUnit 4 test annotations are correctly detected
Package: libcommons-compress-java Version: 1.5-1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu saucy ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/rules: Include ant-junit4.jar on build classpath to ensure that JUnit 4 test annotations are correctly detected, fixing FTBFS. Thanks for considering the patch. -- System Information: Debian Release: wheezy/sid APT prefers saucy-updates APT policy: (500, 'saucy-updates'), (500, 'saucy-security'), (500, 'saucy'), (100, 'saucy-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.9.0-6-generic (SMP w/4 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash diff -Nru libcommons-compress-java-1.5/debian/changelog libcommons-compress-java-1.5/debian/changelog diff -Nru libcommons-compress-java-1.5/debian/rules libcommons-compress-java-1.5/debian/rules --- libcommons-compress-java-1.5/debian/rules 2013-04-13 11:15:20.0 +0100 +++ libcommons-compress-java-1.5/debian/rules 2013-06-17 14:29:01.0 +0100 @@ -5,7 +5,7 @@ JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILDFILE := debian/build.xml -DEB_JARS := ant-junit junit4 xz +DEB_JARS := ant-junit4 ant-junit junit4 xz PACKAGE := commons-compress install/lib$(PACKAGE)-java:: __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#712589: confirmed in unstable
Just to confirm I do see this problem in unstable as well. Ta. -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#683502: jedit: Refreshed patch
Package: jedit Version: 5.0.0+dfsg-1 Followup-For: Bug #683502 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu saucy ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Merge from Debian unstable. Remaining changes: - d/control: Switch to using default-jdk for build, don't use BDI's. Thanks for considering the patch. -- System Information: Debian Release: wheezy/sid APT prefers raring-updates APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring-proposed'), (500, 'raring'), (100, 'raring-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.8.0-22-generic (SMP w/4 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash diff -Nru jedit-5.0.0+dfsg/debian/changelog jedit-5.0.0+dfsg/debian/changelog diff -Nru jedit-5.0.0+dfsg/debian/control jedit-5.0.0+dfsg/debian/control --- jedit-5.0.0+dfsg/debian/control 2013-03-24 20:34:07.0 + +++ jedit-5.0.0+dfsg/debian/control 2013-05-26 22:04:12.0 +0100 @@ -9,6 +9,7 @@ bsh, bsh-src (= 2.0b4-11), debhelper (= 7.0.50~), + default-jdk, docbook-xml, docbook-xsl, docbook-xsl-saxon, @@ -20,7 +21,6 @@ libjsr305-java, quilt (= 0.46-7~), xsltproc -Build-Depends-Indep: openjdk-6-jdk | sun-java6-jdk Standards-Version: 3.9.3 DM-Upload-Allowed: yes Vcs-Git: git://git.debian.org/pkg-java/jedit.git __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#709178: fop: Transition to libservlet3.0-java
Package: fop
Version: 1:1.1.dfsg-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu saucy ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Merge from Debian unstable. Remaining changes:
- Transition libservlet2.5-java - libservlet3.0-java.
Tomcat6/libservlet2.5-java will soon disappear in Jessie. The 3.0 API
is backwards compat for 2.5 so no further changes required.
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers raring-updates
APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500,
'raring-proposed'), (500, 'raring'), (100, 'raring-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.8.0-22-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru fop-1.1.dfsg/debian/changelog fop-1.1.dfsg/debian/changelog
diff -Nru fop-1.1.dfsg/debian/control fop-1.1.dfsg/debian/control
--- fop-1.1.dfsg/debian/control 2013-05-16 09:40:07.0 +0100
+++ fop-1.1.dfsg/debian/control 2013-05-21 12:33:13.0 +0100
@@ -11,7 +11,7 @@
libavalon-framework-java (= 4.1.2-2), libxalan2-java,
libxerces2-java, default-jdk, libcommons-io-java, libxmlunit-java,
libcommons-logging-java, junit, libxmlgraphics-commons-java (= 1.5),
- libservlet2.5-java, libxml-commons-external-java, maven-repo-helper, libqdox-java (= 1.12),
+ libservlet3.0-java, libxml-commons-external-java, maven-repo-helper, libqdox-java (= 1.12),
unzip
Standards-Version: 3.9.4
Homepage: http://xmlgraphics.apache.org/fop/
@@ -22,7 +22,7 @@
Architecture: all
Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libfop-java (= ${binary:Version})
Recommends: libsaxon-java
-Suggests: fop-doc, libservlet2.5-java
+Suggests: fop-doc, libservlet3.0-java
Description: XML formatter driven by XSL Formatting Objects (XSL-FO.)
FOP is a Java application that reads a formatting object tree and then
turns it into a wide variety of output presentations (including AFP,
diff -Nru fop-1.1.dfsg/debian/rules fop-1.1.dfsg/debian/rules
--- fop-1.1.dfsg/debian/rules 2012-01-10 17:38:17.0 +
+++ fop-1.1.dfsg/debian/rules 2013-05-16 16:42:01.0 +0100
@@ -5,7 +5,7 @@
include /usr/share/cdbs/1/class/ant.mk
JAVA_HOME:= /usr/lib/jvm/default-java
-DEB_JARS := batik-all xml-apis-ext batik-libs xml-apis avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-2.5 # ant-junit junit xmlunit
+DEB_JARS := batik-all xml-apis-ext batik-libs xml-apis avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-3.0 # ant-junit junit xmlunit
DEB_ANT_BUILD_TARGET := package javadocs #junit #docs
DEB_ANT_CLEAN_TARGET := distclean
DEB_ANT_ARGS := -verbose
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
Please use
debian-j...@lists.debian.org for discussions and questions.
Bug#708616: xmlgraphics-commons: Enable testsuite + disable test which is incompat with openjdk-7.
Package: xmlgraphics-commons
Version: 1.5-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu saucy ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Merge from Debian unstable. Remaining changes:
- d/rules: Enable testsuite execution.
- d/patches/disable-iccprofile-test.patch: Disable failing test
with openjdk-7 until resolved upstream.
Jessie will be switching default-java to OpenJDK 7 fairly soon; I've
reported the test bug upstream as well (see the headers).
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers raring-updates
APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500,
'raring-proposed'), (500, 'raring'), (100, 'raring-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.8.0-21-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru xmlgraphics-commons-1.5/debian/changelog xmlgraphics-commons-1.5/debian/changelog
diff -Nru xmlgraphics-commons-1.5/debian/patches/disable-iccprofile-test.patch xmlgraphics-commons-1.5/debian/patches/disable-iccprofile-test.patch
--- xmlgraphics-commons-1.5/debian/patches/disable-iccprofile-test.patch 1970-01-01 01:00:00.0 +0100
+++ xmlgraphics-commons-1.5/debian/patches/disable-iccprofile-test.patch 2013-05-17 10:00:58.0 +0100
@@ -0,0 +1,36 @@
+Description: This test fails with openjdk-7 (and oracle java 7).
+ Skip for the time being until upstream resolve - see Bug.
+Author: James Page james.p...@ubuntu.com
+Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=53328
+
+--- a/test/java/org/apache/xmlgraphics/image/loader/ImageLoaderTestCase.java
b/test/java/org/apache/xmlgraphics/image/loader/ImageLoaderTestCase.java
+@@ -162,28 +162,6 @@ public class ImageLoaderTestCase extends
+ sessionContext.checkAllStreamsClosed();
+ }
+
+-public void testICCProfiles() throws Exception {
+-MyImageSessionContext sessionContext = createImageSessionContext();
+-List/* ICC_Profile */profiles = new ArrayList();
+-
+-runReaders(profiles, sessionContext, iccTest.png, image/png,
+-ImageFlavor.RAW_PNG);
+-runReaders(profiles, sessionContext, iccTest.jpg, image/jpeg,
+-ImageFlavor.RAW_JPEG);
+-
+-ICC_Profile first = (ICC_Profile) profiles.get(0);
+-byte[] firstData = first.getData();
+-for (int i = 1; i profiles.size(); i++) {
+-ICC_Profile icc = (ICC_Profile) profiles.get(i);
+-byte[] data = icc.getData();
+-assertEquals(Embedded ICC Profiles are not the same size!,
+-firstData.length, data.length);
+-for (int j = 0; j firstData.length; j++) {
+-assertEquals(Embedded ICC Profiles differ at index + j,
+-firstData[j], data[j]);
+-}
+-}
+-}
+
+ private void runReaders(List profiles, ImageSessionContext isc, String uri,
+ String mime, ImageFlavor rawFlavor) throws Exception {
diff -Nru xmlgraphics-commons-1.5/debian/patches/series xmlgraphics-commons-1.5/debian/patches/series
--- xmlgraphics-commons-1.5/debian/patches/series 2012-10-31 20:08:21.0 +
+++ xmlgraphics-commons-1.5/debian/patches/series 2013-05-17 10:24:41.0 +0100
@@ -1,2 +1,3 @@
#xml-top-level.patch
#xml-rdf-resource.patch
+disable-iccprofile-test.patch
diff -Nru xmlgraphics-commons-1.5/debian/rules xmlgraphics-commons-1.5/debian/rules
--- xmlgraphics-commons-1.5/debian/rules 2012-11-03 14:02:59.0 +
+++ xmlgraphics-commons-1.5/debian/rules 2013-05-17 10:29:04.0 +0100
@@ -11,11 +11,15 @@
# all target, builds package and run test
override_dh_auto_build:
- #dh_auto_build -- -noinput -Dpwd=none all maven-artifacts
- dh_auto_build -- -noinput -Dpwd=none package maven-artifacts
+ # Link in required deps for testing
+ ln -sf /usr/share/java/commons-io.jar lib/
+ ln -sf /usr/share/java/commons-logging.jar lib/
+ dh_auto_build -- -noinput -Dpwd=none all maven-artifacts
-# remove tests for now until issue with DISPLAY is solved
-#override_dh_auto_test:
+override_dh_auto_clean:
+ # Drop any linked in deps for testing
+ rm -f lib/*.jar
+ dh_auto_clean
override_dh_install:
#mh_installpoms -plib$(PACKAGE)-java
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
Please use
debian-j...@lists.debian.org for discussions and questions.
Bug#707587: wagon2 installs an unversioned jar into /usr/share/java (conflicts with libwagon-java)
Package: wagon2 Version: 2.2-3+nmu1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu saucy ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Fix jar file name conflict with libwagon-java (LP: #1171056): - d/libwagon2-java.poms: Ensure all jar files installed to /usr/share/java use 2.x suffix. There is an outstanding bug for wagon which enables install of jars into /usr/share/java which then causes the conflict between these two packages. Thanks for considering the patch. -- System Information: Debian Release: wheezy/sid APT prefers raring-updates APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring-proposed'), (500, 'raring'), (100, 'raring-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.8.0-20-generic (SMP w/4 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash diff -Nru wagon2-2.2/debian/changelog wagon2-2.2/debian/changelog diff -Nru wagon2-2.2/debian/libwagon2-java.poms wagon2-2.2/debian/libwagon2-java.poms --- wagon2-2.2/debian/libwagon2-java.poms 2012-05-27 12:10:23.0 -0700 +++ wagon2-2.2/debian/libwagon2-java.poms 2013-05-07 22:42:50.0 -0700 @@ -38,8 +38,8 @@ wagon-providers/wagon-ssh/pom.xml --has-package-version --java-lib --usj-name=wagon-ssh-2.x wagon-providers/wagon-ssh-external/pom.xml --has-package-version --java-lib --usj-name=wagon-ssh-external-2.x wagon-providers/wagon-ssh-common/pom.xml --has-package-version --java-lib --usj-name=wagon-ssh-common-2.x -wagon-providers/wagon-ssh-common-test/pom.xml --has-package-version +wagon-providers/wagon-ssh-common-test/pom.xml --has-package-version --java-lib --usj-name=wagon-ssh-common-test-2.x wagon-providers/wagon-webdav-jackrabbit/pom.xml --has-package-version --java-lib --usj-name=wagon-webdav-jackrabbit-2.x -wagon-provider-test/pom.xml --has-package-version +wagon-provider-test/pom.xml --has-package-version --java-lib --usj-name=wagon-provider-test-2.x wagon-tcks/pom.xml --has-package-version -wagon-tcks/wagon-tck-http/pom.xml --has-package-version +wagon-tcks/wagon-tck-http/pom.xml --has-package-version --java-lib --usj-name=wagon-tck-http-2.x __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#660688: [jenkins] Please enable maven-plugin
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 06/04/13 18:36, Guido Günther wrote: Re: James Page 2012-07-30 50167644.2040...@ubuntu.com Please note that it is possible to use the maven-plugin as distributed by upstream - so you should still be able to use this plugin. I tried to, but I couldn't find it listed in the Available tab. I guess that's because they assume it is included in core. I grabbed http://pkg.jenkins-ci.org/debian/binary/jenkins_1.480_all.deb and moved the maven-plugin.hpi and javadoc.hpi to /var/lib/jenkins/plugins. Created directories there without the hpi and unzipped the files into it. This seems to serve as a workaround. You should be able to install the maven plugin from the Jenkins Web UI - - I think its titled 'Maven 2 Plugin'. - -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQIcBAEBCAAGBQJRYIXAAAoJEL/srsug59jD9zUP/39wBOdl9FqVVQyIvNDbXlLC 5UXQ4w64QZ2ZdQVwQpjvDksji7MYKELPysJGbdhaxtpcdkI68ji+rVRvcpFKau9A Dc5zgkkVEjL93pepGUBMcU/r3aTq4w0M9HCfnbSVxO4BH1mqNE5avWDamgs7m+1u TSJyES4scAct4FOnz43MS4TplC2ScbJLC9NhSyaLBGf6uO/rc+AEbJe77LGcT86R qdNJZQxP9cV84/tkBX3MTi8ZsOXpaBd50uBDJBN41StJ+rkFjkf3d7o3hDKFfugM UtJp0uP79+E22csk9CKgZ89uJmcXbDNWgPsG4jAAmUZFskNkPplZJP9zsXPFULIg LQGbF5vgcnKXBAIT0IsOqh17s9zhXZkWpoG7Dwl2Hyz0RykNGW5JNPhLEEi0oI79 /QjCONZ6Vj4DTgGiUsJ1m5CX0aZ8T4yWlsGC8yD3jOM/CCy99oQrQHTLr4En0h0T J6a2hDn0AZMzy4Fmt6LzeP1p0POyM8WKUIrrh5Ly3F5KeWuDkrZoOWeSJHvU2aLY komVZu/54MeG/ZAF7ZyEF6+l4/3Y3kVmhNFC8uL8ty7yfLJ2987we6U0PcZQqURx fV2NPOhYiJnJZNnD2mCq1b1sgsXxdKBSVj6xy4a5P6xtetWpN182v4ATbLPiU+Op r2zxK13NqEQjjVd+k+vs =9DMN -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#701376: zookeeper: ftbfs with GCC-4.8
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 I see the same test failures in Ubuntu raring which has glibc2.17 but not gcc-4.8; removing ftbfs-gcc-4.8 tag/adding ftbfs-glibc-2.17 and updating user field. - -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQIcBAEBCAAGBQJRKzpRAAoJEL/srsug59jDk4sQAMZ8/CLkiQhxVh9AVuFXRktz QsfQCzogUe7JyZhaIgvo0vlVEHs7gn3iZqor71/oVb2twuzaGLcNjpLm0/vsWMKX qhLN1mLjgAWW4MpJIfqPXONNxGfn/Rb4ZqHWJX4pYTANfa4tF4k+9COSyCD7s8KC hWLpyapypMtcbcEk4MA5GHyxB9tdo/JaimRBFOwsyhzHk9utS+zz8mw7Vn71oDT1 73kCMWSOevf4mTkH4c7FL0NOSTabxScKTfB3y3vs35QVwszaXP2IwCiGxzs0SRWI fxYLdgw9HrlzkIZL2f/eAJPEsTC8BXCoxbujHGcpMWeOmXNo2p78SG22aOstTH4a V0YRIEKdW0ELFYmDO/w8ybJvj+wGINCnoLN6u3TZpRL0pXj88EIV1TC+cSvwGbD2 dB2K9RokMUAJM4rLwHzxmiYyMMYlq0oujckCga0uxFch9jHpm7AqHTLDudoC9Rl+ wvoBTMMId+RyiT1cdrggErdMGX7Vvk5A6OoCWLeAue1HIlV9GNQJLDwUIQGL5E04 YwuYn+VQ/ReZXcpGjkSPlHOqZyCs5qq4u6/2J/AgExLVdZ79x03a9mUebEaZMOZE fe2YJaxJsQfPClzGxVb5EpLzts0G/IgBfQG2CQHKYsXv1QoBCcX4V5/kjgsMFHOv V/HYOz9gyiW4RDIm0Lrq =ak01 -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#690192: python-zookeeper truncates paths with more than 255 characters.
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hi Paul On 11/10/12 01:43, Paul Dwerryhouse wrote: There appears to be a problem with python-zookeeper's handling of nodes with that have a total path length that is greater than 255 characters. It can be demonstrated with this simple test program, which creates a node with path length of 302 characters. The return value from zookeeper.create should be exactly the same, in this case, but instead, it is trucated at 255 characters: Digging into the python source code reveals that the buffer used to hold the path returned from zookeeper is only 256 bytes; the zookeeper C code truncates the path to fit the buffer resulting in the shortened return path. I agree that this does appear to be odd behaviour - I'll dig a bit deeper. - -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQIcBAEBCAAGBQJRE5WyAAoJEL/srsug59jDPrUP/iGwJFNeU9lAIg5hfZW6Rtlx b8U6nr4yb168SNB+dRJoBBtKO+dr9UqU0Rt2uGDa7aTKI6PT2zoKI4J3PgMpRwcH s7f8mgF/k0f1SHF9N7drSl2ewMinkVf9BWD1GdG/1l2E8PFmsflsQsY5UQAdEaBQ PfJuOlp6kfHCPEMCtaFCPghNE8Fbu+hQy49LeAzDTkKXzOkEW+QACtsP+ZCDEUxD I0UlT0IW2HK+flNIaR4neS40e1ENJWBuZLqKM4S4M3VXMG3NQL3T3jx2CUtLLBg3 UokAuAD45pMcGSFtAVaCO3FB6gQHv6jEfg3kRTdGEltwrLIb9Wd8RobVQ396H5Nc 53kjbLRpW0b6Ys53eY6bQafS+KaEfv0ZztJyfiCkkrkmFb8rWfQ2IN80t69M7UpF 860XZVUYtTzSW264m1ZI6tT4mDZDltAFY412+oqKgHfP5RGBfSBe600K0L8Y9Q8O sLdGCI0k0nkCpb2kki7zgNcR+pQCb+UMpBX4FMgArzoC90tKdrTkM6p99Q2PzBo4 RYQZLHxkHq/FjM/3QFg1mp0KM5d5Tp+VySXH04Q8UJvDfo6rDtL/gq5ROsTLrd/o GJwhOUphWStSad98VPpZGe3vlL0XuJh/fcUJlv7lOYPFD50dd/FBQZnzAe3MsmzF G2QcqkaeM80ARu5cyb9u =E3sy -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#696816: jenkins: Security issues were found in Jenkins core
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hi Steve On 25/01/13 15:18, Steven McDonald wrote: The issue was raised on debian-devel[0] that this bug still affects unstable and is causing jenkins to be a candidate for removal from wheezy. I have backported the fixes for these issues from upstream git; they are attached to this e-mail as separate quilt patches for the sake of cleanliness. Thanks for the patches. I have also uploaded a source NMU package[1] to mentors.debian.net, which I intend to seek sponsorship for if I don't get a reply to this bug report within 72 hours (as the deadline given by the Release Team for removal from testing is 31st January). I'll get a new version uploaded to unstable today; note that jenkins is also effected by another security vulnerability (see [0]) which I am currently waiting on upstream for a backported fix (its big). Thanks James [0] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697617 - -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQIcBAEBCAAGBQJRB7wfAAoJEL/srsug59jDnX8P/1JftdCtKAeVDocwyoz9vzWZ TkPurLAds5tU1lfp3adn41BpVnvzkuzDkT09yfYZlupqT8I14DfY0jSyCdCx/IrB q2D9Rl7if3OQTq5cNgVAAzdg9LLyo9b2Pyj97N1B0zUTjDZTYwSlYE+alj7AuXcq ahdDxNXCE46ZWfqwD+jpBjo4LRcdk/wL8zodu4rvBNFT6bfYV61yWNcrHg8g0eRm abQHngL3C/yM6hUKSXWp/nurQmZLa/8gG4V1TV8Oal1JbhHakCyUDtxDMTjupmbU J4QpN6wAdGndkzx+r85FoM4NqvoWRCUB8RCN4JOWF9zsK2hAVPceCMaf20+zH71j +Ro42JytCbis9vlJfKkJqQnNaHcx7QL8xAykgSlIRdmDx9AdbGAWB7M5CMMtGJvW 3LXcFvcWHBKltqsvbG4/gwn/BR7bN0tZXQoquzYzjpT9qsiPf9oXt3KhPcFI0NO0 TtEltRdQ3NkT5cEBFVd0Cjz4qrsLIgRehJ0Tn+DK+TaCfXOarwExdqx1KrxwN0oO IR0OMcW+nsxBI6IBCQkxtJ+MS+KNlQQA79XnYEnu1QyG5uJF6ibiV3+NJ1O3Aa4G 6Cq9ghV1lNwzj12CAoOkIZ+em+U2BZ2aHkC5LNC7gD4cMG78mgB5oQiuX26Lu5nc 8GE5eDO4br+DTV6Qdz3g =jvHr -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#697617: jenkins: remote code execution vulnerability
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 09/01/13 00:54, Miguel Landaeta wrote: Hi, I'm working in backporting a fix for this issue to this version of Jenkins. It doesn't too hard to do it but I had not tested properly the patch I got. If everything goes well I'll attach a debdiff to this bug report very soon. Thanks Miguel; I'm also about to upload the latest version of Jenkins to experimental which includes a fix for this issue and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=696816 (which requires a new version of jenkins-winstone as well). We might want to consider whether updating unstable/testing to 1.480.2 is actually the best way forward at this point in time. - -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQIcBAEBCAAGBQJQ7pX6AAoJEL/srsug59jDM9sP/3E07QJTYx8B+gltG2+Wc6Qh Lyn/qXV1GPrUs2pKwzyhUa6gOBdQ6CR+PsVa529aSw4j8sIrcLl5qGLexJE6xuC6 u2Fwl5SgFi7WZriS1pK8NEHVyVncjU39gVLCrIrS0U06V6PSDZ+9wfnWDQE/Jzuo WUgOh09YEhxJYdqWt+OsrvMirtCY1w5CzofS+TQ414GHj7mVZAVgRgZwxf3N+Vaz u2avaaqC1cQcb2ZTPfsN/bDlFRNFREJTpHtLhfCmhhAwsveL9LkOCX/NcJOQm/LP PF1WWrPzrDyLzqdNhp6awnndOFOvkq27Pkb0V4G8wom1chgPONEKSrzYFmzphKo9 zPOxiVkK8FOu4hb4J+KNS57KN/t3v/mUad7aoXMVlMUtMv2dbCIGhW2Nf89YbaWC YSbcdTVk0EM/0ar2P3gvcAZGlppMKjbbAYvAWWN/3BPdfYyRwVsw1Hq72tPvrr6a 7hBZ6uKzool8RZAf9qSfSWC/a17NELKXnrbtb8bglHGwOgltkQHoRWC2fyL4t+w+ QH1HdLeP/Yc/GCZK1jwtOVRW5XxIXqyzcD+/YncIUVNqtIFLmBZbLEw56JspxxKl Nix1M9OYKIDa1rBKjYER5ICZXdrv1hUerqLgGe4/+E8x/WT2XB6m1bTkt6YOsn5Y jiqHFGUNyH80R1k5EBKF =biqm -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#697617: jenkins: remote code execution vulnerability
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 10/01/13 15:46, Miguel Landaeta wrote: We might want to consider whether updating unstable/testing to 1.480.2 is actually the best way forward at this point in time. Hi James, I don't know if it is feasible at this point in the release cycle to have a new upstream release of jenkins in sid even if it fixes some security issues. Agreed; its a last resort. I backported the fix for CVE-2013-0158 from stable branch and I applied it to 1.447.2+dfsg-2. It applies cleanly but I'm getting a FTBFS. I don't have time to review it right now but I'll go back to it later. I'm attaching the debdiff I got and the FTBFS log error. I did much the same for the version in Ubuntu 12.04 (1.424.6); and hit similar issues. The key problem is the extent of the patch to fix this issue and the amount of code change in the TCP/Agent communication area between 1.480.2 and earlier versions we already have packaged. I'm trying to get some advice from upstream on this - hopefully I'll hear back in the next ~24hrs BTW, recently the team of developers with I work with began to use Jenkins so I have some interest in it. If you are OK with that I can jump in as co-maintainer. Yes please! Cheers James - -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQIcBAEBCAAGBQJQ7vRvAAoJEL/srsug59jDePQP/3ZNVyvgr6jsG66T1Q/6QEkt HdtZd01UkKZyjmRFwjVDTA73Iu4Y8DI7xArmt4CwzMLwBom5T77wqI80zcr2IjpM /QRJmi9rycztfPvjdGfHSZDR2s/9i+nrHIEBEi+I35zkFROj9QTN6cbmytEw2/LU p7oEsiysl6n/zvj5DqnsH5VjvqmQ1Y7ovR7MBT27ZRTXI39k3dzIM8eOpU/la4Mw t2kKbMJ/M+Xm6eb5G1XHpogQ2/v7WRXMNy0LZdg18shsVrduMf99c+ScacdEWPYf txNos0lmjV+dWfXgQFUNn390Im/u3SceounIKQ9ppiiA4osmptn2x8fwcQHHR+Bg Ph2Yn+Oln7mIASoZ9Ge9MK3ydIDt4UHaAltGoJJdQc4gs9Zc7h/AhD0dwaNodk3E BB3yZOKE46kAhlUx4u6PDxy2k6FmJY0eTY3J3Rp1s2V6quaNI1xvnXDkTHfDpgFr zdznY6D5KTvuSvqXCrufg4z5D/yWev5OYLis+QYS0mf7QuOsg2F8EFRywupqps1P qi+1+dKdiNg94Xwh+Gwt8OpT44yhWWIp2Wcg+ujisBeKf+XDrb/7V3BZk9hYSkuv dETJrGPlKqkLvQv8fIpOhpENDYiMNtMtHGSs/C7UETcNnAH4LmsLt05GihxgFPQH yfY6QFN5a2Gt7Km9ymag =XG02 -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Re: Bug#679616: jenkins: Please package a more recent upstream version
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 25/10/12 00:42, Antoine Beaupré wrote: I think this should also be updated to the latest LTS, at least before the wheezy release. A freeze exception shouldn't be a problem considering the issues fixed are all critical and / or security: http://jenkins-ci.org/changelog-stable I am therefore pushing the severity here and if people agree, I'll file a freeze exception once the package hits unstable. The security issues identified have already been backported to the version in testing - please see the latest changelog entries. I don't think an upgrade is feasible now as the LTS changelog only documents the fixes made in the LTS releases - but the first version of a LTS release also includes every change and fix between the last and current LTS in trunk as well. The delta as a result is huge. - -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQIcBAEBCAAGBQJQiPaVAAoJEL/srsug59jD5QcQAIsShT+5vifPmuJZAJWcDNo6 AD7L/PQ8t0XBy9rmPxEMPOIzJiICdv1RBI/B7WoSZOvmg/+/pGMIrW1i0q0hodKW I/OHprHSlINSEXiDiCkzfFBYyDOon0eOvukYIUrQwZ38eGxMSJkbm2hD1fKG3JMO igldEpwMTvt2vo4r3/pwIeO7Cj1GKav3vQfDWTckwQoHdFvASyp4lNJsK5e5R4Sa HmQm1vrjD6u0QQhatp08rCijiZAK2ZjaXe9wDRG51PxxEcPNYo2xfRRYpHjU6tR8 uiMor6jKwlm8Gez+r33C9v3tZyXh3K5WVXaRu2LgOBWDTXuE5/zKIx5rrVN7TU/s nIVg301Sv1ZVqbltSYsiJ5Ed2cLHEHoShrSgZQXytYRAXxT7uNzHs4gyYRohUB7Z kWs6sAdYxCtLIQY8ZcIkunub+QtM+Aeb1JHJGPqSk6Dm3zE+E8QBvpEt13PJVBX0 jwpwsCl73+qV5S9rKcK8c+/nnX5eGRentKAVZDqGuu9AYGDgvVVE8pnxApsStyQO eOGLl9zKild8aRF1HzmzL5N07yfI6jX3DRmzIBgo4WTv97QvMoZR5B4CixG6QpLG Mn3XO8HRmA1uGTll8li7+NgqTz7LVauOBm5w396TojYnWh5Vz83SzbkP8PTxMRqc kIxyLh+xWhgdw7ig4e0A =quEX -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#688298: jenkins: Multiple security issues
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Note that the jenkins package in Debian is not effected by: CVE-2012-4440 jenkins XSS in Violations plugin CVE-2012-4441 jenkins XSS in CI game plugin These are problems in plugins which are not built as part of the jenkins source package. I have a fix from upstream for 1.447.2 - testing now. - -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQIcBAEBCAAGBQJQYYMIAAoJEL/srsug59jDrBAQAMQC1TNbPRYxBb9kvzdMIZ1y R/l2AEbXO8iQPnU5/8Dk/QviMtYZ0RcVea5bY7pn4YD1zXueGpQk4YGorN2zaAfK OayVFsGySH1w9MioXxdtZnYeySA/Df2yV6cjeuLjxoSYmyDUotSDtaW9IFURMgwb Xv5nKZeyH0W2jcy4GLl5ZGwhpVMBTkLFUGmp9lQtYTx3Q3lFOSUt1G47h7WoplAp xXN1cHhKj6wU/IBu0fDwJ4bsb2e6X0GxW4Uhy64sZBUP4AB18+kk3e2iPeOVeCTJ ySpqqj+7N+hzu8DiYVMSFXcdsYFOUPVTCESn2FDG2XSy0Jpmrj88jlDb0U2jqM1Y yaz2v8TXzVGQjnuIwUx+l9XVzBQXl0VsuCVgqt/MGM1ijlt19aUE/1AZ6DpL/KWA cjqetPkSjbYOCnOFKmr6TzvFdpkBnunkYgYQt2XWtK59s1l60eiWSHvfV0vDknNi TvcSQl/OVDbaZQEEsJiFh5HRVTYkKEH339+76RZzwQI8l2FZpV4APnhl//fvGvBJ mKj1pWPqIoF7GM/sfkNrvSK5Kh3m8AJdNNSJPWNzgxtRcGgZ57uw6hvNhTGY/Aaw IAIEWCqEN+3kyanxqKH8KnKSLCGsPSf9eDUxSY0XIqgslwXv/rvRDgOXb/zKf90G W3txjiK0N8p51IRMY7hs =pxHM -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Re: Incomplete upload found in Debian upload queue
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 25/09/12 12:13, Debian FTP Masters wrote: Probably you are the uploader of the following file(s) in the Debian upload queue directory: jenkins_1.447.2+dfsg-2.debian.tar.gz jenkins_1.447.2+dfsg-2.dsc This looks like an upload, but a .changes file is missing, so the job cannot be processed. If no .changes file arrives within 23:20:27, the files will be deleted. [...] that was me network connection dropped whilst doing a large upload... - -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQIcBAEBCAAGBQJQYaNfAAoJEL/srsug59jDxNMQAIMaOG6gtzmMzqvNEwMwsMSA k2mN9L351RKAg7QA04G4N6IsS+xHIdAyEEAvDEPnI8zmfaIgORS7ce4IB8PzIiMe Hp0RsgUA5f1tPcnq1zM8SqZhGJCyiT4PJn2Y+HIjyHvu9LX/6MrCRbbyAIDJHX/m VFEZkvmv+ZYH/siQk+Y2A46/vNgrXgQoQr4Q4O62mzcYz8n61MzKtlcVexpUGuTu Dcg/iPwxjKSWq4BAatdB1cMB+Y3N69yWR77oetlcarozoKawwBZMVLqBrlLzw1W5 CpP5hH3sBbBeL5U3a0RDndqwgSHCx5t7oA9oPU8sf7JRV1Uonoifd+7l80FW5maj ebVMOr0ZlC1VmkbYqqHyidT9mbSYWK/JxqYCnu9EasgeIoQA9GNRwuNpOoZlcIW0 CRa8SZ9TLZvVARYvBcamvcpyO4ox5pMY1Zd41LIwgvpDRxVgIHzlTNxTbTk1x8lX W4XFx2rVPvLjXcPIS5r0+EExgLUP2pMBGRKsOd9LDLVkEOgFXaMTaGehX2nyk8bF qaxDoP30Cw2y45G9lIo7kPAAtkHhsZUcnwSHTmNeRvgye8voxZz1p4YYVjtMzrIs Et6LpSKOnodOjbpOZb2QcIIn5G+c9H0El0dy2Yc/jFGNJXzOOSpvTP76ezR1Z5We 8mIKayufDbx3NW0Vhw5G =YV8L -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#688298: jenkins: Multiple security issues
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hi Moritz On 21/09/12 09:16, Moritz Muehlenhoff wrote: Please see http://www.cloudbees.com/jenkins-advisory/jenkins-security-advisory-2012-09-17.cb CVE IDs have been assigned: http://seclists.org/oss-sec/2012/q3/521 Remember Debian is frozen, so please upload only minimal fixes and and ask for a freeze exception by filing a bug against release.debian.org Cheers, Moritz I've contacted upstream for some co-operation on this and future security issues; I've been able to cherry pick security fixes before but this time its not obvious. I'll upload fixes as soon as I have them Cheers James - -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQIcBAEBCAAGBQJQYDBoAAoJEL/srsug59jD2LsQAL7CVixd0JRPyfRFUvqtVZ/Y Ewg0eOeZdedjSDfDo3hxvPutfOjQ/4vZaKN0QAPkqil4zbI60qni8MmjduhfZ+2G 8CSbSZlvpN1/WwVoJX0LJm4Ig+aYo1XEBRAt0qi6IFWOEctFbzjkKfzmIHdKhLt4 kXpT6UP3aP8+86rf4gWm/NKkKSvAgiJ1eQGBpcP2lMnLZz7RLNv+2eK3kbJ3xi6K LI/vISH6hGqF/kFCuyteR7N3UPObxnqBeCzu5QsvwULrM1ofN6VXA8Ww52412G2T MuOClqDURYpIaJY8R/HonUPSMkzPh+j/JGMxp2QCtjjzjCNFKE2UNNCA/YQ6mf1+ cE0XhGWQ+t2T+wZVPc1FrS0es2dGOcaYH5+v7Iy8If/+HSye2J/y90AnJ2mKrGCB iG3hTD/YurPRtKEgJnYpHbcykUWmKWUjaIWlOkHPsTSMRKWBc5BEYzXI7AQsZ+fD +9Goh4lHSf52443+kLuFtaQ0xltX+/zjzq5XZrBPU/fLZ7q0iWGI7fjAOqD7MNax RdTCuaDYDHryrO05sPmy1vIkrTyI0rykbJvJ3QL1aI6SqnBKJw07e8PfYNuafKcg UBa8BygMLHLBSYvms3ByyhqST4vkNuvtYh6sQ+rp/iF5Rr8TdKvqSZJmn2Py50IQ 7SpzJlYATbUZO1w2Zp54 =tw2r -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#688306: wsdl4j: Ensure backwards compatible bytecode is built
Package: wsdl4j Version: 1.6.2-4 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Ensure backwards compatible bytecode is built (LP: #1049817): - d/ant.properties: Specify source/target = 1.5 when compiling java source code. Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers quantal-updates APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 'quantal') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.5.0-15-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJQXD/jAAoJEL/srsug59jDjs0P/14QzJZeiIUyRHxwoEXVHmnL D2teD7NGIOuEmKqdWOozhVmlwQE8a+B17qq9WbC6aSN1BabbCXYS6YslHsTfxdeM rnW5ayq7MOC9thVvKLbGTOlc/GNR0uPEzTktQqzbFXV/s6bqnTh101xABudXeBew mheDFSKwMWjx19rdXewyLJp5P2ZdtkVe+KW8wqlchJu9IiUk69SvphJ3prYxx2IQ w2WLj8M+EdxjLwMmkQQy3+i/77RQECHPbLYlIYrQaok7ZUtvFpMQZ59QZf5BkAKQ bhA+Zmm9tyxSaA609ejwwqhLFhz/SV7aN/M3BSCjoDlrQ5sk3VEwsZ8bA2lUvh5D ebPXoEPQ8apEkQf8/vmekqaZ2Y9g9XBMt27KKWdnHoSAISem1Uano0SvXkHPyYLb tD4vTo9PMecZWYKRfrv9xKiqf743r09Jt7rahZkd1OdsjuEnKKOrtVPq/1mArkvJ x8ycwYTinw1qnHaTIrSP+JfDhwxevXSUrCmu7v+E/LA6D4PaqHpGo64uWkirS//B IUOE3XVlMnoN1fP1waKRATEPhBf9QZRD2f0ocdHGvB/gnDNVtpyDItXGBpZg7Crd yVrjMNl7D9wY8facMOsRtVhPPwyDqG/+jwHoOYi2AMCh47RjSPVJI3z9m/cuZPwh dQ6PJ+1YFVs9lXOrAD2a =3cbK -END PGP SIGNATURE- diff -Nru wsdl4j-1.6.2/debian/ant.properties wsdl4j-1.6.2/debian/ant.properties --- wsdl4j-1.6.2/debian/ant.properties 1970-01-01 01:00:00.0 +0100 +++ wsdl4j-1.6.2/debian/ant.properties 2012-09-20 11:14:43.0 +0100 @@ -0,0 +1,4 @@ +# Ensure that source and target are 1.5 +# For backwards compat on Java 7 +ant.build.javac.source=1.5 +ant.build.javac.target=1.5 diff -Nru wsdl4j-1.6.2/debian/changelog wsdl4j-1.6.2/debian/changelog __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Re: Thanks for packaging tomcat7!
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 19/09/12 00:32, Miguel Landaeta wrote: (Not reporting this as a formal bug because it's trivial.) There are not trivial bugs! Thanks anyway for bringing our attention to the issue, I already fixed the typo. It will get fixed eventually when development of new Debian release begins and new packages will get uploaded. This difference will be dropped once the new Debian release begins; it already has been in Ubuntu (but it missed the freeze for wheezy). - -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQIcBAEBCAAGBQJQWYV2AAoJEL/srsug59jDipYQALOTqSeAoxcDhxDNU4jZfb3a M/kKKmrqJZDiWK8Y3Eb649QirFq+qG3AYfY92b/KMb6oWpxafI37UWVrqt2jTO+D WukW/QTQHKxqSYufvrZdfAJCkHzqn5v/F5vTtkuG/FzG+5HzArmH424DOLCWmtvh 55vrWLKgH3ouhdlsJP9ulJXcgOSH23oAQI0wxI7NMMtA6pp0AQ9sRi4ZU7eBXdJ+ gH4GUNOkqZhgWqhtLpiJC90uj4+4BXvwadoeuiAhifPd+y6gohoI0MJPF0svTUwi GNLAoP3UF4oWYf1Q/L87dwfOIzgqR4HkqfxBu6Dm+ExCITJ171F4Yz5X8Tocg1bo h9wvtdfmYUYXQcYRVsFop+5eSQ9HVXBgQDGKSt/RfneKq98qo2KSgpcj+KxZafWk KXdaVT/3YNQopn/LnSR9lYDfvCEN+PTrziPesJsrTByHjZdzEPETpqeqmkqml/+N HT+/a+ep+BpoCt6UueE4zzaVtLbrGUgVSqMkGUubYWq/qDlIoopBXv+pf2Ag6MSE /U0HQjc6CWwKx1MpZmybLaGaNm0pinDJpDBIQv8L5tt4KE3UZAqpmvEwv5GkhG5H dQIIgtMl3aQXgGWJff37GUv6Vpvjjg97DARLMqS9qLE5LDB5ibBlPC6oVUlHPCbK BbEKwQktKE75AVORcC22 =LkGI -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#688117: libcommons-collections-java: Ensure backwards compatible bytecode is built
Package: libcommons-collections-java Version: 2.1.1-10 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Ensure that backwards compatible bytecode is built (LP: #1049688): - d/ant.properties: Specify source/target == 1.5. Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers quantal-updates APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 'quantal') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.5.0-14-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJQWd9fAAoJEL/srsug59jDUR4P/3iz+KMz3nT1Kz9ikCS8X3aM /v1o4CvFiwfQ+AeJ+SkZJ0AMITHwBbPWvlLuiQhz735fFdzIGSqbyvMTIPxVcVQX CY6tttU6qKcVA/U/mLj1ywIW4Ou3R8sgxqMd582FzqzNNrtHAHIK4FfGDTCG8hyg aUS7NP0Vsm/qHQd6Xz1SOQKAeXv282Ls9HpZudomFXveUDUvb2QWR0waHlNTRBb3 bfWcqFYdFMVDho+zp1hza8fmmBhzGP1jQZqmBuoAer29kLGgC/6WVVMk1MPMIBbv BVshfjADONtE5JVKwvtrh4llEtO4cpczMY1aWkDwTGBH5mBodZg7VaKfjJ18I+Mc IiV+S0QoUN+ytmnv386OE1EG+auHizDN5NRT8vmmeig4olG3QTdO5BeHzNPMSbAP pfH3g/UOFqMhqysJ2ANVjnCB/m6lJTIoUM2kUT/xImMJrgWGExsCTYIIo+7nDLfI vBLH/EU0kg4B/AK8XjhSnk28AuMn2PVYxSHbiPHBuQftEqcaEyTImOZ0bEpzh/iX FV48mswON45ObwH9Idq4ooH1A4D6QyU2Ohw9Totr4t4aKNKi/kPH7le9MZOUKWfO gE3qmAgxJus+ElJKvT+pLxzDv1JqfdyiL1Qglv2KfcIHnOKOTadpr63uOdY4fmQ2 opz5ExHD851rzpG5n/HC =X9jl -END PGP SIGNATURE- diff -Nru libcommons-collections-java-2.1.1/debian/ant.properties libcommons-collections-java-2.1.1/debian/ant.properties --- libcommons-collections-java-2.1.1/debian/ant.properties 1970-01-01 01:00:00.0 +0100 +++ libcommons-collections-java-2.1.1/debian/ant.properties 2012-09-19 15:52:18.0 +0100 @@ -0,0 +1,4 @@ +# Ensure that source and target are 1.5 +# For backwards compat on Java 7 +ant.build.javac.source=1.5 +ant.build.javac.target=1.5 diff -Nru libcommons-collections-java-2.1.1/debian/changelog libcommons-collections-java-2.1.1/debian/changelog __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#688118: libcommons-compress-java: Ensure backwards compatible bytecode is built
Package: libcommons-compress-java
Version: 1.4.1-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Ensure backwards compatible bytecode is built (LP: #1049689):
- d/build.xml: Set target = 1.5 during compilation.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5.0-14-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJQWd+nAAoJEL/srsug59jDndMQALL5XyfZEKt0EuN7/2Z4Qj+n
08cg0U7ysNIyHLTIfILoHI6e5s1VnxrYNoCRw7CbckrSbVtcNKlKia9S1K3rbHzE
LfVhaZx6amu+E5kE6ge/7Lm8e7z27yXXeSjxGbMuXQ/2b88ttmRBpfylAmWZTVe/
TztaBG/fe7Qff+shzUHZUBPikwZ+WlchhgDpadjITSqgvl1Rabq0cnkN+SD4NaGz
fg1hmqRStXAlssealKjSYIeQ3CnYVp7Ln9wF+44MgnucdjRr7L49USjLWuS+Y42Z
qct9jFmN9pfHNW0Ysq8l3RXA5H3BxObExEhjWq7rvQehTcfEsj4OeoE1SyiJM5zq
rqYOyrSjs4Q2el1Tta/So2Ci5+urnzoROSVLxJ/IPANMxsPxWFkechHTwIFlxRYI
wT2jzmVHpdssL6dZCwGZpx0E/+BQfbd7YMvTrmGLfvyCN4JFInwpUd+3v86YvAQO
jSas0pqbHVovBRp430yXTH0IlZ8j39GfO+RV7bqXH/ONwBVNVn8Fb4tPyKDv5uf5
m7akZ8gZAjzpuIL8o0PQxli6sWyM5cb0/Rg+0lvFfClWwKKT95PDlrLqrDYxemZe
wEu9gEBZRy7bEj1NAKdRSQYzOde4cYChdRftzbFGBI19c7HqdXlokRgonouGqtP8
efoIw4YCQg27NBPhPFnd
=1P16
-END PGP SIGNATURE-
diff -Nru libcommons-compress-java-1.4.1/debian/build.xml libcommons-compress-java-1.4.1/debian/build.xml
--- libcommons-compress-java-1.4.1/debian/build.xml 2012-05-30 00:32:23.0 +0100
+++ libcommons-compress-java-1.4.1/debian/build.xml 2012-09-19 15:58:37.0 +0100
@@ -10,13 +10,13 @@
target name=compile description=o Compile the source files
mkdir dir=${class.dir}/
javac srcdir=${source.dir} destdir=${class.dir}
- debug=true source=1.5/
+ debug=true source=1.5 target=1.5/
/target
target name=test-compile description=o Compile the test source files depends=compile
mkdir dir=${test.class.dir}/
javac srcdir=${test.source.dir} destdir=${test.class.dir}
- debug=true source=1.5 encoding=ISO-8859-1
+ debug=true source=1.5 target=1.5 encoding=ISO-8859-1
classpath
pathelement location=${class.dir}/
pathelement path=${java.class.path}/
diff -Nru libcommons-compress-java-1.4.1/debian/changelog libcommons-compress-java-1.4.1/debian/changelog
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
Please use
debian-j...@lists.debian.org for discussions and questions.
Bug#688043: maven-debian-helper: Make intelligent decisions about whether to install to /usr/share/java
Package: maven-debian-helper Version: 1.5.1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu quantal ubuntu-patch -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Make intelligent decisions about whether to install jar files to /usr/share/java (LP: #1052533): - SysInstallMojo: Automatically detect if artifact is being installed into a Java library package (excluding maven plugins) and set flags to ensure that jar files are installed to /usr/share/java IF config options relevant to /usr/share/java installation have not been explicitly specified. Hopefully this makes m-d-h a little better in terms of trying todo the right thing when no explicit options are provided. Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers quantal-updates APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 'quantal') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.5.0-14-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJQWJqLAAoJEL/srsug59jDx00P/1lWLhHLUIJ+DSwYVLKZmmui DX59XskH+cdrn1H41tyN0NS7pIy52gxpaQGdMYEe5vV3I94P2523Oqg4/O21q3kA DcHAJeWh/JW7iF3aSe0/fdsBukhPUcQlvOejYQ4MHrGmiyxhVLg09h7hB75eaVYk VdU8hpKDOvJC9U+yMZMwCLESaqqOXYDTM8mJVl25GrOJmOroDHpNXxBmnHHwZpfs oVTYGViECtYevIPLz3k+r6edeDGZGzaIbby/9KO8m+EMZYsIkOqZhVppTvuBzK6V 8XTpGHOZazScPHCDLnfn2snncqwMXOUrkLyEN9WQHeio/4hs0w3sLpFYEj2nF+oG wFt54vUgd+4ZgiocOY5bdR3T7tNvEix7zXAzfo9NQPZQY+RQFbAu8dvJtig+IJ4o ynynLy22JcYAhk2O/nofqcuAGSwximdCAMAnWPzoNz0BZvNcqUsfYS35M6vhOQNO 1t+S4ze7qOSzAFBRSxaoepHHWUCLnvQIjJLrFGK7gRoC2vqoqxtXRym6w7oEFKka 2Zzlmj3IzhvjibDzu146PZChOEU5Or8mOSZWKvWmbMQs/9lRuBv0U3xTdNgSeART jH5y6Yo8XQ9ue5v2aqIToP0IJfvLo3oiwLdkx6G7D70W8RrJZGEZSlDF0aCfjnup jjI2d33JTg4TWM3/RWhK =gD8u -END PGP SIGNATURE- === modified file 'debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java' --- debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java 2012-05-04 00:51:14 + +++ debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java 2012-09-18 15:41:11 + @@ -22,6 +22,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; +import java.util.regex.Pattern; +import java.util.regex.Matcher; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -177,6 +179,17 @@ private String classifier; +/** + * Regex for detecting that package is a libXXX-java package + */ +private static final String javaLibRegex = new String(lib.*-java); + +/** + * Regex for detecting that package is a maven plugin package + */ +private static final String pluginRegex = +new String(lib.*-maven-plugin-java|libmaven-.*-plugin-java); + // -- // Public methods // -- @@ -658,7 +671,19 @@ classifier = pomOption.getClassifier(); } -installToUsj = pomOption.isJavaLib(); +// If package is a java libary (lib.*-java)and is not a maven plugin +// (lib.*-plugin-java) potentially install to /usr/share/java +boolean packageIsJavaLib = + Pattern.matches(javaLibRegex, destPackage) +! Pattern.matches(pluginRegex, destPackage); + +// Its also possible to configure USJ install using +// DEB_MAVEN_INSTALL_TO_USJ which we should honour +// over auto-detection if its set to 'false'. +// This is stored in 'installToUsj' on class instance +// creation +installToUsj = pomOption.isJavaLib() || + (packageIsJavaLib installToUsj); } List params = new ArrayList(); __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#687375: java-package: Add support for Oracle Java 7 JDK for ARM architectures
Package: java-package
Version: 0.50
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Add support for Oracle Java 7 JDK for ARM.
Note that this is a little kludgy; the Oracle JDK for ARM lacks some
features that the JDK's for x86 archs have such as plugins and javaws.
I've tested this with Java 7u6 for ARM from the Oracle website.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5.0-14-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJQUErUAAoJEL/srsug59jDtbMQAJKeC2SPnsMIoKeaJyYIjeiJ
RjzHfN6oMrF94ZBtXhdQ6iDOeuqh5czEKeNscwrDVh9sqauQdQ6CHBIeptM7hkPN
YCQeHJFvGjYBv8x4baU2Xr8YPthV/yiUoxlXsj3XElbRqUR5H7hlV6APhFcjNxTe
jLtqC4sJ7YNTmjmVC1YxVbPpvslowpvfFLxn7TioDAYJdjaAEcN0j45ZNYVdpIOC
74xZ3tNniO2qv7EcbjnQFBW+JB+x4F3EvojUJcwg187VQh4zdUL5qHnnn/74Bdge
cA6Epc9ipLopmRC2HGTUTA7G6o8CtRCFz64B86xArceuYNr602eiblXNYk/4MZRV
QatuFgpR13yN3doyp5LT1xGX1yHv9vB1ji5VWI1b9RnzdFfI8liJDZPOJc2PcQhp
/GaUZMvH4eqEtw0uUq+XlBZDJzuPYa9n+ijcLwniOPRwG7ctfwXlcQwmMOi8jCCo
jLkC3lNnJ7DBf9bmvx94uvTQHICE7BAQ1m1JUxGsCSDQCZ3FjGFWGoA+AyRw4LUY
o/z94TUwUTsQbL7UPQMB8PsCVz7A7YVHYff3EM/zqrZmK0VkXhJ8Or1Wr+DMM+kg
kbmo41Nc7/DpTXmHmu5MVxt8DGyiZDqSmqdOtINjh7HGjrWIn0ITQU9HIwqRn7Lr
am8bOmozK7ibXSsd8mxZ
=+nQj
-END PGP SIGNATURE-
=== modified file 'lib/j2sdk.sh'
--- lib/j2sdk.sh 2011-12-22 11:42:13 +
+++ lib/j2sdk.sh 2012-09-07 13:13:45 +
@@ -1,12 +1,23 @@
j2sdk_control() {
j2se_control
+java_browser_plugin=java-browser-plugin,
+depends=\${shlibs:Depends}
+if [ ${DEB_BUILD_ARCH:0:3} = arm ]; then
+# ARM is only softfloat ATM so if building on armhf
+# force the dependencies to pickup cross platform fu
+if [ ${DEB_BUILD_ARCH} == armhf ]; then
+depends=libc6-armel, libsfgcc1, libsfstdc++6
+fi
+# No browser on ARM yet
+java_browser_plugin=
+fi
cat EOF
Package: $j2se_package
Architecture: any
-Depends: \${shlibs:Depends}
+Depends: $depends
Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2, libstdc++5
-Provides: java-virtual-machine, java-runtime, java2-runtime, java-browser-plugin, java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, java-sdk, java2-sdk, j2sdk$j2se_release, j2re$j2se_release
+Provides: java-virtual-machine, java-runtime, java2-runtime, $java_browser_plugin java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, java-sdk, java2-sdk, j2sdk$j2se_release, j2re$j2se_release
Replaces: ${j2se_package}debian
Description: $j2se_title
The Java(TM) 2 SDK is a development environment for building
=== modified file 'lib/oracle-j2sdk.sh'
--- lib/oracle-j2sdk.sh 2011-12-22 11:42:13 +
+++ lib/oracle-j2sdk.sh 2012-09-07 12:29:27 +
@@ -36,6 +36,16 @@
;;
esac
;;
+armhf|armel|arm-linux-gnueabihf|arm-linux-gnueabi)
+ case $archive_name in
+jdk-7u[0-9]-linux-arm-sfp.tar.gz) # SUPPORTED
+j2se_version=1.7.0+update${archive_name:6:1}${revision}
+j2se_expected_min_size=100 #Mb
+j2se_priority=317
+found=true
+;;
+ esac
+ ;;
esac
if [[ -n $found ]]; then
cat EOF
@@ -55,9 +65,16 @@
j2se_install=oracle_j2sdk_install
j2se_remove=oracle_j2sdk_remove
j2se_jinfo=oracle_j2sdk_jinfo
- oracle_jre_bin_hl=java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool
- oracle_jre_bin_jre=javaws policytool
- oracle_no_man_jre_bin_jre=ControlPanel
+if [ ${DEB_BUILD_ARCH:0:3} = arm ]; then
+ oracle_jre_bin_hl=java keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool
+oracle_jre_bin_jre=policytool
+else
+oracle_jre_bin_hl=java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool
+oracle_jre_bin_jre=javaws policytool
+fi
+if [ ${DEB_BUILD_ARCH:0:3} != arm ]; then
+ oracle_no_man_jre_bin_jre=ControlPanel
+fi
oracle_jre_lib_hl=jexec
oracle_bin_jdk=appletviewer extcheck idlj jar jarsigner javac javadoc javah javap jconsole jdb jinfo jmap jps jsadebugd jstack jstat jstatd native2ascii rmic serialver
j2sdk_run
@@ -73,13 +90,18 @@
install_alternatives $jvm_base$j2se_name/jre/bin $oracle_jre_bin_hl
install_alternatives $jvm_base$j2se_name/jre/bin $oracle_jre_bin_jre
-install_no_man_alternatives $jvm_base$j2se_name/jre/bin
Bug#684979: libjboss-classloader-java: Compatibility patch to fix FTBFS with openjdk-7
Package: libjboss-classloader-java
Version: 2.0.6.GA-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Fix FTBFS with openjdk-7 as default java (LP: #1009465):
- d/p/java7-compat.patch: Compatiblity patch for Java 7.
Erasure semantics are stricter in Java 7; this patch hits the code with
a hammer to avoid the compilation issue and is pretty ugly but works.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5.0-10-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJQK4rRAAoJEL/srsug59jDy3QP/0kx0TWeH0AWd66aE4Cd3w/Y
XW4bZ4dDCrD/Q11wJnDexZD9iT0GB6fZQjIQcPUucb88dfXPWIsVqX7SEBinxgZ9
1SajReh8CHFE7nZDFfVJ+v8jfu8pi2RXcHpc3sw1/PYx31pazqnRs1Vb9FZrLP7z
UHSAJ1a4AGr/z0xFDO4ssW33vGd7iO1AI5WJ6+w3P/UOU3ImVpKs0zPFfXCmL68Q
RrEfCAuuDTkJaPvmUQryDsOHigLCKp/7QSYlh1vPNu9YjGLCSxw8AOpkVFrIsXWQ
HGo7+EQnknFGISh7OqKASBh7Rs2QZ15DOkfEVMtgIt2is7yxrL+eV4fJn86uhVLq
qo7yZ4TUo4Xg723E4D+cn4zjU5EcZshH2m7CXwfaFU5Eb3nceRpnYQyhsMWhl9rI
0qimDs/EcYP1c+W792fDS0Qn8vnf/9doVjjZGWYPqZtNOmep7vbqFOJ3xYHXMLrr
N2k/NFfYhBSkGN3vvXuOsI1iXCMweh5HG6JVYKI5en2zcNpBQ2EQywmOHKqc9qPb
MwBN+hzptjGLcblGzmeeebJps9K/hKZdcwcO9d7QNcND7cs7WyvZrB1h1o75EAQU
OodfIxbfxgN+MXBvR/VAM8g4qm3QR7GouGLOkMxeSQCasmzJsmE0PgMqM5Qdjdlz
uGGLBCwiOSFKkzWur7Wt
=XNJk
-END PGP SIGNATURE-
diff -Nru libjboss-classloader-java-2.0.6.GA/debian/changelog libjboss-classloader-java-2.0.6.GA/debian/changelog
diff -Nru libjboss-classloader-java-2.0.6.GA/debian/patches/java7-compat.patch libjboss-classloader-java-2.0.6.GA/debian/patches/java7-compat.patch
--- libjboss-classloader-java-2.0.6.GA/debian/patches/java7-compat.patch 1970-01-01 01:00:00.0 +0100
+++ libjboss-classloader-java-2.0.6.GA/debian/patches/java7-compat.patch 2012-08-15 12:33:40.0 +0100
@@ -0,0 +1,20 @@
+Description: Compatibility Patch for Java 7
+ Avoiding:
+error: name clash: suite(Class?) in IsolatedClassLoaderTest and suite(Class) \
+in AbstractTestCaseWithSetup have the same erasure, \
+yet neither hides the other
+ .
+ Class? and Class match in Java7 compiler semantics - so dropping the ? is OK.
+Author: James Page james.p...@ubuntu.com
+Forwarded: no
+--- a/classloader/src/main/java/org/jboss/classloader/test/support/IsolatedClassLoaderTest.java
b/classloader/src/main/java/org/jboss/classloader/test/support/IsolatedClassLoaderTest.java
+@@ -58,7 +58,7 @@ public abstract class IsolatedClassLoade
+ * @param clazz the test class
+ * @return the test
+ */
+- public static Test suite(Class? clazz)
++ public static Test suite(Class clazz)
+{
+ return suite(clazz, false);
+}
diff -Nru libjboss-classloader-java-2.0.6.GA/debian/patches/series libjboss-classloader-java-2.0.6.GA/debian/patches/series
--- libjboss-classloader-java-2.0.6.GA/debian/patches/series 1970-01-01 01:00:00.0 +0100
+++ libjboss-classloader-java-2.0.6.GA/debian/patches/series 2012-08-15 12:28:46.0 +0100
@@ -0,0 +1 @@
+java7-compat.patch
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
Please use
debian-j...@lists.debian.org for discussions and questions.
Bug#684980: geogebra: Ensure backwards compatible bytecode is built
Package: geogebra Version: 4.0.34.0+dfsg1-1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Ensure backwards compatible bytecode is built when building with openjdk-7 as default java (LP: #1033815): - d/ant.properties: Set source/target = 1.5. This will ensure that this package is compatible with all versions of java avaliable in Debian. Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers quantal-updates APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 'quantal') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.5.0-10-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJQK491AAoJEL/srsug59jDce0P/3wIJut2NGrN/8z8H279JZeG 0KzXS4uEFph467hZUWlICqafPRkZdJdiI4G5KiRTxDAOypQFb/n/y6yd/6tLYFTt lgQw2wkaH6NzxfPjONXUCEKPirOW1c5P6D7BOWT0WcfGF/0Aiq4EvOkMENNokPdQ 3EobID4kZa/AOOqJjzpaww75E4gCDlhd0VwXGrUUxOKu1FkHmTCsbUZmBXsYKYRs xetbX2Zz+r/oEVlrFAYCOn1psPDH+CZDvZz1IeopC2CRpM/tzs6k4EEQ5zZBt+Rg zMz55olZi+3+I4QXqt7wNzHEpLm2bZP+Sd0DBsWyPtHyI8VnukwrnQ3I1RtCCeN6 JP76isRBXvR0HS0gVYCYM+fGb0RnqXtka2491ZChzi8Ch31STKHeQwzym/F3KeQ7 /rxjWC56l4tbRbDg8Fv19RYFYtQxX2PFFMALHKjzBgupV++caU/CNN6vhIHeK81C LUeqaUeq4BVZPTpXq17Us3vUDLM0kxOCBLysCEYkeMQm1NXQ7b+CiDQ5ywfF3WHl XyFWJtp9PL09gfGzEeopKkLC6qCTMDnHEFx0f84iliHye1mudu0OVZI+WQAloGpG fVYecdSYP/07uJpdU2vCMwio+3Wf3XE0/l5B13UM/4LCnoTQpha8CmFGbyLaZ/qe k8oTSS1GvYPmqKR2NcwU =+qMn -END PGP SIGNATURE- diff -Nru geogebra-4.0.34.0+dfsg1/debian/ant.properties geogebra-4.0.34.0+dfsg1/debian/ant.properties --- geogebra-4.0.34.0+dfsg1/debian/ant.properties 1970-01-01 01:00:00.0 +0100 +++ geogebra-4.0.34.0+dfsg1/debian/ant.properties 2012-08-15 12:53:41.0 +0100 @@ -0,0 +1,4 @@ +# Ensure that source and target are 1.5 +# For backwards compat on Java 7 +ant.build.javac.source=1.5 +ant.build.javac.target=1.5 diff -Nru geogebra-4.0.34.0+dfsg1/debian/changelog geogebra-4.0.34.0+dfsg1/debian/changelog __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#684586: jenkins: Allow configuration of httpListenAddress using /etc/default/jenkins
On 11/08/12 15:00, Nicholas J Humfrey wrote: Please can you add support for setting of the httpListenAddress option in Jekins, using the /etc/default/jenkins configuration file. This will allow binding to localhost (or other alternative IP) and then use another webserver (such as Apache) as a revery proxy in front of Jenkins - this is a fairly common setup I believe. https://wiki.jenkins-ci.org/display/JENKINS/Running+Jenkins+behind+Apache Sounds like a good addition (but I won't upload this for wheezy); for the time being you can add this to JENKINS_ARGS at the bottom of /etc/default/jenkins which will work just as well: ... --httpListenAddress=127.0.0.1 ... Cheers James -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#678032: libiscwt-java: Compatibility Patch for Java 7
Package: libiscwt-java
Version: 5.3.20100629-2
Followup-For: Bug #678032
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Fix FTBFS with openjdk-7 as default-jdk (LP: #888963):
- d/patches/java7-compat.patch: Update usage of FontManager for
Java 7.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5.0-10-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJQKjJhAAoJEL/srsug59jD+T0P/0oBeBI+V/0iBPLyIB6O7T56
wA9BujPIX5et1fO45vnSdw2z8On29ECXq2qtTqqGENJ3wd5hQo9GglwHo+MH6gJo
+TWihFwR+JuZjTzD4Rks1YYdsVqawCv7/dEU/PfNMeaMrFC2K+dTnZWzYT7kFLJ1
KWhl+/Md/uceAY7T+6n64Ykt8bey/w4Y+cn5k7XDWOJqb6W/CSfYmip5UAO90B/P
OMXJQXRoDn4NMOL69+k/PI4SB6xr83Mx9DIIE+ofix/TDrROiMFMfX+TzwLBieCL
Lu2ybDZ5XgVcUAuE7TXHWAnxLZoCg24R8byhbthAwDTp5XMyVNV5+fzKKgCrHf9w
YCToiPy3cyr82K7hgk0KtaKyLBzCtyKJaY9f2eq1/+8hCKbnWwpuvMBDPYNBb23o
UK9qTewVRt7qjjZViK3Qmar5rBpIlAEK4F78a9x0u8ndgMCyaX8xwhbKgYk1AxZO
0gOilMQ9kQBuJlQ+lS3KCPfOtusb9BBOUBFzTyHiBWmFCq/mbOXvOzWXW0bKZ6wL
qtxF8Zk9/9xnZ/McRN94LJb2QosGSchnS9d1Ookpicu2T2SytkYpJLYsSfK+aTJ3
CjFt+l/1a6DCa5zN5WUp3VPvlZftWe5FSHDu8MQetS8See7zMrAcLykFJKCGYAhS
kvRYV/4KKa0eAHLMXgXO
=+AGw
-END PGP SIGNATURE-
diff -Nru libiscwt-java-5.3.20100629/debian/changelog libiscwt-java-5.3.20100629/debian/changelog
diff -Nru libiscwt-java-5.3.20100629/debian/patches/java7-compat.patch libiscwt-java-5.3.20100629/debian/patches/java7-compat.patch
--- libiscwt-java-5.3.20100629/debian/patches/java7-compat.patch 1970-01-01 01:00:00.0 +0100
+++ libiscwt-java-5.3.20100629/debian/patches/java7-compat.patch 2012-08-14 12:09:58.0 +0100
@@ -0,0 +1,16 @@
+Description: Compatibility patch for Java 7
+Origin: http://sourceforge.net/projects/jpodrenderer/forums/forum/841333/topic/5320298
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libiscwt-java/+bug/888963
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678032
+
+--- a/src/de/intarsys/cwt/font/FontEnvironment.java
b/src/de/intarsys/cwt/font/FontEnvironment.java
+@@ -102,7 +102,7 @@ public class FontEnvironment {
+ String definition = null;
+ // force FontManager initialization
+ Font.decode(dummy).getFamily(); //$NON-NLS-1$
+- definition = FontManager.getFontPath(true);
++ definition = sun.font.SunFontManager.getInstance().getPlatformFontPath(true);
+ if (definition == null) {
+ return new File[0];
+ }
diff -Nru libiscwt-java-5.3.20100629/debian/patches/series libiscwt-java-5.3.20100629/debian/patches/series
--- libiscwt-java-5.3.20100629/debian/patches/series 1970-01-01 01:00:00.0 +0100
+++ libiscwt-java-5.3.20100629/debian/patches/series 2012-08-14 12:02:38.0 +0100
@@ -0,0 +1 @@
+java7-compat.patch
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
Please use
debian-j...@lists.debian.org for discussions and questions.
Bug#684289: robert-hooke: Transition package to use default java implementation
Package: robert-hooke
Version: 1.1.2-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Transition package to use default java implementation:
- d/control: BD on default-jdk (= 1:1.6), switch runtime dependency
to more flexible default-jre (= 1:1.6) | java6-runtime.
Ubuntu quantal is transitioning default java from openjdk-6 to openjdk-7; this
patch eases the transition (and future ones).
Note that this is not a release goal for wheezy.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5.0-8-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJQImkzAAoJEL/srsug59jDcncQAJfI21r8fpYLbaujCZn15dVy
8+0EV4486sfSEli16LL3Am2YVkioONck84yVCWu13TLgC9EhiEY73ZCHb2jB25/L
6+rwFqfhXdRUp0Xi4XovEaIpbBgvh23WS4Vbc+A9rMiCHvSIQKNx6EIgG0T5M6dD
mCUXuLdm71oRwn72X9X1nDkiFHpQe6keqbRcnJ8rJbWM/Z5wNzi3V7KJYUK2nA2Y
vgdXIHUjULIFHUb1yeigxvQ+tS0JbFoMavoZuAyvOkmqimFfDwXybLFSEJ9d4esO
2Dkv1SrQh1vYzu0SPYA8PmVW0TSbdACu4WWpnmNfML9qsboUtdH6/HmHqRjyMbPF
gmi3gmvxXZ3Lif5T7OaobSvY0teDHSsAaqjjN9zrJXQl3c1UsKiAKbR3+q14aWYK
Dtg5T+2729cFxoOUp8R9z+dMreftwY9m2HEsQJFshl49p5CA29amdxjBtD8iZheK
WyIc0VlxmBx7yDZtqYfQQzPXPA6xU3t0TFq5jOXBEPqDD1KXmgqxxupMjNuc99ou
MWc7012sPc94ZTjWwEaeJqVpv5dIx9ZZ9cQhcEWq0ulvaY0Kgl3L9kLIVgBueght
Ix8uwwoLZPT1OVAqoQGbesF/eUnwk5Xa8XJLFF/ZbcGD4WhI87RFGolk1OaJfae5
kYyZ72NWWAvvi8opLB/8
=3gKc
-END PGP SIGNATURE-
diff -Nru robert-hooke-1.1.2/debian/changelog robert-hooke-1.1.2/debian/changelog
diff -Nru robert-hooke-1.1.2/debian/control robert-hooke-1.1.2/debian/control
--- robert-hooke-1.1.2/debian/control 2011-07-17 13:06:53.0 +0100
+++ robert-hooke-1.1.2/debian/control 2012-08-08 14:25:15.0 +0100
@@ -12,7 +12,7 @@
Build-Depends-Indep:
clojure1.2,
libtext-markdown-perl | markdown,
- openjdk-6-jdk
+ default-jdk (= 1:1.6)
Standards-Version: 3.9.2
Homepage: https://github.com/technomancy/robert-hooke
Vcs-Git: git://git.debian.org/pkg-java/librobert-hooke-clojure.git
@@ -23,7 +23,7 @@
Depends:
${java:Depends},
${misc:Depends},
- openjdk-6-jre | openjdk-7-jre | sun-java6-jre
+ default-jre (= 1:1.6) | java6-runtime
Recommends: ${java:Recommends}
Description: Function wrapper library for Clojure
Robert Hooke is a Clojure library that provides a flexible, composable
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
Please use
debian-j...@lists.debian.org for discussions and questions.
Bug#684298: sweethome3d: Transition package to use default java implementation
Package: sweethome3d
Version: 3.5+dfsg-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Transition package to use default java implementation:
- d/control: BD on default-jdk only, switch runtime dependency to
default-jre | java6-runtime.
Ubuntu quantal is transitioning default java from openjdk-6 to openjdk-7;
this patch eases the transition. This package actually uses
/usr/lib/jvm/default-java in d/rules despite the fact it does not directly
depend on default-jdk.
Note that this is not a release goal for wheezy.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5.0-8-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJQInVAAAoJEL/srsug59jD6kIQALnMTSMxyz5ADKGkpTS6mUVe
5ZnUGabhhuLpWkHoCE9IvHpc6oIEJhaQsTHStqnoVRa65Z3/1ZuKcFyHdhUE2TLd
3eIf/nxBxSVMxFPjZ0BgJrPF8OHe1JQ/Jo+q3M2wg9/EXxPzHuGk+m/dSVTlfCEs
pWDytdeQ975VQR6QXGdAaSPnXumPg8jzkenB2NcvW6Oh+eTh4ULNlrmaXBIh8X/r
XmGo7Tozh2v9eu7MEMyn2GosQwdPl8tk5POozLKJiE/ZyGXWbJv3qxW5pRk66VlK
+pfUcWZ0ZMqtQafLGd+A5XbRJwVa7aP4szN6RraxlPemP4+l6QpQ9BvJyh063vnR
GfYytL212hdISa372Q84DQzeMBbQxCZaC+JK3zHBIPo49I1/vGYs5f7fgq7afpBO
2yGj/s4bUlCidvLSSM7l9NFamlVvDxe6z31sNDdz1p3EL8wO96G422i+sDazhgwK
fHhoUgNbqdNGjZ0yuRdPLf5hoiapV1FpEEIY04TELlik8aFMIy2nWeo8X2XkmbE/
ECIvCCona+3MxSQOjwqp6cpQw/4H8If9XEmmM9q8yOowIw0cGqkdnpEe5CXWahoI
/hLfqu/5DSQHiwXFQ6KMvy12c6AcjNeTUoVAk6dtBnhuhN3ywzHncVGwvJ/kmHq9
c0s+W0FJcdeGa056kTti
=+NPD
-END PGP SIGNATURE-
diff -Nru sweethome3d-3.5+dfsg/debian/changelog sweethome3d-3.5+dfsg/debian/changelog
diff -Nru sweethome3d-3.5+dfsg/debian/control sweethome3d-3.5+dfsg/debian/control
--- sweethome3d-3.5+dfsg/debian/control 2012-06-16 13:00:21.0 +0100
+++ sweethome3d-3.5+dfsg/debian/control 2012-08-08 15:16:16.0 +0100
@@ -12,7 +12,7 @@
libjava3d-java,
libsunflow-java (= 0.07.2.svn396+dfsg-9),
libbatik-java,
- openjdk-6-jdk | sun-java6-jdk
+ default-jdk
Standards-Version: 3.9.3
DM-Upload-Allowed: yes
Vcs-Git: git://git.debian.org/pkg-java/sweethome3d.git
@@ -29,7 +29,7 @@
libjava3d-java,
libsunflow-java (= 0.07.2.svn396+dfsg-9),
libbatik-java,
- openjdk-6-jre | sun-java6-jre,
+ default-jre | java6-runtime,
${misc:Depends}
Description: Interior 2D design application with 3D preview
Sweet Home 3D is an interior design Java application for
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
Please use
debian-j...@lists.debian.org for discussions and questions.
Bug#684151: libspring-java: Transition package to use default java implementation + compatiblity with Java 7
Package: libspring-java Version: 3.0.6.RELEASE-6 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Transition package to use default java implementation: - d/control: BD on default-jdk (= 1:1.6). Note that the package already uses JAVA_HOME=/usr/lib/jvm/default-java despite the fact that the current package does not directly depend on it. * d/patches/0011-java7-compat.patch: Compatibility patch for compilation with Java 7. Basic patch to support compilation with openjdk-7 (default java in Ubuntu). * d/build-classpath: Explicitly add servlet-api-2.5.jar to classpath to ensure that build does not use incompatible servlet-api-3.0. Ubuntu has transitioned some packages to use libservlet-api3.0-java to support inclusion of tomcat7 in main - this causes a FTBFS due to the fact that the servlet-api 3.0 is picked up automatically - this part of the fix ensures that servlet-api 2.5 is used. Note that spring 3.1 has support for 3.0. Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers quantal-updates APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 'quantal') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.5.0-8-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJQIQqIAAoJEL/srsug59jDgZgQALKshrMpsvFZHBlCa3rEk1zq TsquwJ2ZhaIYM8kb/UubPDfDOcyiihCcwiKZt22SitVJaLVkcVAuwYbZ6fMmOolP m7wjWYe84aFg9cH9zFz2nxV57l273qWct363XOR3ppoqwRFu1lT/Q/oF9rq+FXob S22GyvHjY6ubwccqf1lSW1YNc9zAheq72yIX+zxvuqtjLt0yeKYYypx4YG+MejmY 20hUhHYGy7eojId2o6vkxcRQo34p3wrK4c9hfwzjglyGwy1mBYMFlz6Noyj4wz6i pCw8oX4ReSpIAlNloG/qOiK1YzcGEp+5yUoQcQGf2I6LPBbIGDSO3CvofvtzYq9M jMR1ICMi5cP+1zfwH5iMx0FHr2oaC9MhNXcadO3XvaOV+ykb/rZoqw9y1U6UHb6/ M7qIh0MZw45aJijzgsUvJD0pWpSD6OPXRMzsvYZXHMOYK86IxJthnUWfN+ja+gVl +fPCZGQStYXWnunY3CTVCZ46ZaRLNWDZCtsEOBzbgqNmpi2i0NDMLDKmBtHV3zfb P5f4Mcalxn8o83mbe8bqm5LI4BCpggeOtRYiQownRin+SGm2YoX7QM7IkRwoW2dD QDaU0i8qPpgXpRetOkylyAXtUYdjhEA7ZB3w5XWgMDYLjY1mNN90MpuKiLdrYhnQ lGBJnur2yKMzDE7Iej3p =k9zH -END PGP SIGNATURE- diff -Nru libspring-java-3.0.6.RELEASE/debian/build-classpath libspring-java-3.0.6.RELEASE/debian/build-classpath --- libspring-java-3.0.6.RELEASE/debian/build-classpath 2012-01-14 16:27:40.0 + +++ libspring-java-3.0.6.RELEASE/debian/build-classpath 2012-08-07 09:07:00.0 +0100 @@ -1,3 +1,5 @@ +# Ensure servlet 2.5 is used +/usr/share/java/servlet-api-2.5.jar # Build system /usr/share/java/ivy.jar /usr/share/java/org.springframework.build.ant.jar diff -Nru libspring-java-3.0.6.RELEASE/debian/changelog libspring-java-3.0.6.RELEASE/debian/changelog diff -Nru libspring-java-3.0.6.RELEASE/debian/control libspring-java-3.0.6.RELEASE/debian/control --- libspring-java-3.0.6.RELEASE/debian/control 2012-06-21 02:29:30.0 +0100 +++ libspring-java-3.0.6.RELEASE/debian/control 2012-08-07 13:27:07.0 +0100 @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org Uploaders: Damien Raude-Morvan draz...@debian.org, Miguel Landaeta mig...@miguel.cc DM-Upload-Allowed: yes -Build-Depends: debhelper (= 7.0.50~), ant, openjdk-6-jdk | openjdk-7-jdk +Build-Depends: debhelper (= 7.0.50~), ant, default-jdk (= 1:1.6) Build-Depends-Indep: maven-repo-helper (= 1.1), ivy, spring-build-scripts, libaspectj-java, bsh, glassfish-javaee, glassfish-mail, glassfish-toplink-essentials, groovy, junit4 (= 4.5), libaopalliance-java, libasm3-java, libatinject-jsr330-api-java, diff -Nru libspring-java-3.0.6.RELEASE/debian/patches/0011-java7-compat.patch libspring-java-3.0.6.RELEASE/debian/patches/0011-java7-compat.patch --- libspring-java-3.0.6.RELEASE/debian/patches/0011-java7-compat.patch 1970-01-01 01:00:00.0 +0100 +++ libspring-java-3.0.6.RELEASE/debian/patches/0011-java7-compat.patch 2012-08-07 13:26:45.0 +0100 @@ -0,0 +1,157 @@ +Description: Compatibility patch for JDBC 4.1 API in Java 7 + Drop with 3.1 release of spring. +Author: James Page james.p...@ubuntu.com +Forwarded: not-needed + +Index: libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java +=== +--- libspring-java-3.0.6.RELEASE.orig/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java 2012-08-06 18:06:09.943525138 +0100 libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java 2012-08-06 18:06:10.875529907
Bug#684015: jsymphonic: Transition package to use default java implementation
Package: jsymphonic
Version: 0.3.0.Ode.To.Freedom+svn387-7
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Transition package to use default java implementation:
- d/control: Switch dependencies from openjdk-6-* to default-*.
- d/rules: Set JAVA_HOME to /usr/lib/jvm/default-java.
- d/build.xml: Set source/target = 1.5 to ensure backwards compatible
bytecode is built.
Ubuntu is transitioning from openjdk-6 to openjdk-7 as default java; this patch
eases the transition and ensures that the code built by the package is backwards
compatible with java 1.5+. Note that this transition is not a wheezy release
goal.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5.0-8-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJQH5boAAoJEL/srsug59jD6OkQAMUzaSnW/hMDQzKC4k6+IiRa
jw9fbYge+EAUf/wtI2BjlWJr55zG2J64QjBQ5iHtiiwR+hfiAoy+VfGIw+dcRhPw
zhRP6PRFXLKdJe5x3hBOZOXXd8Fk6OA5zLXA1GtMKgrLVb6mHO8DSjG+7nGKbbEH
POgBFnttz3mDKJBOWJ95C8TT/rFTCbTbFLDCaGkhP7zCnnTtDVUTs8rAywPRJw6H
4hCt2SMp+cqlEn96ur/leCTs+jLDluI1HlOPa8z128SH4B7mjUnguLMbfjYGZ2wU
Di6tvWBda82RV5+pP1fvja7bAZzTv+SaqtQ+/4NzEkR3ZQD4Rrm2z2E1tALyxVm5
CR+CzzV7j3J8WnZesP9b5f/p+6saWnEWz0dSiBIDx4YT8mOB4dUXehBeNaOJTLJ+
/fw9mW6okRlkADTojtBm9dTHuiy2eMdB2h1xpCH+Og0V2MMFuPA6tIwC2X6/wxT4
HHF4btz4S42v/WIyRhI3dtu8NbCR8uNmcR92onXAzox2WVOy4Yq8f2BNf2bp2qAO
UmUuGeWdUzKnM/fF6za8CasUSCTmKamYFBFPilOpbjGmcJVI+/2+3Dr+hG+k+NJT
04Yk90H0HrhxvOoz/gK/MD2uQWCrpZ1QhoYMdn44YEz8FRQzWw3y94Iil8MT08vT
Lx8fTHiKTPzNGvvSen3d
=Mqns
-END PGP SIGNATURE-
diff -Nru jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/build.xml jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/build.xml
--- jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/build.xml 2011-04-04 21:00:51.0 +0100
+++ jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/build.xml 2012-08-06 10:48:05.0 +0100
@@ -33,7 +33,8 @@
/target
target name=compile depends=init
-javac srcdir=${srcdir} destdir=${builddir} encoding=UTF-8 /
+javac srcdir=${srcdir} destdir=${builddir} encoding=UTF-8
+ source=1.5 target=1.5 /
/target
target name=build depends=compile,languages,resources
diff -Nru jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/changelog jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/changelog
diff -Nru jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/control jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/control
--- jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/control 2011-06-04 19:31:56.0 +0100
+++ jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/control 2012-08-06 11:02:06.0 +0100
@@ -4,7 +4,7 @@
Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org
Uploaders: Vincent Fourmond fourm...@debian.org
Build-Depends: cdbs, debhelper (= 7), ant, javahelper (= 0.36)
-Build-Depends-Indep: openjdk-6-jdk, libswing-layout-java
+Build-Depends-Indep: default-jdk, libswing-layout-java
Standards-Version: 3.9.2
Homepage: http://sourceforge.net/projects/symphonic/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jsymphonic
@@ -13,7 +13,7 @@
Package: jsymphonic
Architecture: all
-Depends: openjdk-6-jre | java6-runtime, java-wrappers (= 0.1.22),
+Depends: default-jre | java6-runtime, java-wrappers (= 0.1.22),
${misc:Depends}, ${java:Depends}
Recommends: ffmpeg
Suggests: pmount
@@ -24,4 +24,4 @@
.
This program provides functionalities similar to the proprietary
Windows-only SonicStage software given by Sony to interact with
- the players.
\ No newline at end of file
+ the players.
diff -Nru jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/rules jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/rules
--- jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/rules 2011-09-29 20:15:04.0 +0100
+++ jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/rules 2012-08-06 10:47:40.0 +0100
@@ -12,7 +12,7 @@
include /usr/share/cdbs/1/class/javahelper.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk-$(shell dpkg-architecture -qDEB_HOST_ARCH)
+JAVA_HOME_DIRS := /usr/lib/jvm/default-java
ANT_HOME := /usr/share/ant
DEB_ANT_COMPILER := modern
DEB_BUILDDIR := .
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
Please use
debian-j...@lists.debian.org for discussions and questions.
Bug#684022: leiningen: Transition package to use default java implementation.
Package: leiningen
Version: 1.7.1-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Transition package to use default java implementation:
- d/control: BD on default-jdk, switch runtime dependency to
default-jre | java6-runtime.
Ubuntu is transitioning from openjdk-6 to openjdk-7 as default java; this patch
eases the transition (and future transitions). Note that this transition is not
a wheezy release goal.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5.0-8-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJQH53EAAoJEL/srsug59jDu4YP/0SshNLMHnzRayhr8Zclgb4G
YW+FLlDoicPkFHtQwDmzLsirWDpNYAQ9r4pUKcZj1Gw/KU0kAAI/bGPRAdQbnjUY
1g4yLRIWPNmYunnqIx89zH8f7WDX4MyORZDqbwvcRPycUYQWs7XM8CgCe6Hu5lDK
KiLjsMSgRa0cfHNAEhKtPOSxU/3JK/7h/k/nGjYWlbQdSpbW7QX0DViJ++/sXAUn
VxS9GqmEHaDogPVJ9gbjfswtCPvTRV4wiVpyNtzMjaaOgkEcNDZDReZCVMphKYQy
4T5FRpL6YFPhF+lhs7dbYWV4Gp5jIaxEl9Vr8KumGEwidaI7uP1IRY3uLboNgzx1
VnDcHZwJF6msa0oa6wy4Jfp1ewJ5f2o/c8XzoEc3WH3iX4eHwpAWX9SC6a+G47rW
68WMVmTMRudPiQmmAToZSMS5RaIjfAPZe2QP2UrvgEcoJQGWWtM+ijscLLwEpKB0
PmaDbSMMNycB0aCC0nTZCcL8rQ3/yZTmWr0CkPevqzi0r7XaK7D+pLCETBVQtk1+
8uXx9jaMjvrl+umHwXeYKibysbgm/5UYGRJKJlv3h1cG+SurBoS+k7jGK6mUYmi7
mjZl3JsiFY8cLhlFT7dEVW1P+9tjE2NwGDyFsqKQsQaFTJepWO60Sib7j/b0G8pt
ZDwHbve9hSsIHtOOgcDT
=zfz1
-END PGP SIGNATURE-
diff -Nru leiningen-1.7.1/debian/changelog leiningen-1.7.1/debian/changelog
diff -Nru leiningen-1.7.1/debian/control leiningen-1.7.1/debian/control
--- leiningen-1.7.1/debian/control 2012-03-28 16:14:11.0 +0100
+++ leiningen-1.7.1/debian/control 2012-08-06 11:24:29.0 +0100
@@ -24,7 +24,7 @@
librobert-hooke-clojure,
libtext-markdown-perl | markdown,
libwagon-java,
- openjdk-6-jdk,
+ default-jdk,
rlwrap,
zip
Standards-Version: 3.9.3
@@ -38,7 +38,7 @@
Depends:
${java:Depends},
${misc:Depends},
- openjdk-6-jre | openjdk-7-jre,
+ default-jre | java6-runtime,
clojure-contrib (= 1.2.0),
rlwrap
Recommends:
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
Please use
debian-j...@lists.debian.org for discussions and questions.
Bug#683502: jedit: Fix FTBFS when default java implementation changes
Package: jedit Version: 5.0~pre1+dfsg-1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Fix FTBFS: - d/control: Switch to using default-jdk for build, don't use BDI's. In Ubuntu the default-java implementation has switched from openjdk-6 to openjdk-7; as a result this package FTBFS as d/rules refers to /usr/lib/jvm/default-java which does not actually get installed as the package BD's on openjdk-6. Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers quantal-updates APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 'quantal') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.5.0-7-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJQGQMgAAoJEL/srsug59jD9DYQAL9gRhqhEqEHpscP9YcwW/kL A655u5TpJLLrGj+qG9PJCu4RYJHT6u16RiVy2wsJJ1gaFtS7G3ys0ciygVDweU5C Izt0Z1KIfVM784LHW8qr/8JLSPVga+nfi5tnO1IWt/8J1pty7Mg1nLeEXnRPAAAD xJMeMHrTXoMQ2opo6W+ChH8P/Zte7wMcAN3LwZDI7gOLeDLQ0/SLP+ey0RyVblfU vOiCgUlcx7no71UzcPvujII1C5I5jZT8jNg84qITgf1m9TWvpMrOZ2Ss6tUeuE+E hj5If6gv4lOUX6PredpeVZqCilSc7DJ1ZBhW4vRKQBsl5nz00Ze5AIhy/9vl+4FC l7I2JPxT3rO8co/E8Ks9kkPEZ6kD+24YVrUEsRPdsTyVY5MiDbiRfhwWQX69ZFvf pGtKxwnV7ypJjPlGV0kZ2iAi7/DPbm/WyNlg99xSAv9EcV2gubfGFQLcnT/z6tl9 mv2iHNJtltrpBVaQVadClM1LE08PQCou3pGJhkXFiO4fP9cJbqxuqu6ENIO3R/Qe ovJ0vsJJ77sCnfXs7rNCvPNB2wUBYlSSuxpQvEOY59Lo5HVU+EZusN40riVGmib2 5Xw0H46Iyr9ACTjz0J6yr9avqdqnCmrnw8/DvqpZjlEyuMFzQoUFuHwOaD4ykO9K UsqWkf1ABKJ6NXvtAAnC =P5DV -END PGP SIGNATURE- diff -Nru jedit-5.0~pre1+dfsg/debian/changelog jedit-5.0~pre1+dfsg/debian/changelog diff -Nru jedit-5.0~pre1+dfsg/debian/control jedit-5.0~pre1+dfsg/debian/control --- jedit-5.0~pre1+dfsg/debian/control 2012-06-16 12:54:27.0 +0100 +++ jedit-5.0~pre1+dfsg/debian/control 2012-08-01 11:18:39.0 +0100 @@ -6,8 +6,7 @@ Build-Depends: debhelper (= 7.0.50~), javahelper (= 0.24), ant, ant-optional, docbook-xsl, xsltproc, imagemagick, quilt (= 0.46-7~), bsh-src (= 2.0b4-11), docbook-xml, ant-contrib, bsh, docbook-xsl-saxon, libbsf-java, libcommons-logging-java, - junit -Build-Depends-Indep: openjdk-6-jdk | sun-java6-jdk + junit, default-jdk Standards-Version: 3.9.3 DM-Upload-Allowed: yes Vcs-Git: git://git.debian.org/pkg-java/jedit.git __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#683534: httpcomponents-client: Transition package to default java implementation
Package: httpcomponents-client Version: 4.1.1-2 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu quantal ubuntu-patch openjdk-6-transition -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Transition package to default java implementation: - d/control: Drop preferred BD on openjdk-6-jdk. This will automatically transition this package when the default java implementation changes (as it has done in Ubuntu quantal) Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers quantal-updates APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 'quantal') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.5.0-7-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJQGTgMAAoJEL/srsug59jDIxYP/1VPd4YLH1Q+5ZInCPvmDYef 3LFfpcbC4c2IxXCFCgPTqcL+ho41gofoM5tRXqfT/dj5HJpZmq8HsHX8zuVVpbF5 sX5oxs2fskKvUzz+lzXr1LdtflJLbNjVvBryAaGhOjYiKXiWWA358xIcIdVWcD+u fPkJiRMTp+yvux94j+Ttn8VnPG1GhTgB5jz65h5o7KhndPBctzyMKPtJG2w68irm kMvQ0zc3B2g68eBOkCL+eFfnP41PkRLgMoFB9AHZF5pOEUU8tsYXUjoXq2aGrB/K 0DQsI1w/J7XbKHX5Xix5Oezo9ufXvZSiIjxdVzIdG5eU6t9pkUVtvo/YPWF9Z7rI ZhF2CmDgLq0s8q8AuPvB0W9y8XCeyS7hk9KGTrkgxf+v3mgJIwMEzeC0/JfIKsQ4 nT6ZTnTgP1KDI++WDuoTueL+nJ9bZpLJ4NqCGy7/b0lgMSI16SjYoPZ/dtLzJ6sD kjN6wUMa0qhBkneMCprNFFQDsZRL3tmduVIa2H29JgSBwCks88gOFFoafzOZ93Ty M7WIVM4kgIR3LJD6RQN0Xks3SwJjh+wXT38Jisc0oHDh/KShIDXlRWWuSXg6dwgq nD+fVoPYGNE0xUk7YBpAAJG1p7v79jclicQUfyeDq2t0JeXgrwaYjal+vIaHg1UG BBbFK9MZFUzxlpSjmZ2r =jcMJ -END PGP SIGNATURE- diff -Nru httpcomponents-client-4.1.1/debian/changelog httpcomponents-client-4.1.1/debian/changelog diff -Nru httpcomponents-client-4.1.1/debian/control httpcomponents-client-4.1.1/debian/control --- httpcomponents-client-4.1.1/debian/control 2012-04-02 00:31:57.0 +0100 +++ httpcomponents-client-4.1.1/debian/control 2012-08-01 15:05:40.0 +0100 @@ -5,7 +5,7 @@ Uploaders: Miguel Landaeta mig...@miguel.cc, Jakub Adam jakub.a...@ktknet.cz Build-Depends: debhelper (= 7.0.50~) - , openjdk-6-jdk | default-jdk + , default-jdk , maven-debian-helper , maven-repo-helper , javahelper __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#683540: jajuk: Transition package to use default java implementation
Package: jajuk
Version: 1:1.9.6-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Transition package to default java implementation:
- d/control: Switch BD from openjdk-6-jdk - default-jdk, make
default-jre the primary dependency for runtime.
- d/rules: Prefer default-java for JAVA_HOME.
This ensures that the package builds and runs with the default java
implementation provided by the distro (this has changed in Ubuntu quantal
to openjdk-7).
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5.0-7-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJQGUcoAAoJEL/srsug59jD14gP/RKcn7x+1X9Kkj7XWW2m4VZN
r83DQckYPCXrFLkXrLyktGcBmKPTqvlz50hzgrPeYSXyEchpxz/kqrffMWgyxkSK
vcunimoVOT0DQ8bZ5qjMBiUr8aYASjzzb+dgal2L0uuGovC9B8AmO4MCg+oDx/VU
+6I5eZmbNnjOZ+VwabKiODt8JtdSU0EDCV3slm3ry3T52BMOmt2bLFfjQWbX+obd
jK35axRuf7bsr76KeU8uhPa+FwlPU0A0dZINsThF2i06r7e3xnTkWOwEKsMNlEIe
KtfnunKCgczUCATyh/dshCy4SQ54dRxEHwpFWZmN8ztNJOVQj2YQCX3tnGgSLlwD
zsJVnilj9pzyidnN6FxkLQT3GaybYKHa9G8nY4E1Cw00W97n13eUAM5uY53av6Sj
qgVmmvZSwHZU3eIw8Q2dcY/vp56Ob7u4TenZw5uAuyRUYuqILGPnYEZIrj5V2Yta
+e3RnQqYexuzDaICUwQqut6QC/oEdzrCMIPLLrfjbQh2Nl67P7w/JOIBihQRGaMd
Syifx0+cTrLRuIUaYbDuHQOoBo2nkKafQcXoxOboMWrj15xnwjRjWorqAfNsuQtY
PQJPe2IHtZ2Aloz1pGP2Yky4B7N1xo/4buedm/3olo4fpMRhfDXoRw1c/rtoLh8t
EHSKQKDkE/+2hgQEsYx3
=lniE
-END PGP SIGNATURE-
diff -Nru jajuk-1.9.6/debian/changelog jajuk-1.9.6/debian/changelog
diff -Nru jajuk-1.9.6/debian/control jajuk-1.9.6/debian/control
--- jajuk-1.9.6/debian/control 2012-02-22 22:12:52.0 +
+++ jajuk-1.9.6/debian/control 2012-08-01 16:09:35.0 +0100
@@ -39,7 +39,7 @@
libvorbisspi-java,
libxstream-java,
mplayer,
- openjdk-6-jdk,
+ default-jdk,
substance (= 5.2)
Standards-Version: 3.9.2
Homepage: http://jajuk.info/
@@ -84,7 +84,7 @@
libvorbisspi-java,
libxstream-java,
mplayer,
- openjdk-6-jre | java6-runtime | java7-runtime,
+ default-jre | java6-runtime | java7-runtime,
substance (= 5.2),
${misc:Depends}
Description: advanced jukebox and music organizer
diff -Nru jajuk-1.9.6/debian/rules jajuk-1.9.6/debian/rules
--- jajuk-1.9.6/debian/rules 2012-02-20 23:25:00.0 +
+++ jajuk-1.9.6/debian/rules 2012-08-01 16:06:15.0 +0100
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-JAVA_HOME := $(firstword $(wildcard /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-6-openjdk))
+JAVA_HOME := $(firstword $(wildcard /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-6-openjdk))
DEB_ANT_BUILDFILE := src/scripts/build.xml
DEB_ANT_BUILD_TARGET := package_jar
DEB_JARS := animation basicplayer cobra commons-codec commons-collections3 commons-httpclient commons-logging entagged-tageditor jaudiotagger jcommon jfreechart jl jmactritonusspi jogg jorbis jspeex log4j-1.2 mp3spi substance swingx tritonus_share vldocking vorbisspi jna dbus miglayout jhlabs-filters lastfm commons-lang commons-io xstream simple-validation guava
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
Please use
debian-j...@lists.debian.org for discussions and questions.
Bug#660688: [jenkins] Please enable maven-plugin
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 28/07/12 11:15, Christoph Berg wrote: Please enable building and packaging of maven-plugin (and possibly other Jenkins plugins that are part of the core tarball). Jenkins Maven plugin is a dependency of another plugin that I'd like to package (Copy Artifact Plugin). ?ArtifactDeployer Plugin? is also unusable without maven-plugin available in Jenkins core. https://github.com/mika/jenkins-debian-glue recommends using ArtifactDeployer Plugin, but lists Copy Artifact Plugin as an alternative. Unfortunately, both need maven-plugin. Please note that it is possible to use the maven-plugin as distributed by upstream - so you should still be able to use this plugin. - -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBCAAGBQJQFnZEAAoJEL/srsug59jD604P/id07YWgoov9O094JUhmJfeR tjkRXR9McafI1HNBwmWeEGEB3fzGOUlyudmXsQeYpAJO2vUkyrbeyXEEu0gSViiT 60wi+6yN/Y+4d1GsCRxs+j1wlWSIs57reCau/zy1VaMqzGrjrD4QWFlQFt0yqfW7 qufctNKdTLH7R+33nseaXLTYSoBdYgFdNLcThvTHXIrjnpSbcUkI85Gm/QZI1HyJ gAT3kp5OkH0Wz07feDFnTOq4ccDjgv8S5U3bu0ziJ3n0B8s6yVyU3MZL4s18uXXl RflD7oejRH0jsiNQNwyr9C+D5NqcrC1d4jFv4cDa4oPp1OPJc7y1w4DgCl8vCzqf G5lQIa19+wvwYBXypPEnEuwD0flZANLXtTFyif99HO++N/6xbVVJp/ZOxgFHXlhG Jiy/rVTrpw2eiElFN4oQaot23q+KPgxx8ZYV/6g28Z5L9MAfe/ZloFbPd2VYs80g lNus6T7LBTYPUoNzImaPOwpR2DpcMIeXFy8vUaHJFweZfp+0AXMy8E0sa00Pxv2H kt6323EZ1EOzu0JxNbcOepedtpeyBps0Ds0BSrzMAzYxB1+pHLSGPUMBW0vXHuBL GTRs5JbGHyw+QcePi3eE1BdII/i3qA8EOE+DMiAPP5Do7hSqVdk8DlmFfsC8xoyl MtKH5KA4OjPBIdgMstlM =qXvv -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#660688: [jenkins] Please enable maven-plugin
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 20/02/12 20:38, Jakub Adam wrote: Please enable building and packaging of maven-plugin (and possibly other Jenkins plugins that are part of the core tarball). Jenkins Maven plugin is a dependency of another plugin that I'd like to package (Copy Artifact Plugin). I'm struggling to find time to look at this ATM; I think that most dependencies (outside of a few extra ones specific to jenkins) are now also packaged (this was blocked by maven 3) so this should be possible. - -- James Page Technical Lead Ubuntu Server and Cloud Workloads Team james.p...@canonical.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBCAAGBQJQFnatAAoJEL/srsug59jDiQ0QAMi076FvJ3kAt6uvBWJlUJqx YSaIlGvr1BYPLqYi9YE2UOh44d5+IvoSUMDWUJ1BOKPZ8d+VVlDCmvhpzuKaXvNb qxTBpWtOh8WnI6QBA7fRE637hMp4U/MPZ9Q0AXViyebVpUfpwZ+Xw/BSbxzdjuNX 28uG5rviskqqIi0UXEQNq6rxB0Iz9hPCB4XYMOXgIoIn167iEIaDamGVYaKrmLXW mp10T1EVqp7OMljCECl0JHk8W9LWRwSVtvQCC+02d33Kogp9gilhOpJqS620uG0j wZaIAlmSGk7W5JARKNLPXd3ul32W44QEOZ+hPJWQPvyzZgrVKpqYiV+/zHfMk6BS CdBQVUiqH2785yK0ARmvWIHyB24yQfWU6C41QYV1Oo/ZJlbV3ACmzlj3e9/WimpH U2SYGTEe9nMGVlVRBFcNBl8Dw8NYKmh7Iyaweff6NVjK/Y0ohKTgog1BA0mzIuPE AkvRNaQjvNbbvSP3Mz/0MIkxqR7OsgFC9QNKqDKJoXViDwf5RaYuUzpMJ2PjU1Gr SgiH1bU1n2yeSucaTBaXt7sjAhOtTYkiSCkupfU8d2VG/rHIMLnuGbO5HPEN+RuJ PABOEhoYW8tFT4N5MeOdpy2iKPfAMJAuDrTXJF7idTOJgUoMMmr5G97oY1x7X6Ff 6r1o1CvdqqNiRF/Owp2/ =LWyQ -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#681763: knopflerfish-osgi: Remove jre dependencies; not required for a Java library
Package: knopflerfish-osgi
Version: 2.3.3-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition.
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* d/control: Drop dependency on openjdk-6 runtime for library; this is
no longer part of Java policy and is not required.
Java libraries don't have to have Java runtime dependencies any longer and
this was pulling in openjdk-6 into installations which only really need to
have openjdk-7 installed.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5.0-4-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJQA9t7AAoJEL/srsug59jDi4AP/2u4xz4m7OhYnHSEWPblVgzm
CpQW6aht/jEOlOf9WHgP9b6ziw/N40Q7eKFal/ofJro0jlno33xzo7jOZJSfpOLy
8dLOlWhZz2ftko1D0WPA6AOisnHrf651qfKWuPNcbsUVLGpBrdMpBhjALPNiK0/V
acYyD4y4auWHIQBgjAw8iJWR/9mIWj34pATPN3f2ScIXMg+PAF29nLfm1c9VPX0l
F2ZxslBwhA8Uq0K/AuusHZcsGcOXTaiAJjEsIQzDfzAtY0Ye/jVWa4XLWzt2NIWF
gnMuYE6uAT3QsukzeiJi2XJjIYvL9fm13T2O++QI1Geu1UJFd6rfMbfrpn/YaKeD
7vFSNnGd0LorI0tEFHhKPvenNr+4tuXRXWvB6ryM9ZRTC4TGNShZhz/dF3Z1U/vn
274bnNQuwDR96ppgdLBG6OlilFvDD93nQmTlHk/xPM2H8MlLKwwTox0ZOh06fUz5
1HylFCoN5vXNlhJ/AXjtMFFBzAgSUoaBYsbdUEraJOZlvbUccK63qt3lc1vowFAP
NGIegZy1eKCdqM47QUwM4zgV+lrMSLkZUKzEaUgqOA4FGiCbQywNyAqTiu9+YSYu
uA+6PR+F6HBknTRyO+8qpVYggh2chexIZSIY8WChA2P66K5cZFiDAOLdYDLkMjWF
fvn3tl5Cw36zwP3C4/nj
=CXxC
-END PGP SIGNATURE-
=== modified file 'debian/control'
--- debian/control 2011-10-22 20:39:23 +
+++ debian/control 2012-07-06 08:23:12 +
@@ -12,7 +13,7 @@
Package: libknopflerfish-osgi-framework-java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | sun-java5-jre | sun-java6-jre
+Depends: ${misc:Depends}
Suggests: libknopflerfish-osgi-java-doc
Description: Java framework implementing the OSGi R4 version
OSGi, Open Service Gateway Initiative, specifies an industry standard Java
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
Please use
debian-j...@lists.debian.org for discussions and questions.
Re: Bug#679616: jenkins: Please package a more recent upstream version
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 30/06/12 10:54, Damien Raude-Morvan wrote: Le samedi 30 juin 2012 09:57:09, Sylvestre Ledru a écrit : Source: jenkins Severity: wishlist Hello, Could you consider to package a more recent version of Jenkins ? We are currently shipping 1.447 and upstream is 1.472 Actually 1.447.x is upstream LTS chanel for stable release. Maybe we should stick with it during Wheezy release cycle ? The policy I have taken with this package is to track the LTS release rather than the main TRUNK release from upstream - its generally more stable and has an upstream commitment for backporting of critical/security fixes. So I think sticking with 1.447.2 (latest LTS) is the correct thing todo for wheezy. - -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBCAAGBQJP8WI2AAoJEL/srsug59jDSCMP/3FtRDAvsCsnOWYaiQfJFh5h CsuTKTZQufT1NJVThEtHxUJoc88SVAVtmL97U4q/1NHY2N3mCiupsDFZfIfYpN6P V0zSDwoZgm0FFM9SHeXjIfeWCCj9T1jSJNOunnEiqE35qnnC+y7SQCqFgeyBmpeP 2CF0i3kQuiZ2jQ+2AJrMb1XLucNtBQi0/ii/dZJz++rl+D0AaSc/GDHGwVwLu/Fi WgLoOrxm0hv0hXAtrPXWlqUUTGWONXaAJDbZos2Jq8qUdCfoBJjTxA7uL8LacZo7 8UvQ7QVE1o2pgzBSd6uBt4dzjXOtlFwm9J063gRW5l26U8p7vtReD0gb1sSchIRT IVGwenD4I3xB6CYiQgeo0wu0kY7ANj1wMWUMT2pc1s3clgbLZW/Iev66Kgy6r7Ej dR1e2bQH1dAxSSb/hWogc9fERd64cNE2BBHEaJlsE//nuLhz/Vts7WT2snaffgmB YYbp/ydPvA4QQmLQxwRhLKi/T/PFPa90ileTyEc+b1kmQeeyJaN5Ii7DdA7TZoQy zaERbXKJvlBh92edP/2LIoJVniqDgPEWzFosXX+63i244kKpoeQ0qpIPqIIZCrLE 5aseJV9VBmJZAX621gNVpbInD+Lin1jP8KZ8OyL1y2XN+QKaVDyzXiIUJalSQRgC /olQosfG5e74GYRf0T9O =BKwq -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#678766: jetty8: FTBFS: 1 required artifact is missing
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 24/06/12 10:29, Lucas Nussbaum wrote: Missing: -- 1) org.apache.tomcat:tomcat-servlet-api:jar:debian Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.tomcat -DartifactId=tomcat-servlet-api -Dversion=debian -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.tomcat -DartifactId=tomcat-servlet-api -Dversion=debian -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.eclipse.jetty:jetty-util:jar:8.1.3.v20120416 2) org.apache.tomcat:tomcat-servlet-api:jar:debian Last upload of Tomcat7 remapped the API artifacts to javax.servlet inline with tomcat6 conventions. I'll do a patch for this package. - -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBCAAGBQJP6F3IAAoJEL/srsug59jDK2AP/RFUAwABH+WQV/9lJLBQ3Cb7 CrU0rk05flJaqGlBg7pNmexMsYtnQKJGjj9Q8/89M9RKQNoAiZs/i0CkHkJUPreo bR9UTnIvQLXZt43OdgHEIZKH4Edjk61Z7gKMeSJoM3kgJo5G0+rBz519XEcHJ207 huDMsEFbsjfxguza5u+WH/j82RLzcCa7BloZfmMhzxzZTaWDnns8EiyMJZQL2uyH 74pnT/NWPV61O2wHa7PNvnuzcyF1jJHAHXu172I0t1DRYuTAtUxP0iDmy/TUwMSk weUMXRmZqbss3+5rDe/mmEaAL3F+BT5+GgJcWSuIC/miY5I1UEiHZc5lcSRiZgFC QYdMEawGUJYfWKBJj20PLG+WGoOh1no5I4FWg05jwjr2na7y8blxQagvXZOCgL+s aZ8Fh3NMUueIovFbTB5j3TY9/u91ZRLAiRIcRIXTYOmxTInWDkYThbbB/0J+/Xxf eiJRQ7sH7iGufIqRrHvC3wwzM4RmZAC1kU6uSlXAX26OBnFyaXNDlRcRAt1icdyY S5Fn+D6/KERp06/2/em/ZYOlNEn5lEHRNXfRMIR8qu8YxIwRZvFxCkGiEc5/pqik LT+tJootHrdV4Nc1qlrcy0ekuQplJa8qnYXJV9aPkWa4eUE5/Had5NEILlSu1Vn9 5FbS6ALUzJre1bbLHmwt =gzTv -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Re: Status of Solr and Lucene in Debian
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hi Tomas On 22/06/12 05:43, to...@tuxteam.de wrote: On a very short note now, more perhaps in four weeks (I'm away and no net connectivity til 23 of July). My boss offered that I work on that for 1..2 hours a week on company time. I'm aware that it will be far more than this at the beginning, so the difference will go to my account. But I'm seriously considering to take the plunge, unless someone beats me to it More at the end of July I've picked up the maintenance of solr; I've closed out most bug reports on solr 1.4 and have just had a new lucene-solr package for 3.6.0 uploaded to the NEW queue (thanks Tony). Always happy to have a co-maintainer so help much appreciated! Cheers James - -- James Page Ubuntu Core Developer Debian Maintainer james.p...@ubuntu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBCAAGBQJP5F2rAAoJEL/srsug59jDPrAQAMstGwVgRQh4hOMa+aV0AeRd Jbqf22PYjCzJEvNU81+SoiBOvijlPSKyBVcphkLfDhiu2lnhFnX+JK4eOX25Krrh DBwLjmqslBlChuhBnqBzPYE1H/OmoIjL9wqOo2cSXz75IEf7TbQs7Pgs/Z02FyLd bUoFre/yO6QtL65kOXWdomovg4BmNRg5ngAhHRY/ZGOkE4pVbV8JcOMbMQAJ3OK5 YH5qVE5PkqoohrnWYFam1oGOaAHAMPU4wUiv9YBLyiNA/65P5o2ItbHvShQnCH01 b+f0Y551LfSQBGodjpcvmjFN5/H4j6/QCxTEuDcUaGbkrqsTkxunLVtODtlim3Oc XOpQZdnnABCPP88B8Y7khDU1tm4KBwv4SbOgYRiyYPdy1zzY1PURc6pRM2E4FkTP CbDliPrQDzKwtHZ7/b8Act4zy7fEbebE/Gd7SfOymUKWq8B7VREkhU6jOhYDXIfs gIozdeCTzeE2DlQ6rmmLquG4MYwxvthtnUpAeDvmqtzqDIrqkro2Iq0KWwyPQ1eU 8OdsosyiP67BHFmud3O3IejPBwk5/EDKRCHcLko+w84A4qyiUFB+cO1tZVEuagp7 kFPXsvknGcotMuD1DF3PaGxMFw2nX+KjFnRYiqxCrXlXIB2V/47yBm3JcekkOGYL NYrJvlo1fxszkjClWtRO =bP0a -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#678118: tiles: Fix javadoc silent failure with openjdk-7 build
Package: tiles
Version: 2.2.2-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* d/build.properties: Set source/target == 1.5 for javac and javadoc
to ensure that javadoc is actually generated with openjdk-7 as
default-jdk.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Kernel: Linux 3.4.0-5-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJP4FVUAAoJEL/srsug59jDWS0P/jK7ZHFX3DBxATZCqC6Ti2M8
WIz/0vADYMrJ7fT6AVIui6kcb/NeSykFWp2tIaxtocvhvhCKht8FHjjb88Efd6bl
xWwhKp1GoHtjq8iuO/UM6IMI1lzGhySjbPx+AB1ohXqomflFAWui98Q1F12R0AJv
J+KSGnQTl+E98MG6U+xE5TXHAVCO05vZwbALwLeNB2u3F+qoxFsY3ozbkBpYgv0z
iaWEXD/cXuop1ysHlcZVtZMLXQXrePT5ZSsXMZD3Uoz5mLK4CPdYR1SCyhV4Rer5
FkGpJQwI+9KRETofuqAlmaQDctx2Tp1C+jsBdt1XpLUxSmmVBXmcexHKMGFKxWrd
lkcI4RF4Lf7lU49WC0ignTLK3hfx4wPzUUDnf572FXIawUkl3zJIDqUQ+3DktI0C
Rka1r3UywYBYqy9nWz5kmTxeKUSzJnXmgD8scxm6U2d6NAp7TuGMDaOGu5mH4g4N
VxNx9uYbhAk0z8bkqo/C/0M+SLwLXWQjxrhuEu1nwsk07gs+ZMEghUSiyRfTalsm
YkXKIrhSOBpTjgY1Q3pAIpLsXNYUTQRBXQgV/VzsRTV4AKFvN7psKeUOB9BueXzi
KOEIdwRdOn2GWuG3dEvQGiUeg+iRy1KC63Y1peS+SZsUq2n7hKbO6mdyfB85KtXo
W12ApLbLXDzMxhRGtePl
=q9Bz
-END PGP SIGNATURE-
=== modified file 'debian/build.properties'
--- debian/build.properties 2011-08-20 13:14:04 +
+++ debian/build.properties 2012-06-19 10:31:33 +
@@ -17,3 +17,7 @@
${basedir}/src/tiles-core/build/tiles-core-${version}.jar:\
${basedir}/src/tiles-servlet/build/tiles-servlet-${version}.jar:\
${basedir}/src/tiles-template/build/tiles-template-${version}.jar
+# Ensure that source and target are 1.5
+# For backwards compat on Java 7
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
Please use
debian-j...@lists.debian.org for discussions and questions.
Bug#678166: jakarta-taglibs-standard: Fix FTBFS with openjdk-7
Package: jakarta-taglibs-standard
Version: 1.1.2-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Fix FTBFS with openjdk-7 as default-jdk (LP: #888941):
- d/patches/java7-compat.patch: Compatibility patch for compilation
with Java 7 API.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Kernel: Linux 3.4.0-5-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJP4Ly8AAoJEL/srsug59jDKXIQAJ+z7g6LdcXY78tctEeV7mxl
Sa59JV35bfaYOGoJLf0UBuDcLw1g5mRtQxdlqSvJtQhrtdX+pQxeRjJdvgR21VqH
dJzfv5GKipvVqBJNWJYKei4Wzx+vY8Zm9yCU0FCYVd4KoiutXahVd2CMsW1xa04m
cYJ7lk/RhSjMZjpG3vtbjwp1R11rvJGImThkKyzArmN70CuEfbJ2NB1KYbUN6Kcr
ObtUpLOuUoc3xjcg8SqTiJwioUU+Oni/rxdqBlA++TONNQC9tMDMaRUaosN7Kk8U
N4RvDEqrtAQKE0m7OLFbJR5rTQ4swMvQvsIYawcDW5mq57w7+w5lgkmSOQXAOYkE
EDlMCJg6StGR2hXTTophBdeHp3TAzkShVRjaKG6Y/tAfwmZOzEJWyW3LmM9pVYjj
Y7isrG07Lzauu3P1Hr4Nq8/gjJmfFIO+IAHdU4dtS8HOjf6McYPV1cut4CTNv5xE
NjKDEv5/Yt6y2kEgH69jlKwDMH2Gi4UaVx40h35PF9ANPaVWgYu4/5xKNNcFvl39
WpCtITn4KdNsvFqPGRjw0pffWBCTw6qmzhDJ9ZPHjo9Mt5z3KBuiWiqH+uqatH/j
rcCJRnkYmKcnfVlDuAgtvK0Uht8YWwkU9Ei62GqeK0KdDiX5Q4UnP3NwKXQmdKw2
RuBQVA+gYWhSfNaqLVQI
=7O3Z
-END PGP SIGNATURE-
=== added file 'debian/patches/java7-compat.patch'
--- debian/patches/java7-compat.patch 1970-01-01 00:00:00 +
+++ debian/patches/java7-compat.patch 2012-06-19 17:51:54 +
@@ -0,0 +1,25 @@
+Index: jakarta-taglibs-standard/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
+===
+--- jakarta-taglibs-standard.orig/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2012-06-12 21:40:55.04917 +0100
jakarta-taglibs-standard/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2012-06-12 21:41:52.171712718 +0100
+@@ -25,6 +25,9 @@
+
+ import org.apache.taglibs.standard.resources.Resources;
+
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
++
+
+ /**
+ * pA simple codeDataSource/code wrapper for the standard
+@@ -125,4 +128,10 @@
+ return null;
+ }
+
++/*
++ * JDBC 4.1
++ */
++public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++throw new SQLFeatureNotSupportedException();
++}
+ }
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-06-09 12:03:00 +
+++ debian/patches/series 2012-06-19 17:51:54 +
@@ -1 +1,2 @@
01_fix_build.diff
+java7-compat.patch
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
Please use
debian-j...@lists.debian.org for discussions and questions.
Bug#678167: libcommons-dbcp-java: Fix FTBFS with openjdk-7 and tidy dependencies
Package: libcommons-dbcp-java
Version: 1.4-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Fix FTBFS with openjdk-7 (LP: #888125):
- debian/patches/02_java7_compat.patch: Cherry picked patch from
Fedora transition for compatibility with Java 7.
* d/control: Use libgeronimo-jta-1.1-spec-java instead of deprecated
libgeronimo-jta-1.0.1b-spec-java.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Kernel: Linux 3.4.0-5-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJP4L2HAAoJEL/srsug59jDBpYP/0cOkZuzoOV+z80cvoLyB7xs
dYKX8RHJfp6EkkFrkhYPXcp8fdiYjMZsEljptk3GCc+1pTqqLBjArkGuHKgBbpy3
Tx4FDcEl4Kb2w6dm1EC2ykhY0w9FvsSUQPWpTQqzpKN38Q2g8HmDvALP6bRs8yNo
nzHpR2IJlUdxKH7g0XvaIzyiCKMJBTU5tn3jGn3XvZoEGaoYuob/N9eiLDBbX5BE
2N+Fd/BGDEqNdIVqR3BN0kiFVk6rWC0AGr4MkgUIABgbv0F6oM6b5z5hr/M0Eekd
aWtuoFBW/FayUIyPArlzBg1yGMfYncODGZBJei5ZCGErkuj57AjmP3pCL7ucDnk7
Ltm+dDh/o6FZBQVpOSdzZNLXiuUYi3m1Hu5XyTptT0M5mYm4hkcrj2hDwkNP+VFL
z09JjkYwiXca8/AzqfBVcFbZOHmvK+OmJIlbAYB7iQod7vQRhFsViENVINpVdsfU
X4vMnHNlytzhxpihHO4aXmRAzS4bN0GdJGPz8KMYRy8tHkVvhddA5MgbbdB17QYP
fPML513ObsBTM/26qHWTO2ehtpWeVyMcSEinHcngwKVLyjZxBhMITmLVDBNvdDBl
X0wHgHSoE047nTaN0Uars4uuQGiY507RQnTY/SvjV1w4xMQ4wNIcIc3knD3zH1QS
fUFWv6mZTJ9QNq7Zc3vP
=JE9S
-END PGP SIGNATURE-
=== modified file 'debian/changelog'
=== modified file 'debian/control'
--- debian/control 2010-06-11 15:09:25 +
+++ debian/control 2012-06-19 17:55:40 +
@@ -6,7 +6,7 @@
Uploaders: Michael Koch konque...@gmx.de, Damien Raude-Morvan draz...@debian.org
Build-Depends: debhelper (= 7), cdbs, default-jdk, ant, quilt
Build-Depends-Indep: libcommons-pool-java, libcommons-collections3-java, junit,
- libgeronimo-jta-1.0.1b-spec-java, maven-repo-helper, default-jdk-doc, libcommons-pool-java-doc
+ libgeronimo-jta-1.1-spec-java, maven-repo-helper, default-jdk-doc, libcommons-pool-java-doc
Standards-Version: 3.8.4
Homepage: http://commons.apache.org/dbcp/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-dbcp-java/
@@ -15,7 +15,7 @@
Package: libcommons-dbcp-java
Architecture: all
Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libcommons-pool-java, libcommons-collections3-java
-Suggests: libgeronimo-jta-1.0.1b-spec-java
+Suggests: libgeronimo-jta-1.1-spec-java
Description: Database Connection Pooling Services
The DBCP package provides database connection pooling services. The
following features are supported
=== added file 'debian/patches/02_java7_compat.patch'
--- debian/patches/02_java7_compat.patch 1970-01-01 00:00:00 +
+++ debian/patches/02_java7_compat.patch 2012-06-19 17:55:40 +
@@ -0,0 +1,459 @@
+Description: Compatibility patch for OpenJDK7
+Origin: https://bugzilla.redhat.com/show_bug.cgi?id=796638
+Author: Pavel Tisnovsky ptisn...@redhat.com
+
+Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/BasicDataSource.java
+===
+--- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/BasicDataSource.java 2012-06-06 15:30:07.241314000 +0100
libcommons-dbcp-java/src/java/org/apache/commons/dbcp/BasicDataSource.java 2012-06-06 15:30:38.106421672 +0100
+@@ -24,10 +24,12 @@
+ import java.util.ArrayList;
+ import java.util.Iterator;
+ import java.util.Collections;
++import java.util.logging.Logger;
+ import java.sql.Connection;
+ import java.sql.Driver;
+ import java.sql.DriverManager;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import javax.sql.DataSource;
+
+ import org.apache.commons.pool.KeyedObjectPoolFactory;
+@@ -1579,4 +1581,10 @@
+ logWriter.println(message);
+ }
+ }
++
++/* This functionality is not implemented yet */
++public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++throw new SQLFeatureNotSupportedException();
++}
++
+ }
+Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
+===
+--- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2012-06-06 15:30:07.241314000 +0100
libcommons-dbcp-java/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2012-06-06 15:30:38.106421672 +0100
+@@ -19,10 +19,12 @@
+
+ import java.util.Hashtable;
+ import java.util.Properties;
++import java.util.logging.Logger;
+ import
Bug#678170: easymock: Fix FTBFS with openjdk-7
Package: easymock
Version: 2.4+ds1-6
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Fix FTBFS ith openjdk-7 (LP: #888122):
- d/patches/java7-compat.patch: Adapted patch from upstream trunk
to support compilation under Java 7 which has tighter checks on
conflicting erasures for methods.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Kernel: Linux 3.4.0-5-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJP4L6nAAoJEL/srsug59jDX2sP/0gHcIKCS1S+ewm4De2Rtqb6
nz699RAcEL1jTOeHC4KOsm+hg1XGYFylYire8WVFCLxDYhF8OS12ScFyemacOWZN
NLdqf1NFDScFG1TRO26eUZoiOQMdSMp3zzER3yJUq7iq8MSj4AwZteL6z7C08OV8
DNyx+lzjyQUzKf1d/AlxxQcOyFTrFxgNcJ6DnIIbUg4A9l/56+sYL0YuBL1rMf3Z
ENb1JWN0MAem66/swAeHSX6HSlxnSmGqJ7tHyJWrZwm6vmQnNJHZ5TJk5mdlEHDA
0bIBiE2CeyjfjxbqKY0L+dvWv4OlUcv+UA3vUkFFdoeLbTrO6XsoIqutJhkhsG+f
Az74FmVKZIdsVS+LKZCS0eb0UEUYF/JQbRNxugft8c/2FZAWFmg1H6URud+4a0id
Ye8Sq9tnGlQwBYX4BclWGybr92WLPEE8/1E74lGA9wElq9aTmF8tmhELivpfw6Iq
6OT47CqRYEbdEJZcCOujkUA6W1tTmlr8xijI7rVnv7hTuYGk120BAyDteoDyvXnA
Sl37R0cGpuq4BkZimdEzgdaSv18ROACUKWIZW1vlOcFgd3sXIwAg2t7xBvjMU4LA
uS5L/JD9e8U4Ze1kjNGiBHdla78ZrcNwIRNvi3vK6bWZa98Jrh/xvXZChtFnwFGG
t1x18jcp/BZ7QGTlH7Oi
=Ktzs
-END PGP SIGNATURE-
=== added file 'debian/patches/java7-compat.patch'
--- debian/patches/java7-compat.patch 1970-01-01 00:00:00 +
+++ debian/patches/java7-compat.patch 2012-06-19 17:57:59 +
@@ -0,0 +1,98 @@
+Description: This patch works around tighter closure handling in
+ Java 7 and aligns to changes in easymock 3.1 upstream.
+ .
+ This patch should be dropped when the new version of easymock
+ is uploaded.
+Author: James Page james.p...@ubuntu.com
+Forwarded: not-needed
+
+Index: easymock/src/org/easymock/EasyMock.java
+===
+--- easymock.orig/src/org/easymock/EasyMock.java 2012-05-21 11:56:31.111766000 +0100
easymock/src/org/easymock/EasyMock.java 2012-05-21 12:01:38.793400467 +0100
+@@ -1430,7 +1430,7 @@
+ * @param captured Where the parameter is captured
+ * @return code0/code
+ */
+-public static int capture(CaptureInteger captured) {
++public static int captureInt(CaptureInteger captured) {
+ reportMatcher(new CapturesInteger(captured));
+ return 0;
+ }
+@@ -1441,7 +1441,7 @@
+ * @param captured Where the parameter is captured
+ * @return code0/code
+ */
+-public static long capture(CaptureLong captured) {
++public static long captureLong(CaptureLong captured) {
+ reportMatcher(new CapturesLong(captured));
+ return 0;
+ }
+@@ -1452,7 +1452,7 @@
+ * @param captured Where the parameter is captured
+ * @return code0/code
+ */
+-public static float capture(CaptureFloat captured) {
++public static float captureFloat(CaptureFloat captured) {
+ reportMatcher(new CapturesFloat(captured));
+ return 0;
+ }
+@@ -1463,7 +1463,7 @@
+ * @param captured Where the parameter is captured
+ * @return code0/code
+ */
+-public static double capture(CaptureDouble captured) {
++public static double captureDouble(CaptureDouble captured) {
+ reportMatcher(new CapturesDouble(captured));
+ return 0;
+ }
+@@ -1474,7 +1474,7 @@
+ * @param captured Where the parameter is captured
+ * @return code0/code
+ */
+-public static byte capture(CaptureByte captured) {
++public static byte captureByte(CaptureByte captured) {
+ reportMatcher(new CapturesByte(captured));
+ return 0;
+ }
+@@ -1485,7 +1485,7 @@
+ * @param captured Where the parameter is captured
+ * @return code0/code
+ */
+-public static char capture(CaptureCharacter captured) {
++public static char captureChar(CaptureCharacter captured) {
+ reportMatcher(new CapturesCharacter(captured));
+ return 0;
+ }
+Index: easymock/tests/org/easymock/tests2/CaptureTest.java
+===
+--- easymock.orig/tests/org/easymock/tests2/CaptureTest.java 2012-05-21 11:56:31.111766000 +0100
easymock/tests/org/easymock/tests2/CaptureTest.java 2012-05-21 12:08:58.146906680 +0100
+@@ -57,7 +57,7 @@
+ CaptureInteger capture = new CaptureInteger();
+ IMethods mock = createMock(IMethods.class);
+
+-expect(mock.oneArg(capture(capture))).andReturn(answer);
++expect(mock.oneArg
Bug#678171: junit4: Fix FTBFS due to test failure with openjdk-7
Package: junit4
Version: 4.10-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openkjdk-7-transition
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Merge from Debian unstable. Remaining changes:
- d/patches/java7-ignore-test.patch: Disable useChildHarvester unit test
as it makes assumptions about the order of test execution which are not
guaranteed under Java 7.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Kernel: Linux 3.4.0-5-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJP4L9nAAoJEL/srsug59jDUikP/16K1JYiewuU4lluYxnxrLAw
CRihcJNeDSkx+jEp3urenUwHBOGGN5YOXgD1FMTZta8qvqVOe6BAotHn37Us1qlt
Sb4nFsYTWjOQqau1bKyS3GWX2ZM+NqPZ+DFgz9hG7tldktAD8E/WsGKhOlbAZcr0
cX417b38dvmH8a/o8/noIh7XbFLelI+ACCd4Icx69rHCyN9LmLg/lNYWktTEzvoS
n0uFAjcg7nZv3lSociNv7gmOK6uD3HTe/9yxflZT/9lu7QOR7/avlLAk8AvktssV
gncM6jPoMu3KgEgIi5yu81H8UfAGCMoohQo6MiXJA3DfHRpFf7OymdzaukylGYFs
MMZJhVCFabGQdSLpURZ8CF39V51gmqV3h/KC3QkJjAg62gp/N52rY2CvvW+JscdV
eQI2dJcgtgtlOTwL9DBRS972lXDT5pKwh/sk4v1BoJGaJ9NOYb5NVzJl1m8WSYeN
WkI67wzdYELYTQOkxE11NQvmXKPGpkP/WEG1vzQXECunAYl6mt0MJK5o9trBUlZz
14LdYTeXVCPBsbHpax/ayLc533jRw40Jfr2lkhYCCov9K1MAQ6Mi4jLL9lbv+eoE
piNlq2Q6ufD/ExmDhTTPnC83WKDpgjma7YYCiMJMeA6oKyhjpkTHjohSv6XQ1/Jl
4SFiN1c4WHpGQg8W3T83
=nG31
-END PGP SIGNATURE-
=== added file 'debian/patches/java7-ignore-test.patch'
--- debian/patches/java7-ignore-test.patch 1970-01-01 00:00:00 +
+++ debian/patches/java7-ignore-test.patch 2012-06-19 18:03:28 +
@@ -0,0 +1,28 @@
+Description: This test case makes assumptions about the order
+ of execution of tests in the Fruit.class test which are not
+ guaranteed under Java 7.
+ .
+ This is being worked on upstream for a future release on JUnit.
+Author: James Page james.p...@ubuntu.com
+Forwarded: not-needed
+
+Index: junit4/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java
+===
+--- junit4.orig/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java 2012-05-21 14:04:38.16535 +0100
junit4/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java 2012-05-21 14:29:26.162439110 +0100
+@@ -9,6 +9,7 @@
+
+ import org.hamcrest.Matcher;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.junit.internal.matchers.TypeSafeMatcher;
+ import org.junit.runner.Description;
+ import org.junit.runner.JUnitCore;
+@@ -38,6 +39,7 @@
+ }
+ }
+
++@Ignore
+ @Test
+ public void useChildHarvester() throws InitializationError {
+ log= ;
=== modified file 'debian/patches/series'
--- debian/patches/series 2012-03-07 22:56:14 +
+++ debian/patches/series 2012-06-19 18:03:28 +
@@ -1,2 +1,3 @@
workaround_typing_bug.diff
manifest_jar.diff
+java7-ignore-test.patch
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
Please use
debian-j...@lists.debian.org for discussions and questions.
Bug#677022: jline: Ensure Java classes are compatible with Java 5+
Package: jline Version: 1.0-1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Ensure Java classes are backwards compatible with openjdk-6 (LP: #1011362): - debian/ant.properties: Compile Java code with source/target == 1.5. Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers precise-updates APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise'), (100, 'precise-backports') Architecture: amd64 (x86_64) Kernel: Linux 3.4.0-4-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJP1axkAAoJEL/srsug59jDEx0P/jDOzLH6yO322eMTUxusZztd itrszDatakChvcj9KZze0JAE+rfufNpT0W1pnhnNJDxbiendFdSmQV8rAxZrfwBK Kv879Yvhb68AhJ1C5un4UkC0LFS4xin8dwOPg9s+hkyxVyyyjF94uXdr9sdcLLkx Jr9kj2SLsyZmALsKO+moa0TJXfW84QleH4vRgwJXYr0fwSjAObVry5jK6UWO6GtZ rHIir+Q2q9Yc1dtazVa2zIaOY2MqC66ol/6h/7RpsF7XZzJPI1XGaEjY15Nv7XP3 PWFuQ+TbXSHGvIt9mEfk5Duhtxuniw2kdDrrz+Y3JDCnqG5SsBuO34BcLqZlB+KR NNOc/fa0Y6rypTGZ7r0yp4vLV7PZe1KepMZtgn4YtP2mYHJJRsb7HPagZXmCBfW+ 1rrSy3VMS0WADIzFe/2EXq/SfvD6Wk5Nddm5mDaGkSRIPr+L3j0MANYAxHAaRSEA spoq2JcuzSvzt3dIOSLc9isFaVw/Ua0T8eU7Fm+PuB7pgIr3yrfFuy5G6BqNf+5D 59Z86lEgm/7xkF5k9HPXtcVlyN8Hr4XYAM/zySHykWRPsGN2xmhUEHNUJR7vnIst 1EgmxDYr8YqwJ2hfnmPv+rPGYmQxablYkNwkpAafR+ZbsGnFUlfWy1oNNyddQTyb B5Spsm1SFyxf75k0BOhQ =aDqh -END PGP SIGNATURE- === modified file 'debian/ant.properties' --- debian/ant.properties 2008-02-22 21:58:41 + +++ debian/ant.properties 2012-06-11 08:12:34 + @@ -3,3 +3,7 @@ doc.dir=api jar.name=jline.jar demo-jar.name=jline-demo.jar +# Ensure that source and target are 1.5 +# For backwards compat on Java 7 +ant.build.javac.source=1.5 +ant.build.javac.target=1.5 __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#677025: swt-gtk: Ensure java classes are compatible with Java 1.5+
Package: swt-gtk Version: 3.7.2-3 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Ensure library is compatible with Java 1.5+ (LP: #1011103): - d/Makefile: Compile java code with source/target == 1.5. This ensure that if this library is built with openjdk-7 it will still work with openjdk-6 and other Java5+ implementations. Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers precise-updates APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise'), (100, 'precise-backports') Architecture: amd64 (x86_64) Kernel: Linux 3.4.0-4-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJP1bDcAAoJEL/srsug59jDkkAP/1LTbYr3bw+dNrIpZKQBeRTN 7orJXhGrPyxCCnPvhSiR0ikbgS4C5zMdJwKBkdxWnwQKuZAbcBCo08AH9gEwyWuu Yi+/y5Wkk6Nyt9I2owP9Xj4kPGm6EXstA4Bi8kp77hTztYX4l7rWuIPWO/b5ohkE aFiWsTR24b3G5nqu4W3caFYTpaY8Q6jpKYEraoptBJhBlDEU4keX3mrpV+BBADtT 7Ex1+HezXk6PPK++Fi5rkMdx0fw4IeDptla4+bM+DjwX0s/QUAmQqdpWCuGyyPit n0isN9YObeGc4KU3FLpq/mowlXRqMbeuncztNGf9pVzbNNNIEgpIIV+Tn0VqvVp2 3qwxq/DPAvsGzLc7IhSvR3AbIPwz8VDVvgaLUQ5uP2pXhlLdaqOyWScctaTS0Woo T9/4zqnEPkrca0BkpahhYQ+MdvgyXq5FyV4Bqhcr1D9dEzq8vRsHUsxgflcKV7KO fIpRl6P0iwR6vD5sTIPcflXRJJCwppMIFQH1taousvktVg0uVpH8kkI/b18uYD4h RXouel2LH2nTdwuLSli0OJi6cha8nzKDpWMeDue4YOMK8u7aa+CtbY0MBpeJEz7V aWolird55vZsfZlWr81AVqWVCk2tBTgTONODvbgIly9l/uReFxuzOJsHxmOJB7/9 gLv3yoyerNhUELZ63pjL =cGsw -END PGP SIGNATURE- === modified file 'debian/Makefile' --- debian/Makefile 2012-05-24 09:18:54 + +++ debian/Makefile 2012-06-11 08:30:51 + @@ -3,7 +3,7 @@ CLEANFILES=*.files *.jar *-stamp JAR=fastjar -JAVAC=javac -classpath . +JAVAC=javac -classpath . -source 1.5 -target 1.5 RM=rm -f all: $(JAVA) __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#675180: jffi: fix ftbfs with openjdk-7 as default-jdk
Package: jffi Version: 1.0.2-8.2 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/control: Switch BD from openjdk-6-jdk to default-jdk to support transition to openjdk-7 and fix FTBFS. Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers precise-updates APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise'), (100, 'precise-backports') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-24-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJPxgPJAAoJEL/srsug59jDMWIP/iM3mhuTHC6v1dYqbcPyNghI +UkczvjvMIRWAfD50QXoNP6wQ+/b4poumQoPyZyqsfADdYTOdN8oASmGuFkgCVHN F5JkeTZAtNUyZs4zfjq1h85WlCa7kQ2V7Gq0mchHSrPyhB7o7jH+k1cqR32RJ2z5 mz1Fz3u6TBWxM+3BtWyFrk34B29w87qgYQBIThkfQ1sc9sU0st8G/itOT0TG6qpm Jt39XEgvdKRPq4Su8QDqnvCGoS38+qSSmZEG8pY28P0wr0tD1BAIDJYZ6hMkhGeT zfx03niUPGuUrC138wgxr1Nyzx2GXaBe6gi1LHdJtSG9G7qfI5QFVTHz25kNfCum Xh/Dnj5wJigI78n8IQ5VmmnYAW5G4GoxDm7VGsCZEyuNRpgQSrApFYx4b/0P/R1S 7e0bg31b0+If0IwAhXzNDURN+7K7qWEvdv52zYW1InggufkZgCGaCrb70SkB3wQa kxcvcvMcU7tIT3MzBLY5OzS6rHsLHIB71L9fBMzTTUPaigDHDQXYi0zwkNo4Z1cV /3NQIglQaaOFUiT9ONFmdbL+MHQOCGYfLKDnEJ6Txxwry2ZUReIf5hD8fDWI1964 bNoyjDJsp7L2swwYWXBcObJ9h+6kXlgR1h1tB4db5YHy0xar4VydrjrXZKneJxCT jPTue8Eof7HKdLFF2S6P =e+gc -END PGP SIGNATURE- diff -Nru jffi-1.0.2/debian/changelog jffi-1.0.2/debian/changelog diff -Nru jffi-1.0.2/debian/control jffi-1.0.2/debian/control --- jffi-1.0.2/debian/control 2011-09-17 11:32:27.0 +0100 +++ jffi-1.0.2/debian/control 2012-05-30 12:20:13.0 +0100 @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org Uploaders: Torsten Werner twer...@debian.org Build-Depends: debhelper (= 7), cdbs, maven-repo-helper, libffi-dev, pkg-config, - ant-optional, openjdk-6-jdk, junit4 + ant-optional, default-jdk, junit4 Standards-Version: 3.9.0 Vcs-Git: git://git.debian.org/pkg-java/jffi.git Vcs-Browser: http://git.debian.org/?p=pkg-java/jffi.git __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#675038: glassfish: Fix FTBFS with openjdk-7
Package: glassfish
Version: 1:2.1.1-b31g-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Fix FTBFS with openjdk-7 as default-jdk (LP: #888938):
- d/patches/java7-compat.patch: compatibility patch for compilation
with Java 7 API's.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-24-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJPxM9LAAoJEL/srsug59jDzRIQAMR3lIsuPiGImq2bDBwzCYZ/
UCfSrPP83AjsNDlG2kTPDn/jVKShaGb7bZ58dRuETitpA2/BdQgQlflkpsyuQHOB
ehCkSaFVDz/daID4TRWsnaYUgj3qpOmUa5Jt7vBw1TarucF6kHWrdLsMaYEjGqr3
yjRB+WoHtkl/ffWtgH9cwIh1g7IIJZ8r5gZkI4q4hi7MdwMhRbAIfo+tT8/bC/N4
1x86WxCvTLJHwrbohLeX/IcpC2E4p3iHtbMrf1wzStUxOEDwPFGiibfqJ7sP9Y/B
NI9wDIOW0wU0lSWhVWTPr6LfPAbdCZlyhRqWlcm+HeIkVxRGr4J2MECrL9W5Qgar
nAMdnQjcYorciP3Nt2effKjb0jdzbz7HiFLWNzCrcSYzWimmtDmuS50cytgNol4u
p8Yz4N61laqPDSFOSXxWxie4n7EiFEMldayVZd6pBld0pHqEW+k4dbqL19P+15Al
6UMRQ+UEeWi9GrgbvXfZSIxsDom5kmMMXfu5YsBjhD6vDRRbEaPFFxV8jhpLKNqH
9ZEwgGEi8+f5TxtnZ+cqzwyKeBQozRlEVMBRj69SoGx/0BIaAbr0JvGhXM4p27vi
FQ+o0rqVVRcgB22beQzHRBIm7oNK5LuTEBsIL5FOgX4Xmv1wWrMdM1BzlDPaMFhz
oyZTfnXgiNcoDOr18las
=swbS
-END PGP SIGNATURE-
=== added file 'debian/patches/java7-compat.patch'
--- debian/patches/java7-compat.patch 1970-01-01 00:00:00 +
+++ debian/patches/java7-compat.patch 2012-05-29 12:35:32 +
@@ -0,0 +1,58 @@
+Description: Compatibility patch for compilation with OpenJDK7 due
+ to changes in the JDBC API.
+ .
+ Also backwards compatibility with OpenJDK6.
+Author: James Page james.p...@ubuntu.com
+Forwarded: no
+
+Index: glassfish/entity-persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/jdbc/base/DataSourceImpl.java
+===
+--- glassfish.orig/entity-persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/jdbc/base/DataSourceImpl.java 2012-05-29 13:10:41.666234000 +0100
glassfish/entity-persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/jdbc/base/DataSourceImpl.java 2012-05-29 13:15:35.752552327 +0100
+@@ -40,6 +40,8 @@
+ import java.sql.Connection;
+ import java.sql.SQLException;
+ import java.sql.DriverManager;
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
+ import javax.sql.DataSource;
+ import oracle.toplink.essentials.internal.ejb.cmp3.transaction.base.TransactionManagerImpl;
+
+@@ -177,4 +179,11 @@
+ public boolean isWrapperFor(Class? iface) throws SQLException {
+ return false;
+ }
++
++/*
++ * JDBC 4.1
++ */
++public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++throw new SQLFeatureNotSupportedException();
++}
+ }
+Index: glassfish/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
+===
+--- glassfish.orig/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2012-05-29 13:10:41.666234000 +0100
glassfish/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2012-05-29 13:27:43.078925227 +0100
+@@ -58,7 +58,8 @@
+ import java.sql.Connection;
+ import java.sql.DriverManager;
+ import java.sql.SQLException;
+-
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
+ import javax.sql.DataSource;
+
+ import org.apache.taglibs.standard.resources.Resources;
+@@ -163,5 +164,10 @@
+ throw new SQLException(Resources.getMessage(NOT_SUPPORTED));
+ }
+
+-
++/*
++ * JDBC 4.1
++ */
++public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++throw new SQLFeatureNotSupportedException();
++}
+ }
=== modified file 'debian/patches/series'
--- debian/patches/series 2010-05-18 21:31:25 +
+++ debian/patches/series 2012-05-29 12:13:33 +
@@ -1,3 +1,4 @@
0001-Fix-appserv-api-build.patch
0002-Fix-glassfish.root-directory.patch
0003-Disable-SQL-exceptions.patch
+java7-compat.patch
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
Please use
debian-j...@lists.debian.org for discussions and questions.
Bug#675027: jetty: Add detection to init script for openjdk-7 and openjdk-6 multiarch installations
Package: jetty Version: 6.1.26-1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu quantal ubuntu-patch -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/jetty.init: Look for JAVA_HOME in multiarch locations for openjdk-6 and openjdk-7 (LP: #878527). All openjdk-[6,7]-\* packages now install to multiarch locations and the jetty init script was not correcty scanning them resulting in a failure to start if anything other than default-jre-headless was installed. Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers precise-updates APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise'), (100, 'precise-backports') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-24-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJPxL1GAAoJEL/srsug59jDp5oQAKKZRnfBi6KywzLPieKVJkA9 bXmM381exB96zaJB7WgHGdYh8O3GgCH/4zGO7NFFeFlxzOyg7Joeaxs/8dItJnUk bHRolnQYvsdjR6kVpsv0vsxYI8y2jdLeqLJHE9S6f4GhSIabCaSxegFiQKom2DOQ t27F6GCb4oY6f8n57/3Zw01HqOumZ3H5c+yieXBqi8sHHm8G5USmv0KX5lUYqdSw RySm4coAk1o7qvqODujpiwbZ9u5MFX6mNy+32Ie7dsysdoYZc0tprZq6MItB+wH4 1cTRwHlLj5BHqbXGf1e5NQ40vKdTbNG/WuWQSbxVIJnq9uUrI/ytcj4jpJutEsAU wPg74C2+ilVyEgorTSrWTHZNudE4LYYGSx+fzTC/TxBZMJtnyYH1WOzgkZjTcba0 igdhVNzDSkSslSq2bpSUtoDzr48goTTSUefSnUkpf53b5+dGBUiJ+BdpExcwwqS7 nlxlxXQMLTLr2ZJrKd2EP0pTUQSEeKisDECbrflLD2Ih5NzNMXlk79X23pOX3SL/ X36VQJ1oc8xGLAoUXxT+oRRDzHjkvbGNj15xWH/eOePKWVbhE5p6hbODRzxTpIsF kGHFlmN5de6E+HcZHqcFe9l8A2lysfHu294ECc0DTrQT2bwN8cMAogxxSddRgly0 Sun3JgWIqGRqac/jaIND =J47i -END PGP SIGNATURE- diff -Nru jetty-6.1.26/debian/jetty.init jetty-6.1.26/debian/jetty.init --- jetty-6.1.26/debian/jetty.init 2012-04-25 10:37:40.0 +0100 +++ jetty-6.1.26/debian/jetty.init 2012-05-29 12:37:13.0 +0100 @@ -119,6 +119,8 @@ # defined in /etc/default/jetty). Should contain a list of space separated directories. JDK_DIRS= /usr/lib/jvm/default-java \ + /usr/lib/jvm/java-1.7.0-openjdk-* \ + /usr/lib/jvm/java-1.6.0-openjdk-* \ /usr/lib/jvm/java-6-sun \ /usr/lib/jvm/java-6-openjdk \ /usr/lib/jvm/java-1.5.0-sun \ __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
[SCM] Apache ZooKeeper branch, master, updated. debian/3.3.5+dfsg1-1-3-gfa857d7
The following commit has been merged in the master branch:
commit fa857d7e8401711adba761dec2fa1a5bd724dfea
Author: Matthias Klose d...@debian.org
Date: Thu May 10 18:00:25 2012 +0200
Imported Debian patch 3.3.5+dfsg1-1.1
diff --git a/debian/changelog b/debian/changelog
index f582e67..dfbc111 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,9 @@
-zookeeper (3.3.5+dfsg1-2) UNRELEASED; urgency=low
+zookeeper (3.3.5+dfsg1-1.1) unstable; urgency=low
- * d/patches/fixes/ZOOKEEPER-1431: Fix up memory leak in zookeeper
-python binding which results in significant memory growth for large
-result sets (Closes: #665962). Thanks to Johan Rydberg for identifying
-this bug and Kapil Thangavelu for the patch.
+ * Non maintainer upload.
+ * Fix build failure with GCC 4.7.
- -- James Page james.p...@ubuntu.com Tue, 27 Mar 2012 12:40:37 +0100
+ -- Matthias Klose d...@debian.org Thu, 10 May 2012 18:00:25 +0200
zookeeper (3.3.5+dfsg1-1) unstable; urgency=low
diff --git a/debian/patches/fixes/ZOOKEEPER-1431
b/debian/patches/fixes/ZOOKEEPER-1431
deleted file mode 100644
index aaf4f90..000
--- a/debian/patches/fixes/ZOOKEEPER-1431
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: Fix up memory leak for large results set in zk
- python bindings.
-Author: Kapil Thangavelu kapil.thangav...@canonical.com
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/zookeeper/+bug/963280
-Bug: https://issues.apache.org/jira/browse/ZOOKEEPER-1431
-
-Index: a/src/contrib/zkpython/src/c/zookeeper.c
-===
a/src/contrib/zkpython/src/c/zookeeper.c (revision 1304459)
-+++ b/src/contrib/zkpython/src/c/zookeeper.c (working copy)
-@@ -436,7 +436,8 @@
- if (PyObject_CallObject((PyObject*)callback, arglist) == NULL) {
- PyErr_Print();
- }
-- if (pyw-permanent == 0 (type != ZOO_SESSION_EVENT ||
is_unrecoverable(zzh) == ZINVALIDSTATE)) {
-+ Py_DECREF(arglist);
-+ if (pyw-permanent == 0 (type != ZOO_SESSION_EVENT ||
is_unrecoverable(zzh) == ZINVALIDSTATE)) {
- free_pywatcher(pyw);
- }
- PyGILState_Release(gstate);
-@@ -457,6 +458,7 @@
- PyObject *arglist = Py_BuildValue((i,i), pyw-zhandle, rc);
- if (PyObject_CallObject((PyObject*)callback, arglist) == NULL)
- PyErr_Print();
-+ Py_DECREF(arglist);
- free_pywatcher(pyw);
- PyGILState_Release(gstate);
- }
-@@ -474,9 +476,9 @@
- PyObject *pystat = build_stat(stat);
- PyObject *arglist = Py_BuildValue((i,i,O), pyw-zhandle,rc, pystat);
- Py_DECREF(pystat);
--
- if (PyObject_CallObject((PyObject*)callback, arglist) == NULL)
- PyErr_Print();
-+ Py_DECREF(arglist);
- free_pywatcher(pyw);
- PyGILState_Release(gstate);
- }
-@@ -498,6 +500,7 @@
-
- if (PyObject_CallObject((PyObject*)callback, arglist) == NULL)
- PyErr_Print();
-+ Py_DECREF(arglist);
- free_pywatcher(pyw);
- PyGILState_Release(gstate);
- }
-@@ -518,6 +521,7 @@
- PyObject *arglist = Py_BuildValue((i,i,O), pyw-zhandle, rc,
pystrings);
- if (arglist == NULL || PyObject_CallObject((PyObject*)callback,
arglist) == NULL)
- PyErr_Print();
-+ Py_DECREF(arglist);
- }
- else
- PyErr_Print();
-@@ -540,6 +544,7 @@
- PyObject *arglist = Py_BuildValue((i,i,s), pyw-zhandle,rc, value);
- if (PyObject_CallObject((PyObject*)callback, arglist) == NULL)
- PyErr_Print();
-+ Py_DECREF(arglist);
- free_pywatcher(pyw);
- PyGILState_Release(gstate);
- }
-@@ -565,6 +570,7 @@
- if (PyObject_CallObject((PyObject*)callback, arglist) == NULL) {
- PyErr_Print();
- }
-+ Py_DECREF(arglist);
- free_pywatcher(pyw);
- PyGILState_Release(gstate);
- }
diff --git a/debian/patches/ftbfs-gcc-4.7.diff
b/debian/patches/ftbfs-gcc-4.7.diff
new file mode 100644
index 000..915601b
--- /dev/null
+++ b/debian/patches/ftbfs-gcc-4.7.diff
@@ -0,0 +1,12 @@
+Index: zookeeper-3.3.5+dfsg1/src/contrib/zktreeutil/src/ZkAdaptor.cc
+===
+--- zookeeper-3.3.5+dfsg1.orig/src/contrib/zktreeutil/src/ZkAdaptor.cc
2012-03-15 20:09:29.0 +
zookeeper-3.3.5+dfsg1/src/contrib/zktreeutil/src/ZkAdaptor.cc
2012-05-10 16:00:13.741897761 +
+@@ -18,6 +18,7 @@
+
+ #include ZkAdaptor.h
+ #include string.h
++#include unistd.h
+ #include sstream
+ #include iostream
+ #include algorithm
diff --git a/debian/patches/series b/debian/patches/series
index d4c690d..ec6b7bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,4 @@ fixes/ZOOKEEPER-705
fixes/ZOOKEEPER-1033
fixes/ZOOKEEPER-1374
fixes/ZOOKEEPER-1403
-fixes/ZOOKEEPER-1431
+ftbfs-gcc-4.7.diff
--
Apache ZooKeeper
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] Apache ZooKeeper annotated tag, debian/3.3.5+dfsg1-1.1, created. debian/3.3.5+dfsg1-1.1
The annotated tag, debian/3.3.5+dfsg1-1.1 has been created at bf10767ea9a4ce7d010709b344c08d770b11eb9a (tag) tagging fa857d7e8401711adba761dec2fa1a5bd724dfea (commit) replaces debian/3.3.5+dfsg1-1 tagged by James Page on Mon May 28 10:51:19 2012 +0100 - Shortlog Debian release 3.3.5+dfsg1-1.1 James Page (2): d/patches/fixes/ZOOKEEPER-1431: Fix up memory leak in zookeeper python binding which results in significant memory growth for large result sets (Closes: #). Thanks to Johan Rydberg for identifying this bug and Kapil Thangavelu for the patch. Added bug reference Matthias Klose (1): Imported Debian patch 3.3.5+dfsg1-1.1 --- -- Apache ZooKeeper ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] Apache ZooKeeper branch, master, updated. debian/3.3.5+dfsg1-1.1-1-g68e7c60
The following commit has been merged in the master branch:
commit 68e7c60f3009e5ebacb5e76302fb4421afd46944
Author: James Page james.p...@ubuntu.com
Date: Mon May 28 10:56:10 2012 +0100
d/patches/fixes/ZOOKEEPER-1431: Fix up memory leak in zookeeper python
binding which results in significant memory growth for large result sets
(Closes: #665962). Thanks to Johan Rydberg for identifying this bug and Kapil
Thangavelu for the patch.
diff --git a/debian/changelog b/debian/changelog
index dfbc111..b973878 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+zookeeper (3.3.5+dfsg1-2) UNRELEASED; urgency=low
+
+ * d/patches/fixes/ZOOKEEPER-1431: Fix up memory leak in zookeeper
+python binding which results in significant memory growth for large
+result sets (Closes: #665962). Thanks to Johan Rydberg for identifying
+this bug and Kapil Thangavelu for the patch.
+
+ -- James Page james.p...@ubuntu.com Tue, 27 Mar 2012 12:40:37 +0100
+
zookeeper (3.3.5+dfsg1-1.1) unstable; urgency=low
* Non maintainer upload.
diff --git a/debian/patches/fixes/ZOOKEEPER-1431
b/debian/patches/fixes/ZOOKEEPER-1431
new file mode 100644
index 000..aaf4f90
--- /dev/null
+++ b/debian/patches/fixes/ZOOKEEPER-1431
@@ -0,0 +1,71 @@
+Description: Fix up memory leak for large results set in zk
+ python bindings.
+Author: Kapil Thangavelu kapil.thangav...@canonical.com
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/zookeeper/+bug/963280
+Bug: https://issues.apache.org/jira/browse/ZOOKEEPER-1431
+
+Index: a/src/contrib/zkpython/src/c/zookeeper.c
+===
+--- a/src/contrib/zkpython/src/c/zookeeper.c (revision 1304459)
b/src/contrib/zkpython/src/c/zookeeper.c (working copy)
+@@ -436,7 +436,8 @@
+ if (PyObject_CallObject((PyObject*)callback, arglist) == NULL) {
+ PyErr_Print();
+ }
+- if (pyw-permanent == 0 (type != ZOO_SESSION_EVENT ||
is_unrecoverable(zzh) == ZINVALIDSTATE)) {
++ Py_DECREF(arglist);
++ if (pyw-permanent == 0 (type != ZOO_SESSION_EVENT ||
is_unrecoverable(zzh) == ZINVALIDSTATE)) {
+ free_pywatcher(pyw);
+ }
+ PyGILState_Release(gstate);
+@@ -457,6 +458,7 @@
+ PyObject *arglist = Py_BuildValue((i,i), pyw-zhandle, rc);
+ if (PyObject_CallObject((PyObject*)callback, arglist) == NULL)
+ PyErr_Print();
++ Py_DECREF(arglist);
+ free_pywatcher(pyw);
+ PyGILState_Release(gstate);
+ }
+@@ -474,9 +476,9 @@
+ PyObject *pystat = build_stat(stat);
+ PyObject *arglist = Py_BuildValue((i,i,O), pyw-zhandle,rc, pystat);
+ Py_DECREF(pystat);
+-
+ if (PyObject_CallObject((PyObject*)callback, arglist) == NULL)
+ PyErr_Print();
++ Py_DECREF(arglist);
+ free_pywatcher(pyw);
+ PyGILState_Release(gstate);
+ }
+@@ -498,6 +500,7 @@
+
+ if (PyObject_CallObject((PyObject*)callback, arglist) == NULL)
+ PyErr_Print();
++ Py_DECREF(arglist);
+ free_pywatcher(pyw);
+ PyGILState_Release(gstate);
+ }
+@@ -518,6 +521,7 @@
+ PyObject *arglist = Py_BuildValue((i,i,O), pyw-zhandle, rc,
pystrings);
+ if (arglist == NULL || PyObject_CallObject((PyObject*)callback,
arglist) == NULL)
+ PyErr_Print();
++ Py_DECREF(arglist);
+ }
+ else
+ PyErr_Print();
+@@ -540,6 +544,7 @@
+ PyObject *arglist = Py_BuildValue((i,i,s), pyw-zhandle,rc, value);
+ if (PyObject_CallObject((PyObject*)callback, arglist) == NULL)
+ PyErr_Print();
++ Py_DECREF(arglist);
+ free_pywatcher(pyw);
+ PyGILState_Release(gstate);
+ }
+@@ -565,6 +570,7 @@
+ if (PyObject_CallObject((PyObject*)callback, arglist) == NULL) {
+ PyErr_Print();
+ }
++ Py_DECREF(arglist);
+ free_pywatcher(pyw);
+ PyGILState_Release(gstate);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index ec6b7bd..4b62d71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ fixes/ZOOKEEPER-1033
fixes/ZOOKEEPER-1374
fixes/ZOOKEEPER-1403
ftbfs-gcc-4.7.diff
+fixes/ZOOKEEPER-1431
--
Apache ZooKeeper
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] Apache ZooKeeper branch, master, updated. debian/3.3.5+dfsg1-1.1-3-g2d89368
The following commit has been merged in the master branch: commit 31c4270cb32fb735eb14a1c94bb547b38c788011 Author: James Page james.p...@ubuntu.com Date: Mon May 28 11:40:51 2012 +0100 Mark as targetting unstable diff --git a/debian/changelog b/debian/changelog index b973878..e2cea71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -zookeeper (3.3.5+dfsg1-2) UNRELEASED; urgency=low +zookeeper (3.3.5+dfsg1-2) unstable; urgency=low * d/patches/fixes/ZOOKEEPER-1431: Fix up memory leak in zookeeper python binding which results in significant memory growth for large -- Apache ZooKeeper ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] Apache ZooKeeper branch, master, updated. debian/3.3.5+dfsg1-1.1-3-g2d89368
The following commit has been merged in the master branch: commit 2d89368c2cb289163cf9b1971b1fcf9d4b5731b5 Author: James Page james.p...@ubuntu.com Date: Mon May 28 11:51:20 2012 +0100 Updated date inchangelog entry diff --git a/debian/changelog b/debian/changelog index e2cea71..b609625 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ zookeeper (3.3.5+dfsg1-2) unstable; urgency=low result sets (Closes: #665962). Thanks to Johan Rydberg for identifying this bug and Kapil Thangavelu for the patch. - -- James Page james.p...@ubuntu.com Tue, 27 Mar 2012 12:40:37 +0100 + -- James Page james.p...@ubuntu.com Mon, 28 May 2012 11:51:03 +0100 zookeeper (3.3.5+dfsg1-1.1) unstable; urgency=low -- Apache ZooKeeper ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] Apache ZooKeeper annotated tag, debian/3.3.5+dfsg1-2, created. debian/3.3.5+dfsg1-2
The annotated tag, debian/3.3.5+dfsg1-2 has been created at 5401d51af59a76f85bca21af555dcd7f042df1a7 (tag) tagging 2d89368c2cb289163cf9b1971b1fcf9d4b5731b5 (commit) replaces debian/3.3.5+dfsg1-1.1 tagged by James Page on Mon May 28 11:52:16 2012 +0100 - Shortlog Debian release 3.3.5+dfsg1-2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAABCAAGBQJPw1jgAAoJEJyvzxFWdG+VyDAH/0sP/wj3/q67K4eYsHvvf9r0 EwE1WO+AWDgVAgyvBQsouFCq8dGYYoZ5urLxANP+u6e+wgIlfbYCDw6fkNud0Pjl zvEvDx1upcVM7zIy5c2xeilHpWvgsH+jLDPX2igXJwoD8zRYa7jnaKV66NE0B02I +vq19dw9Xv0N+17wLU5eMTAPW6uzArZ4umzAxnRxpMcCT3+22Iu7n2iPl/Dg4vpL LAnt7NiZlZ7TnFH+bTs+SnVYXzI8EIPPoLLNh/8ppAx5hMdou31RTbM3BnQMNjQc jdyAdEc8dDbmA0D3zZicA/i3n24RfumVBGaN1LI5LJumuUlx6OFqa4zOIOOtu78= =eMXz -END PGP SIGNATURE- James Page (3): d/patches/fixes/ZOOKEEPER-1431: Fix up memory leak in zookeeper python binding which results in significant memory growth for large result sets (Closes: #665962). Thanks to Johan Rydberg for identifying this bug and Kapil Thangavelu for the patch. Mark as targetting unstable Updated date inchangelog entry --- -- Apache ZooKeeper ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0-12-g5f32792
The following commit has been merged in the master branch: commit be4f7e411ea6590734c28ab5afea83325b726ee5 Author: James Page james.p...@ubuntu.com Date: Mon May 28 09:00:48 2012 +0100 Removed old jlibs files diff --git a/debian/liblucene3-contrib-java.jlibs.in b/debian/liblucene3-contrib-java.jlibs.in deleted file mode 100644 index 2ce55c5..000 --- a/debian/liblucene3-contrib-java.jlibs.in +++ /dev/null @@ -1,22 +0,0 @@ -lucene/build/contrib/analyzers/smartcn/lucene-smartcn-__VERSION__.jar -lucene/build/contrib/analyzers/kuromoji/lucene-kuromoji-__VERSION__.jar -lucene/build/contrib/analyzers/stempel/lucene-stempel-__VERSION__.jar -lucene/build/contrib/analyzers/common/lucene-analyzers-__VERSION__.jar -lucene/build/contrib/analyzers/phonetic/lucene-phonetic-__VERSION__.jar -lucene/build/contrib/instantiated/lucene-instantiated-__VERSION__.jar -lucene/build/contrib/benchmark/lucene-benchmark-__VERSION__.jar -lucene/build/contrib/pruning/lucene-pruning-__VERSION__.jar -lucene/build/contrib/demo/lucene-demo-__VERSION__.jar -lucene/build/contrib/spellchecker/lucene-spellchecker-__VERSION__.jar -lucene/build/contrib/grouping/lucene-grouping-__VERSION__.jar -lucene/build/contrib/memory/lucene-memory-__VERSION__.jar -lucene/build/contrib/icu/lucene-icu-__VERSION__.jar -lucene/build/contrib/queries/lucene-queries-__VERSION__.jar -lucene/build/contrib/misc/lucene-misc-__VERSION__.jar -lucene/build/contrib/join/lucene-join-__VERSION__.jar -lucene/build/contrib/facet/lucene-facet-__VERSION__.jar -lucene/build/contrib/spatial/lucene-spatial-__VERSION__.jar -lucene/build/contrib/highlighter/lucene-highlighter-__VERSION__.jar -lucene/build/contrib/xml-query-parser/lucene-xml-query-parser-__VERSION__.jar -lucene/build/contrib/queryparser/lucene-queryparser-__VERSION__.jar -lucene/build/contrib/remote/lucene-remote-__VERSION__.jar diff --git a/debian/liblucene3-java.jlibs.in b/debian/liblucene3-java.jlibs.in deleted file mode 100644 index 8c12041..000 --- a/debian/liblucene3-java.jlibs.in +++ /dev/null @@ -1 +0,0 @@ -lucene/build/core/lucene-core-__VERSION__.jar diff --git a/debian/libsolr-java.jlibs.in b/debian/libsolr-java.jlibs.in deleted file mode 100644 index f7bf695..000 --- a/debian/libsolr-java.jlibs.in +++ /dev/null @@ -1,2 +0,0 @@ -solr/dist/apache-solr-core-__VERSION__.jar -solr/dist/apache-solr-solrj-__VERSION__.jar -- lucene-solr packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0-12-g5f32792
The following commit has been merged in the master branch:
commit 2080542d3dd6ce062edb382b15576abc74b8d8ad
Author: James Page james.p...@ubuntu.com
Date: Mon May 28 09:34:56 2012 +0100
General tidy of debian/* to remove cruft and minimize files
diff --git a/debian/liblucene3-java.docs b/debian/liblucene3-java.docs
index 31890ce..f4f097a 100644
--- a/debian/liblucene3-java.docs
+++ b/debian/liblucene3-java.docs
@@ -1,3 +1,2 @@
-lucene/BUILD.txt
lucene/NOTICE.txt
lucene/README.txt
diff --git a/debian/solr-common.docs b/debian/libsolr-java.docs
similarity index 100%
copy from debian/solr-common.docs
copy to debian/libsolr-java.docs
diff --git a/debian/rules b/debian/rules
index b35bcc2..076738b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ override_dh_auto_build:
ant -buildfile lucene/build.xml -propertyfile debian/ant.properties \
-Dversion=$(DEB_UPSTREAM_VERSION) jar-core docs javadocs
build-contrib
ant -buildfile solr/build.xml -propertyfile debian/ant.properties \
- -Dversion=$(DEB_UPSTREAM_VERSION) dist-war
+ -Dversion=$(DEB_UPSTREAM_VERSION) dist-war javadocs
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
override_dh_auto_test:
diff --git a/debian/solr-common.dirs b/debian/solr-common.dirs
index 98f30a3..db577bd 100644
--- a/debian/solr-common.dirs
+++ b/debian/solr-common.dirs
@@ -1,4 +1,2 @@
-/etc/solr
-/usr/share/solr/WEB-INF/lib/
/var/lib/solr/data
/var/log/solr
diff --git a/debian/solr-common.install b/debian/solr-common.install
index 6b59360..ffc005d 100644
--- a/debian/solr-common.install
+++ b/debian/solr-common.install
@@ -1,5 +1,3 @@
-# This needs to be in libsolr-java
-#solr/dist/*.jar /usr/share/solr/WEB-INF/lib/
solr/build/web/* /usr/share/solr/
solr/example/solr/conf /etc/solr
solr/scripts/* /usr/share/solr/bin
diff --git a/debian/solr-jetty.dirs b/debian/solr-jetty.dirs
deleted file mode 100644
index 58d8c8a..000
--- a/debian/solr-jetty.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/share/jetty/webapps
-/usr/share/solr/WEB-INF
-
diff --git a/debian/solr-jetty.postinst b/debian/solr-jetty.postinst
index bdc8894..fd0c895 100644
--- a/debian/solr-jetty.postinst
+++ b/debian/solr-jetty.postinst
@@ -1,16 +1,13 @@
#!/bin/sh
set -e
-# Not needed
-# . /usr/share/debconf/confmodule
# If proper permissions for the stuff under /var/lib/solr haven't
# been set, set them now
-
case $1 in
configure)
-if ! dpkg-statoverride --quiet --list /var/lib/solri3 /dev/null; then
+if ! dpkg-statoverride --quiet --list /var/lib/solr /dev/null; then
dpkg-statoverride --quiet --update --add jetty root 0750
/var/lib/solr
fi
@@ -26,7 +23,7 @@ case $1 in
RESULT=$?
# Ignore if jetty init script does not exist (yet)
if [ $RESULT != 100 ]; then
-exit $RESULT
+exit $RESULT
fi
}
;;
diff --git a/debian/solr-jetty.postrm b/debian/solr-jetty.postrm
index de17d69..3edc322 100644
--- a/debian/solr-jetty.postrm
+++ b/debian/solr-jetty.postrm
@@ -16,7 +16,6 @@ case $1 in
fi
fi
- # Is there a way not to restart Jetty if it is due to be removed, too?
if [ -x /usr/sbin/invoke-rc.d ]; then
invoke-rc.d jetty restart || true
fi
diff --git a/debian/solr-tomcat.dirs b/debian/solr-tomcat.dirs
deleted file mode 100644
index e985a36..000
--- a/debian/solr-tomcat.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-/etc/solr
-/etc/tomcat7/policy.d
-/var/lib/solr
-/var/lib/solr/data
diff --git a/debian/solr-tomcat.postinst b/debian/solr-tomcat.postinst
index 94305fc..f08c7e0 100644
--- a/debian/solr-tomcat.postinst
+++ b/debian/solr-tomcat.postinst
@@ -32,7 +32,7 @@ invoke-rc.d --quiet tomcat7 restart || {
RESULT=$?
# Ignore if tomcat7 init script does not exist (yet)
if [ $RESULT != 100 ]; then
- exit $RESULT
+ exit $RESULT
fi
}
diff --git a/debian/solr-tomcat.postrm b/debian/solr-tomcat.postrm
index 0fcd0a2..cb4fe35 100644
--- a/debian/solr-tomcat.postrm
+++ b/debian/solr-tomcat.postrm
@@ -5,7 +5,6 @@ set -e
case $1 in
remove)
rm -f /etc/tomcat7/policy.d/05solr.policy
- # Is there a way not to restart tomcat if it is due to be removed,
too?
if [ -x /usr/sbin/invoke-rc.d ]; then
invoke-rc.d tomcat7 restart || true
fi
--
lucene-solr packaging
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0-12-g5f32792
The following commit has been merged in the master branch:
commit 7d8736ee4fb822aeb520c6ae18e590a468d53fd4
Author: James Page james.p...@ubuntu.com
Date: Mon May 28 09:40:09 2012 +0100
Tidied patches directory
diff --git a/debian/patches/build-versionless-jars.patch
b/debian/patches/build-versionless-jars.patch
deleted file mode 100644
index 5b8109e..000
--- a/debian/patches/build-versionless-jars.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-Index: lucene-solr/lucene/common-build.xml
-===
lucene-solr.orig/lucene/common-build.xml 2012-05-23 09:57:25.949412711
+0100
-+++ lucene-solr/lucene/common-build.xml2012-05-23 09:59:31.017823100
+0100
-@@ -51,7 +51,7 @@
- property name=version value=${dev.version}/
- property name=spec.version value=${version}/
- property name=year value=2000-${current.year}/
-- property name=final.name value=lucene-${name}-${version}/
-+ property name=final.name value=lucene-${name}/
-
- property name=common.classpath.excludes
value=**/*.txt,**/*.template,**/*.sha1 /
-
-@@ -510,7 +510,7 @@
- /sequential
- /macrodef
-
-- property name=lucene-core.jar
value=${common.dir}/build/core/lucene-core-${version}.jar/
-+ property name=lucene-core.jar
value=${common.dir}/build/core/lucene-core.jar/
- target name=check-lucene-core-uptodate unless=lucene-core.uptodate
- uptodate property=lucene-core.uptodate targetfile=${lucene-core.jar}
- srcfiles dir=${common.dir}/core/src/java includes=**/*.java/
-Index: lucene-solr/lucene/contrib/contrib-build.xml
-===
lucene-solr.orig/lucene/contrib/contrib-build.xml 2012-05-23
09:57:25.969412777 +0100
-+++ lucene-solr/lucene/contrib/contrib-build.xml 2012-05-23
09:58:24.697607362 +0100
-@@ -96,7 +96,7 @@
- /sequential
- /macrodef
-
-- property name=analyzers-common.jar
value=${common.dir}/build/contrib/analyzers/common/lucene-analyzers-${version}.jar/
-+ property name=analyzers-common.jar
value=${common.dir}/build/contrib/analyzers/common/lucene-analyzers.jar/
- target name=check-analyzers-common-uptodate
unless=analyzers-common.uptodate
- contrib-uptodate name=analyzers/common
jarfile=${analyzers-common.jar} property=analyzers-common.uptodate/
- /target
-@@ -118,7 +118,7 @@
- property name=analyzers-phonetic.uptodate value=true/
- /target
-
-- property name=facet.jar
value=${common.dir}/build/contrib/facet/lucene-facet-${version}.jar/
-+ property name=facet.jar
value=${common.dir}/build/contrib/facet/lucene-facet.jar/
- target name=check-facet-uptodate unless=facet.uptodate
- contrib-uptodate name=facet jarfile=${facet.jar}
property=facet.uptodate/
- /target
-@@ -129,7 +129,7 @@
- property name=facet.uptodate value=true/
- /target
-
-- property name=analyzers-smartcn.jar
value=${common.dir}/build/contrib/analyzers/smartcn/lucene-smartcn-${version}.jar/
-+ property name=analyzers-smartcn.jar
value=${common.dir}/build/contrib/analyzers/smartcn/lucene-smartcn.jar/
- target name=check-analyzers-smartcn-uptodate
unless=analyzers-smartcn.uptodate
- contrib-uptodate name=analyzers/smartcn
jarfile=${analyzers-smartcn.jar} property=analyzers-smartcn.uptodate/
- /target
-@@ -140,7 +140,7 @@
- property name=analyzers-smartcn.uptodate value=true/
- /target
-
-- property name=analyzers-stempel.jar
value=${common.dir}/build/contrib/analyzers/stempel/lucene-stempel-${version}.jar/
-+ property name=analyzers-stempel.jar
value=${common.dir}/build/contrib/analyzers/stempel/lucene-stempel.jar/
- target name=check-analyzers-stempel-uptodate
unless=analyzers-stempel.uptodate
- contrib-uptodate name=analyzers/stempel
jarfile=${analyzers-stempel.jar} property=analyzers-stempel.uptodate/
- /target
-@@ -162,7 +162,7 @@
- property name=analyzers-kuromoji.uptodate value=true/
- /target
-
-- property name=grouping.jar
value=${common.dir}/build/contrib/grouping/lucene-grouping-${version}.jar/
-+ property name=grouping.jar
value=${common.dir}/build/contrib/grouping/lucene-grouping.jar/
- target name=check-grouping-uptodate unless=grouping.uptodate
- contrib-uptodate name=grouping jarfile=${grouping.jar}
property=grouping.uptodate/
- /target
-@@ -173,7 +173,7 @@
- property name=grouping.uptodate value=true/
- /target
-
-- property name=highlighter.jar
value=${common.dir}/build/contrib/highlighter/lucene-highlighter-${version}.jar/
-+ property name=highlighter.jar
value=${common.dir}/build/contrib/highlighter/lucene-highlighter.jar/
- target name=check-highlighter-uptodate unless=highlighter.uptodate
- contrib-uptodate name=highlighter jarfile=${highlighter.jar}
property=highlighter.uptodate/
- /target
-@@ -184,7 +184,7 @@
- property name=highlighter.uptodate value=true/
- /target
-
-- property name=icu.jar
value=${common.dir}/build/contrib/icu/lucene-icu
[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0-12-g5f32792
The following commit has been merged in the master branch:
commit a3f6c046e5613637b29786dc55b5e0eb8d5f8faa
Author: James Page james.p...@ubuntu.com
Date: Mon May 28 10:05:52 2012 +0100
Annotated patches and fixed icu4.4 test failure
diff --git a/debian/patches/disable-ivy.patch b/debian/patches/disable-ivy.patch
index 9ed29f1..0339e34 100644
--- a/debian/patches/disable-ivy.patch
+++ b/debian/patches/disable-ivy.patch
@@ -1,3 +1,7 @@
+Description: Disable ivy resolution for offline builds.
+Author: James Page james.p...@ubuntu.com
+Forwarded: not-needed
+
Index: lucene-solr/lucene/common-build.xml
===
--- lucene-solr.orig/lucene/common-build.xml 2012-05-23 10:50:17.331614071
+0100
diff --git a/debian/patches/fix-jar-matches.patch
b/debian/patches/fix-jar-matches.patch
index 1d4a555..69c305a 100644
--- a/debian/patches/fix-jar-matches.patch
+++ b/debian/patches/fix-jar-matches.patch
@@ -1,3 +1,8 @@
+Description: Misc patches to build process to pickup
+ unversioned jar files to support use of system libraries
+Author: James Page james.p...@ubuntu.com
+Forwarded: not-needed
+
Index: lucene-solr/lucene/contrib/benchmark/build.xml
===
--- lucene-solr.orig/lucene/contrib/benchmark/build.xml2012-05-23
11:15:26.156364644 +0100
diff --git a/debian/patches/icu4.4-compat.patch
b/debian/patches/icu4.4-compat.patch
new file mode 100644
index 000..d60a46f
--- /dev/null
+++ b/debian/patches/icu4.4-compat.patch
@@ -0,0 +1,19 @@
+Description: Update ICU test as Debian/Ubuntu ship ICU
+ 4.4 not 4.6/4.8 as used by upstream - this alters the
+ collation key order slightly
+Origin:
https://github.com/apache/lucene-solr/commit/694ec2f6589ddefa1828437621f4dda7e827ae47#diff-18
+Author: James Page james.p...@ubuntu.com
+Forwarded: not-needed
+
+Index:
lucene-solr/lucene/contrib/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
+===
+---
lucene-solr.orig/lucene/contrib/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
2012-05-28 10:02:19.878070608 +0100
lucene-solr/lucene/contrib/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
2012-05-28 10:03:17.442563034 +0100
+@@ -94,6 +94,6 @@
+ // orderings - BFJHD is the ordering for the ICU Collator for Locale.US.
+ testCollationKeySort
+ (usAnalyzer, franceAnalyzer, swedenAnalyzer, denmarkAnalyzer,
+- BFJHD, ECAGI, BJDFH, BJDHF);
++ BFJHD, EACGI, BJDFH, BJDHF);
+ }
+ }
diff --git a/debian/patches/ignore-failing-tests.patch
b/debian/patches/ignore-failing-tests.patch
deleted file mode 100644
index 339aab5..000
--- a/debian/patches/ignore-failing-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index:
lucene-solr/lucene/contrib/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
-===
lucene-solr.orig/lucene/contrib/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
2012-05-23 09:39:25.597827260 +0100
-+++
lucene-solr/lucene/contrib/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
2012-05-25 11:18:53.803044361 +0100
-@@ -27,6 +27,7 @@
-
- import java.io.Reader;
- import java.util.Locale;
-+import org.junit.Ignore;
-
-
- public class TestICUCollationKeyFilter extends CollationTestBase {
-@@ -80,7 +81,8 @@
- //
- // Copied (and slightly modified) from
- // org.apache.lucene.search.TestSort.testInternationalSort()
-- //
-+ //
-+ @Ignore
- public void testCollationKeySort() throws Exception {
- Analyzer usAnalyzer = new TestAnalyzer(Collator.getInstance(Locale.US));
- Analyzer franceAnalyzer
diff --git a/debian/patches/javacc-system.patch
b/debian/patches/javacc-system.patch
index 5da55bd..bcbba08 100644
--- a/debian/patches/javacc-system.patch
+++ b/debian/patches/javacc-system.patch
@@ -1,3 +1,8 @@
+Description: Point javacc configuration at the jar files
+ provided as part of the distribution.
+Author: James Page james.p...@ubuntu.com
+Forwarded: not-needed
+
Index: lucene-solr/lucene/common-build.xml
===
--- lucene-solr.orig/lucene/common-build.xml 2012-05-23 10:00:18.885978436
+0100
diff --git a/debian/patches/series b/debian/patches/series
index af018f6..48bba52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@
javacc-system.patch
fix-jar-matches.patch
disable-ivy.patch
-ignore-failing-tests.patch
+icu4.4-compat.patch
--
lucene-solr packaging
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0-12-g5f32792
The following commit has been merged in the master branch: commit 267da07645fdcb48f28751173af86e3ce20c9fe4 Author: James Page james.p...@ubuntu.com Date: Mon May 28 10:12:21 2012 +0100 Temp disable javadoc for solr diff --git a/debian/rules b/debian/rules index 076738b..b35bcc2 100755 --- a/debian/rules +++ b/debian/rules @@ -44,7 +44,7 @@ override_dh_auto_build: ant -buildfile lucene/build.xml -propertyfile debian/ant.properties \ -Dversion=$(DEB_UPSTREAM_VERSION) jar-core docs javadocs build-contrib ant -buildfile solr/build.xml -propertyfile debian/ant.properties \ - -Dversion=$(DEB_UPSTREAM_VERSION) dist-war javadocs + -Dversion=$(DEB_UPSTREAM_VERSION) dist-war ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) override_dh_auto_test: -- lucene-solr packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0-12-g5f32792
The following commit has been merged in the master branch:
commit a835e4deba86433796312d981b4457fd97e49fb3
Author: James Page james.p...@ubuntu.com
Date: Mon May 28 11:50:18 2012 +0100
Fixup contrib test failures
diff --git a/debian/control b/debian/control
index 50dd100..2c6a2e8 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-java/lucene-solr.git
Package: liblucene3-java
Architecture: all
Depends: ${misc:Depends}
-Suggests: liblucene3-java-doc
+Suggests: ant, ant-optional, junit4
Recommends: liblucene3-contrib-java
Description: Full-text search engine library for Java(TM)
Lucene is a full-text search engine for the Java(TM) programming language.
@@ -117,7 +117,12 @@ Depends:
${misc:Depends}
Breaks: solr-common ( 3.6.0-1)
Replaces: solr-common ( 3.6.0-1)
-Suggests: libsolr-java-doc
+Suggests:
+ junit4,
+ libeasymock-java,
+ libjetty-extras-java,
+ libjetty-java,
+ libsolr-java-doc
Description: Enterprise search server based on Lucene - Java libraries
Solr is an open source enterprise search server based on the Lucene
Java search library, with XML/HTTP and JSON APIs, hit highlighting,
@@ -134,8 +139,7 @@ Depends:
default-jre-headless | java5-runtime-headless | java6-runtime-headless,
libsolr-java (= ${binary:Version}),
${misc:Depends}
-Recommends:
- solr-tomcat (= ${binary:Version}) | solr-jetty (= ${binary:Version})
+Recommends: solr-tomcat (= ${binary:Version}) | solr-jetty (=
${binary:Version})
Description: Enterprise search server based on Lucene3 - common files
Solr is an open source enterprise search server based on the Lucene
Java search library, with XML/HTTP and JSON APIs, hit highlighting,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 000..43cf469
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,25 @@
+# Maven ignore rules - ignore some Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# 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/
+
+com.ibm.icu icu4j * * * *
+javax.mail mail * * * *
+jline jline * * * *
+net.arnxjsonic * * * *
+com.cybozu.labs langdetect * * * *
+org.apache.tika * * * * *
+org.apache.uima * * * * *
+org.apache.velocity * * * * *
+org.carrot2 * * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 000..224a773
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,25 @@
+# Maven rules - transform Maven dependencies and plugins
+# Forma of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# 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/
+
+commons-httpclient commons-httpclient
* s/3\..*/3.x/ * *
+javax.activation s/activation/gnujaf/
* s/.*/debian/ * *
+org.apache.geronimo.specs
s/geronimo-stax-api_1.0_spec/geronimo-activation_1.1_spec/ * s/.*/debian/ * *
+org.codehaus.woodstox s/wstx-asl/woodstox-core-lgpl/
* s/.*/debian/ * *
+javax.servlet servlet-api
* s/2\..*/2.5/ * *
+junit junit
* s/4\..*/4.x/ * *
+org.mortbay.jetty *
* s/6\..*/6.x/ * *
diff --git a/debian/patches/icu4.4-compat.patch
b/debian/patches/icu4.4-compat.patch
index d60a46f..f082e2f 100644
--- a/debian/patches/icu4.4-compat.patch
+++ b/debian/patches/icu4.4
[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0-12-g5f32792
The following commit has been merged in the master branch: commit 5f32792589f8c874b254893c098d8086b47c3d0f Author: James Page james.p...@ubuntu.com Date: Mon May 28 12:18:58 2012 +0100 Tidy up permissions in binary package solr-common diff --git a/debian/rules b/debian/rules index b35bcc2..e48c338 100755 --- a/debian/rules +++ b/debian/rules @@ -61,13 +61,22 @@ override_dh_auto_clean: rm -f debian/liblucene3-java.poms dh_auto_clean +override_dh_fixperms: + chmod 644 debian/solr-common/usr/share/solr/WEB-INF/weblogic.xml \ + debian/solr-common/etc/solr/conf/schema.xml \ + debian/solr-common/etc/solr/conf/solrconfig.xml \ + debian/solr-common/usr/share/solr/favicon.ico \ + debian/solr-common/usr/share/solr/admin/favicon.ico + dh_fixperms + override_dh_auto_install: sed -e s|__VERSION__|$(DEB_UPSTREAM_VERSION)|g \ debian/liblucene3-java.poms.in debian/liblucene3-java.poms dh_auto_install override_dh_installchangelogs: - dh_installchangelogs lucene/CHANGES.txt solr/CHANGES.txt + dh_installchangelogs -pliblucene3-java lucene/CHANGES.txt + dh_installchangelogs -plibsolr-java solr/CHANGES.txt get-orig-source: uscan --force-download --rename -- lucene-solr packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0-16-ge08b4b5
The following commit has been merged in the master branch: commit 2176487e85be3a02b792c68e318a649b0acf359a Author: James Page james.p...@ubuntu.com Date: Mon May 28 14:34:09 2012 +0100 Tidied copyright diff --git a/debian/copyright b/debian/copyright index 16c586e..5522dd9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 Upstream-Name: Apache Lucene and Solr -Source: http://lucene.apache.org/java/docs/releases.html +Source: http://lucene.apache.org/ Files: * Copyright: 2007-2011 The Apache Software Foundation -- lucene-solr packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0-16-ge08b4b5
The following commit has been merged in the master branch: commit 264d1b3c1e70cd09c8eedbee9137e7a5fd3a609c Author: James Page james.p...@ubuntu.com Date: Mon May 28 15:02:42 2012 +0100 Enabled dataimporthandler contrib for solr diff --git a/debian/TODO.Debian b/debian/TODO.Debian index 4f29c52..e36d7dc 100644 --- a/debian/TODO.Debian +++ b/debian/TODO.Debian @@ -6,3 +6,4 @@ TODO * Use JavaCC to regenerating Java files included in upstream tarball * Use JFlex to generate Java files included in upstream tarball (needs 1.5 - not yet released) +* Javadoc package for solr. diff --git a/debian/control b/debian/control index 7664a9d..69bfd88 100644 --- a/debian/control +++ b/debian/control @@ -122,7 +122,8 @@ Suggests: libeasymock-java, libjetty-extras-java, libjetty-java, - libsolr-java-doc + libsolr-java-doc, + libmysql-java Description: Enterprise search server based on Lucene - Java libraries Solr is an open source enterprise search server based on the Lucene Java search library, with XML/HTTP and JSON APIs, hit highlighting, diff --git a/debian/liblucene3-java.poms.in b/debian/liblucene3-java.poms.in index 1caf051..8bee2d7 100644 --- a/debian/liblucene3-java.poms.in +++ b/debian/liblucene3-java.poms.in @@ -28,7 +28,7 @@ solr/contrib/pom.xml --ignore solr/contrib/clustering/pom.xml --ignore solr/contrib/analysis-extras/pom.xml --ignore solr/contrib/langid/pom.xml --ignore -solr/contrib/dataimporthandler/pom.xml --ignore +solr/contrib/dataimporthandler/pom.xml --artifact=solr/build/contrib/solr-dataimporthandler/apache-solr-dataimporthandler-__VERSION__.jar --package=libsolr-java --java-lib --usj-name=solr-dataimporthandler solr/contrib/extraction/pom.xml --ignore solr/contrib/dataimporthandler-extras/pom.xml --ignore solr/contrib/velocity/pom.xml --ignore diff --git a/debian/rules b/debian/rules index bf491ff..d364166 100755 --- a/debian/rules +++ b/debian/rules @@ -43,6 +43,8 @@ override_dh_auto_build: ant -buildfile build.xml -Dversion=$(DEB_UPSTREAM_VERSION) get-maven-poms ant -buildfile lucene/build.xml -propertyfile debian/ant.properties \ -Dversion=$(DEB_UPSTREAM_VERSION) jar-core docs javadocs build-contrib + ant -buildfile solr/contrib/dataimporthandler/build.xml \ + -propertyfile debian/ant.properties -Dversion=$(DEB_UPSTREAM_VERSION) dist ant -buildfile solr/build.xml -propertyfile debian/ant.properties \ -Dversion=$(DEB_UPSTREAM_VERSION) dist-war diff --git a/debian/solr-common.links b/debian/solr-common.links index 4277271..b1a733c 100644 --- a/debian/solr-common.links +++ b/debian/solr-common.links @@ -4,6 +4,7 @@ /var/log/solr /usr/share/solr/logs /usr/share/java/solr-core.jar /usr/share/solr/WEB-INF/lib/solr-core.jar /usr/share/java/solr-solrj.jar /usr/share/solr/WEB-INF/lib/solr-solrj.jar +/usr/share/java/solr-dataimporthandler.jar /usr/share/solr/WEB-INF/lib/solr-dataimporthandler.jar /usr/share/java/commons-codec.jar /usr/share/solr/WEB-INF/lib/commons-codec.jar /usr/share/java/commons-fileupload.jar /usr/share/solr/WEB-INF/lib/commons-fileupload.jar /usr/share/java/commons-httpclient.jar /usr/share/solr/WEB-INF/lib/commons-httpclient.jar -- lucene-solr packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0-16-ge08b4b5
The following commit has been merged in the master branch:
commit 468534362efa4dee0cc853f832fb147adb342cc2
Author: James Page james.p...@ubuntu.com
Date: Mon May 28 14:21:58 2012 +0100
Fixed up broken jar links and embedded javascript
diff --git a/debian/changelog b/debian/changelog
index ef2520e..f979104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,10 @@ lucene-solr (3.6.0-1) unstable; urgency=low
* New upstream release.
* Renamed source package to support a single source package for
solr and lucene (upstream release in sync).
+ * Merged debian/* from solr source package.
* Enabled test suites.
- -- James Page james.p...@ubuntu.com Fri, 25 May 2012 10:13:07 +0100
+ -- James Page james.p...@ubuntu.com Mon, 28 May 2012 14:08:52 +0100
lucene3 (3.5.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2c6a2e8..7664a9d 100644
--- a/debian/control
+++ b/debian/control
@@ -88,7 +88,7 @@ Package: liblucene3-java-doc
Architecture: all
Section: doc
Suggests: liblucene3-java
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-prototype
Description: Documentation for Lucene
Lucene is a full-text search engine for the Java(TM) programming language.
Lucene is not a complete application, but rather a code library and API
@@ -138,6 +138,7 @@ Depends:
debconf (= 1.5),
default-jre-headless | java5-runtime-headless | java6-runtime-headless,
libsolr-java (= ${binary:Version}),
+ procps,
${misc:Depends}
Recommends: solr-tomcat (= ${binary:Version}) | solr-jetty (=
${binary:Version})
Description: Enterprise search server based on Lucene3 - common files
diff --git a/debian/liblucene3-java-doc.links b/debian/liblucene3-java-doc.links
new file mode 100644
index 000..2fb5980
--- /dev/null
+++ b/debian/liblucene3-java-doc.links
@@ -0,0 +1 @@
+/usr/share/javascript/prototype/prototype.js
/usr/share/doc/liblucene3-java-doc/docs/skin/prototype.js
diff --git a/debian/rules b/debian/rules
index e48c338..bf491ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,8 +75,9 @@ override_dh_auto_install:
dh_auto_install
override_dh_installchangelogs:
- dh_installchangelogs -pliblucene3-java lucene/CHANGES.txt
+ dh_installchangelogs -pliblucene3-java lucene/CHANGES.txt
dh_installchangelogs -plibsolr-java solr/CHANGES.txt
+ dh_installchangelogs
get-orig-source:
uscan --force-download --rename
diff --git a/debian/solr-common.links b/debian/solr-common.links
index 2a8dd8c..4277271 100644
--- a/debian/solr-common.links
+++ b/debian/solr-common.links
@@ -1,9 +1,9 @@
-/etc/solr/web.xml /usr/share/solr/WEB-INF/web.xml
-/etc/solr/conf /usr/share/solr/conf
-/var/lib/solr/data /usr/share/solr/data
-/var/log/solr /usr/share/solr/logs
-/usr/share/java/apache-solr-core.jar
/usr/share/solr/WEB-INF/lib/apache-solr-core.jar
-/usr/share/java/apache-solr-solrj.jar
/usr/share/solr/WEB-INF/lib/apache-solr-solrj.jar
+/etc/solr/web.xml /usr/share/solr/WEB-INF/web.xml
+/etc/solr/conf /usr/share/solr/conf
+/var/lib/solr/data /usr/share/solr/data
+/var/log/solr /usr/share/solr/logs
+/usr/share/java/solr-core.jar
/usr/share/solr/WEB-INF/lib/solr-core.jar
+/usr/share/java/solr-solrj.jar
/usr/share/solr/WEB-INF/lib/solr-solrj.jar
/usr/share/java/commons-codec.jar
/usr/share/solr/WEB-INF/lib/commons-codec.jar
/usr/share/java/commons-fileupload.jar
/usr/share/solr/WEB-INF/lib/commons-fileupload.jar
/usr/share/java/commons-httpclient.jar
/usr/share/solr/WEB-INF/lib/commons-httpclient.jar
@@ -17,17 +17,17 @@
/usr/share/java/httpmime.jar
/usr/share/solr/WEB-INF/lib/httpmime.jar
/usr/share/java/jcl-over-slf4j.jar
/usr/share/solr/WEB-INF/lib/jcl-over-slf4j.jar
/usr/share/java/log4j-over-slf4j.jar
/usr/share/solr/WEB-INF/lib/log4j-over-slf4j.jar
-/usr/share/java/lucene-analyzers.jar
/usr/share/solr/WEB-INF/lib/lucene-analyzers.jar
-/usr/share/java/lucene-core.jar
/usr/share/solr/WEB-INF/lib/lucene-core.jar
-/usr/share/java/lucene-grouping.jar
/usr/share/solr/WEB-INF/lib/lucene-grouping.jar
-/usr/share/java/lucene-highlighter.jar
/usr/share/solr/WEB-INF/lib/lucene-highlighter.jar
-/usr/share/java/lucene-kuromoji.jar
/usr/share/solr/WEB-INF/lib/lucene-kuromoji.jar
-/usr/share/java/lucene-memory.jar
/usr/share/solr/WEB-INF/lib/lucene-memory.jar
-/usr/share/java/lucene-misc.jar
/usr/share/solr/WEB-INF/lib/lucene-misc.jar
-/usr/share/java/lucene-phonetic.jar
/usr/share/solr/WEB-INF/lib/lucene-phonetic.jar
-/usr/share/java/lucene-queries.jar
/usr/share/solr/WEB-INF/lib/lucene-queries.jar
-/usr/share/java/lucene-spatial.jar
[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0-16-ge08b4b5
The following commit has been merged in the master branch:
commit e08b4b5ff8c065bb423bf6c4a975edcd2d99f2cb
Author: James Page james.p...@ubuntu.com
Date: Mon May 28 15:13:35 2012 +0100
Tweaks to dataimporthandler configuration
diff --git a/debian/control b/debian/control
index 69bfd88..05a6157 100644
--- a/debian/control
+++ b/debian/control
@@ -122,8 +122,7 @@ Suggests:
libeasymock-java,
libjetty-extras-java,
libjetty-java,
- libsolr-java-doc,
- libmysql-java
+ libsolr-java-doc
Description: Enterprise search server based on Lucene - Java libraries
Solr is an open source enterprise search server based on the Lucene
Java search library, with XML/HTTP and JSON APIs, hit highlighting,
@@ -142,6 +141,7 @@ Depends:
procps,
${misc:Depends}
Recommends: solr-tomcat (= ${binary:Version}) | solr-jetty (=
${binary:Version})
+Suggests: libmysql-java
Description: Enterprise search server based on Lucene3 - common files
Solr is an open source enterprise search server based on the Lucene
Java search library, with XML/HTTP and JSON APIs, hit highlighting,
@@ -150,6 +150,12 @@ Description: Enterprise search server based on Lucene3 -
common files
.
This package provides the common files for Solr. Install
solr-tomcat or solr-jetty to use Solr under Tomcat or Jetty.
+ .
+ This package also contains the dataimporthandler contrib while omiting
+ dataimporthandler-extras, clustering, extraction and velocity due to missing
+ dependencies.
+ .
+ libmysql-java is necessary to connect the dataimporthandler to MySQL.
Package: solr-tomcat
Architecture: all
diff --git a/debian/patches/series b/debian/patches/series
index b7da83c..2df28c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ fix-jar-matches.patch
disable-ivy.patch
icu4.4-compat.patch
regex-test-failure.patch
+set-data-dir.patch
diff --git a/debian/patches/set-data-dir.patch
b/debian/patches/set-data-dir.patch
new file mode 100644
index 000..db4ac11
--- /dev/null
+++ b/debian/patches/set-data-dir.patch
@@ -0,0 +1,18 @@
+Description: In the example configuration that is distributed
+ as part of this package fix the data.dir to /var/lib/solr/data
+Author: James Page james.p...@ubuntu.com
+Forwarded: not-needed
+
+Index: lucene-solr/solr/example/solr/conf/solrconfig.xml
+===
+--- lucene-solr.orig/solr/example/solr/conf/solrconfig.xml 2012-05-23
09:39:26.201829183 +0100
lucene-solr/solr/example/solr/conf/solrconfig.xml 2012-05-28
15:11:10.884645851 +0100
+@@ -111,7 +111,7 @@
+replication is in use, this should match the replication
+configuration.
+ --
+- dataDir${solr.data.dir:}/dataDir
++ dataDir/var/lib/solr/data/dataDir
+
+
+ !-- The DirectoryFactory to use for indexes.
diff --git a/debian/solr-common.links b/debian/solr-common.links
index b1a733c..f3e665c 100644
--- a/debian/solr-common.links
+++ b/debian/solr-common.links
@@ -33,3 +33,4 @@
/usr/share/java/slf4j-jdk14.jar
/usr/share/solr/WEB-INF/lib/slf4j-jdk14.jar
/usr/share/java/wstx-lgpl.jar
/usr/share/solr/WEB-INF/lib/wstx-lgpl.jar
/usr/share/java/stax2-api.jar
/usr/share/solr/WEB-INF/lib/stax2-api.jar
+/usr/share/java/mysql.jar
/usr/share/solr/WEB-INF/lib/mysql.jar
--
lucene-solr packaging
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] Solr - web service for full-text indexing and searching - Debian packaging annotated tag, debian/1.4.1+dfsg1-3, created. debian/1.4.1+dfsg1-3
The annotated tag, debian/1.4.1+dfsg1-3 has been created at 0d4b123f847006935cf129eda013f18cf9439dd6 (tag) tagging 2b974b3a39d204ee1b898bbf73a770d20d56b759 (commit) replaces debian/1.4.0+ds1-2 tagged by tony mancill on Mon May 28 16:14:51 2012 -0700 - Shortlog Debian release 1.4.1+dfsg1-3 James Page (7): Added myself to uploaders. Added patches and drop use of topgit for this package Pickup maintenance of this package until solr3/lucene3 supercedes it. (Closes: #652729). Re-instate stuff for dataimporthandler - it is built Use default-jre-headless as primary runtime dependency for solr-common. Removed links for jar files which are not required for solr1.4 (Closes: #652729, #674511). Jan-Pascal van Best (2): Added danish translation Removed myself from uploaders Thomas Koch (10): Imported Upstream version 1.4.1 Imported Upstream version 1.4.1+dfsg1 imported debian/ dir from old_master branch added signature file for 1.4.1 release new release WIP: migrate from cdbs to debhelper remove patches from master branch update debian/[cr]* files removed unnecessary(?) xml-apis.jar from WEB-INF/lib fix jars in WEB-INF/lib --- -- Solr - web service for full-text indexing and searching - Debian packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
Bug#673765: dom4j: Revised patch using Double.compare
= createRule(/);
+Document document = factory.createDocument();
+document.addElement(foo);
+
+assertTrue(/ matches document, rule.matches(document));
+assertTrue(/ does not match root element, !rule.matches(document
+.getRootElement()));
+}
+
+public void testTextMatchesCDATA() {
+CDATA cdata = factory.createCDATA();
+Rule rule = createRule(text());
+
+assertTrue(text() matches CDATA, rule.matches(cdata));
+}
+
+protected Rule createRule(String expr) {
+Pattern pattern = factory.createPattern(expr);
+
+return new Rule(pattern);
+}
+}
+
+/*
+ * Redistribution and use of this software and associated documentation
+ * (Software), with or without modification, are permitted provided that the
+ * following conditions are met:
+ *
+ * 1. Redistributions of source code must retain copyright statements and
+ * notices. Redistributions must also contain a copy of this document.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. The name DOM4J must not be used to endorse or promote products derived
+ * from this Software without prior written permission of MetaStuff, Ltd. For
+ * written permission, please contact dom4j-i...@metastuff.com.
+ *
+ * 4. Products derived from this Software may not be called DOM4J nor may
+ * DOM4J appear in their names without prior written permission of MetaStuff,
+ * Ltd. DOM4J is a registered trademark of MetaStuff, Ltd.
+ *
+ * 5. Due credit should be given to the DOM4J Project - http://www.dom4j.org
+ *
+ * THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL METASTUFF, LTD. OR ITS CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+ */
=== modified file 'debian/changelog'
=== modified file 'debian/control'
--- debian/control 2011-08-17 18:43:40 +
+++ debian/control 2012-05-21 09:39:38 +
@@ -1,7 +1,8 @@
Source: dom4j
Section: java
Priority: optional
-Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org
Uploaders: Marcus Better mar...@better.se, Michael Koch konque...@gmx.de
Build-Depends: debhelper (= 7), ant-optional, default-jdk, maven-repo-helper, cdbs
Build-Depends-Indep: antlr, libjaxen-java, libjaxme-java, libxpp2-java, libxpp3-java, libxerces2-java, libxalan2-java (= 2.7.0), libbackport-util-concurrent-java, junit, libjunitperf-java
=== added file 'debian/patches/java7-compat.patch'
--- debian/patches/java7-compat.patch 1970-01-01 00:00:00 +
+++ debian/patches/java7-compat.patch 2012-05-25 08:34:12 +
@@ -0,0 +1,63 @@
+Description: Fixup compareTo function in Rule class to be compliant
+ with the Java 7 (and Java 6) API. Comparisons where not symmetric
+ with the upstream handling in this function:
+ .
+r1 r2 but ! r2 r1
+ .
+ Also added extra tests to ensure that comparison works both ways.
+Author: James Page james.p...@ubuntu.com
+Forwarded: no
+
+Index: dom4j/src/java/org/dom4j/rule/Rule.java
+===
+--- dom4j.orig/src/java/org/dom4j/rule/Rule.java 2012-05-21 10:29:53.305207061 +0100
dom4j/src/java/org/dom4j/rule/Rule.java 2012-05-25 09:34:09.523260744 +0100
+@@ -99,16 +99,16 @@
+ * @return DOCUMENT ME!
+ */
+ public int compareTo(Rule that) {
+-int answer = this.importPrecedence - that.importPrecedence;
+-
+-if (answer == 0) {
+-answer = (int) Math.round(this.priority - that.priority);
+-
+-if (answer == 0) {
+-answer = this.appearenceCount - that.appearenceCount;
+-}
++int answer = 0;
++if (this.importPrecedence != that.importPrecedence) {
++answer = this.importPrecedence that.importPrecedence ? -1 : 1;
++}
++else if (Double.compare(this.priority, that.priority) != 0) {
++answer = Double.compare(this.priority, that.priority
[SCM] Solr - web service for full-text indexing and searching - Debian packaging branch, master, updated. debian/1.4.0+ds1-2-19-g2b974b3
The following commit has been merged in the master branch: commit 2b974b3a39d204ee1b898bbf73a770d20d56b759 Author: James Page james.p...@ubuntu.com Date: Fri May 25 09:23:12 2012 +0100 (Closes: #652729, #674511). * Removed Thomas Koch from uploaders, thanks for your work! diff --git a/debian/changelog b/debian/changelog index b78535d..e54e336 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -solr (1.4.1+dfsg1-3) UNRELEASED; urgency=low +solr (1.4.1+dfsg1-3) unstable; urgency=low [ Jan-Pascal van Best ] * Removed Jan-Pascal from uploaders. @@ -17,10 +17,11 @@ solr (1.4.1+dfsg1-3) UNRELEASED; urgency=low (Closes: #593027). * Drop dependency on glassfish-mail, no longer required (Closes: #575208). * Pickup maintenance of this package until solr3/lucene3 supercedes it. -(Closes: #652729). +(Closes: #652729, #674511). * Use default-jre-headless as primary runtime dependency for solr-common. + * Removed Thomas Koch from uploaders, thanks for your work! - -- James Page james.p...@ubuntu.com Thu, 24 May 2012 12:24:08 +0100 + -- James Page james.p...@ubuntu.com Fri, 25 May 2012 09:22:40 +0100 solr (1.4.1+dfsg1-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 110b892..20d9c49 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: solr Section: java Priority: optional Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org -Uploaders: Thomas Koch tho...@koch.ro, James Page james.p...@ubuntu.com +Uploaders: James Page james.p...@ubuntu.com DM-Upload-Allowed: yes Homepage: http://lucene.apache.org/solr/ Vcs-Browser: http://git.debian.org/?p=pkg-java/solr.git -- Solr - web service for full-text indexing and searching - Debian packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] lucene-solr packaging branch, master, created. 81cc855504d0fba1e6c74995228a5fbe0ea2a004
The branch, master has been created at 81cc855504d0fba1e6c74995228a5fbe0ea2a004 (commit) - Shortlog commit 81cc855504d0fba1e6c74995228a5fbe0ea2a004 Author: James Page james.p...@ubuntu.com Date: Fri May 25 11:44:05 2012 +0100 Enabled test suites. commit b95b7100f1dfd16b6f62ffa68ddb9e4650c1e411 Author: James Page james.p...@ubuntu.com Date: Wed May 23 15:29:38 2012 +0100 Added solr3 packaging commit 1026866b86af3eafa473777f7edb26e88ecf639a Author: James Page james.p...@ubuntu.com Date: Wed May 23 12:24:07 2012 +0100 Updated jlibs handling to deal with versioned jar files commit fedf855f8495596b3ea066dcc03b0e6278c9280f Author: James Page james.p...@ubuntu.com Date: Wed May 23 11:01:49 2012 +0100 More tweaks to new combined package commit 95d3ddcf89f4f45d42cc9aa410c6756d3dcea5f6 Author: James Page james.p...@ubuntu.com Date: Wed May 23 10:35:12 2012 +0100 Initial version of packaging --- -- lucene-solr packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] lucene-solr packaging branch, pristine-tar, created. a145bfea124e08895327600f1e8215c586918c45
The branch, pristine-tar has been created at a145bfea124e08895327600f1e8215c586918c45 (commit) - Shortlog commit a145bfea124e08895327600f1e8215c586918c45 Author: James Page james.p...@ubuntu.com Date: Wed May 23 09:39:24 2012 +0100 pristine-tar data for lucene-solr_3.6.0.orig.tar.gz --- -- lucene-solr packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] lucene-solr packaging branch, upstream, created. ec5cd5c7dbc6f512d992cadf25c1cf112ba98757
The branch, upstream has been created at ec5cd5c7dbc6f512d992cadf25c1cf112ba98757 (commit) - Shortlog --- -- lucene-solr packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] lucene-solr packaging annotated tag, upstream/3.6.0, created. upstream/3.6.0
The annotated tag, upstream/3.6.0 has been created at c9e859e03ab94875c059e60715ef845bbb5ec36f (tag) tagging ec5cd5c7dbc6f512d992cadf25c1cf112ba98757 (commit) tagged by James Page on Wed May 23 09:39:24 2012 +0100 - Shortlog Upstream version 3.6.0 James Page (1): Imported Upstream version 3.6.0 --- -- lucene-solr packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
Bug#587510: Missing jar files from solr 1.4.1
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hi Jens I've review the solr 1.4 codebase for reference to either httpcore and commons-logging classes. However I have not been able to find reference to these libraries so I'm not convinced that they are required for this version of solr (I know then are for solr 3.x as that has additional dependencies). If they are required please could you explain why? Thanks James - -- James Page Ubuntu Core Developer -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBCAAGBQJPvhoIAAoJEL/srsug59jDFi4P/3ola+quABp77ODu/fJR9Enq aAANFai8rfaO9ZqnlFy54x3TtnFahLfLeRHrlgzl1TurfwrqtarDQwx5J2AZTE/O 98bZB0Bp+LvuctvvFmIIRe+3m1AyEKmcx2HsMcunq+QkWMlvgdYUCsNNqJJdZ6GP WRDMvfSQLq3mhQWW3kx86z2xEGESehgFR5H7q/mhPbmoHkwPSjX9XD1GuQY3GyeQ T7eR0aOkDUnXAsEQzlCleTA6ybof8yCZtXHKvg7rBypRV5lPktxDvBs/soA05yLD 4v5XF9miTevxuIiPm9cMRDcAsHqis2xKQEkSGmJ++xLrhxdnkiBaBFS9MqjSw/gn 9W0j13LtlChVtRcKetbRufTxOvUhSsWAFDHdoL+HrpKVQqV7zbbg53q3AiXwR9yJ 3KZ0u046z1dd+4WNyiGeOuqu5HMPZeClyXpO/tI3MWS2Ren7M2uTffJWGRdQjOiJ z7DVWqP0iEvfmlDjjCsNqnLaCpNy/jbbjQl00wBtH+UFfAjopjZHLGtvKmGgXMee szCY64mKcHVose2byCIyMVmfMHavUeqmAXEJtiWS6Zwit0ISKwRjFEwiLz/Sykz6 mpaprJ/KwRWJ2F4s28Qn+jsxlhV9YB9CEd4JqcDe1+G17sHkRDTMYlo02pZK1fG0 hxr8+jgH8mIg7HJY/nJb =oghO -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
[SCM] Solr - web service for full-text indexing and searching - Debian packaging branch, master, updated. debian/1.4.0+ds1-2-17-g513c3fd
The following commit has been merged in the master branch:
commit 513c3fda50957d180758a671161a4103a4d56258
Author: James Page james.p...@ubuntu.com
Date: Thu May 24 12:24:39 2012 +0100
Use default-jre-headless as primary runtime dependency for solr-common.
diff --git a/debian/changelog b/debian/changelog
index 3f2e4c4..b78535d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,6 @@ solr (1.4.1+dfsg1-3) UNRELEASED; urgency=low
* Bumped Standards-Version to 3.9.3:
- d/copyright: Referenced released version of DEP-5 and tidied up
obsolete field names.
- * Added commons-logging.jar to WEB-INF/lib (Closes: #587512).
- * Added http[client,core,mime].jar to WEB-INF/lib (Closes: #587510).
* Install utility scripts to correct location under ${solr.home}
(Closes: #538229), create symlink for backwards compatibility.
* Link /var/log/solr to ${solr.home}/logs.
@@ -20,8 +18,9 @@ solr (1.4.1+dfsg1-3) UNRELEASED; urgency=low
* Drop dependency on glassfish-mail, no longer required (Closes: #575208).
* Pickup maintenance of this package until solr3/lucene3 supercedes it.
(Closes: #652729).
+ * Use default-jre-headless as primary runtime dependency for solr-common.
- -- James Page james.p...@ubuntu.com Wed, 23 May 2012 16:52:15 +0100
+ -- James Page james.p...@ubuntu.com Thu, 24 May 2012 12:24:08 +0100
solr (1.4.1+dfsg1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 34d0d91..110b892 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ Build-Depends:
libcommons-fileupload-java (= 1.2.1),
libcommons-httpclient-java (= 3.1),
libcommons-io-java (= 1.4),
- libcommons-logging-java,
libjaxp1.3-java (= 1.3.04),
libjetty-java (= 6.1.21),
libjmock-java,
@@ -39,16 +38,13 @@ Depends:
libcommons-fileupload-java (= 1.2.1),
libcommons-httpclient-java (= 3.1),
libcommons-io-java (= 1.4),
- libcommons-logging-java,
- libhttpclient-java,
- libhttpmime-java,
libjaxp1.3-java (= 1.3.05-1),
libjetty-java (= 6.1.21),
liblucene2-java (= 2.9.1),
libservlet2.5-java (= 6.0.20),
libslf4j-java (= 1.5.10),
libxml-commons-external-java (= 1.3.04),
- openjdk-6-jre-headless | java5-runtime-headless | java6-runtime-headless,
+ default-jre-headless | java5-runtime-headless | java6-runtime-headless,
${misc:Depends}
Recommends:
solr-tomcat (= ${binary:Version}) | solr-jetty (= ${binary:Version})
--
Solr - web service for full-text indexing and searching - Debian packaging
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] Solr - web service for full-text indexing and searching - Debian packaging branch, master, updated. debian/1.4.0+ds1-2-18-g27f6137
The following commit has been merged in the master branch: commit 27f613729c2edcbf336f7d3f278ebde89daf3b00 Author: James Page james.p...@ubuntu.com Date: Thu May 24 12:45:58 2012 +0100 Removed links for jar files which are not required for solr1.4 diff --git a/debian/solr-common.links b/debian/solr-common.links index 370939d..cf985c8 100644 --- a/debian/solr-common.links +++ b/debian/solr-common.links @@ -6,10 +6,6 @@ /usr/share/java/commons-fileupload.jar /usr/share/solr/WEB-INF/lib/commons-fileupload.jar /usr/share/java/commons-httpclient.jar /usr/share/solr/WEB-INF/lib/commons-httpclient.jar /usr/share/java/commons-io.jar /usr/share/solr/WEB-INF/lib/commons-io.jar -/usr/share/java/commons-logging.jar /usr/share/solr/WEB-INF/lib/commons-logging.jar -/usr/share/java/httpcore.jar /usr/share/solr/WEB-INF/lib/httpcore.jar -/usr/share/java/httpclient.jar /usr/share/solr/WEB-INF/lib/httpclient.jar -/usr/share/java/httpmime.jar /usr/share/solr/WEB-INF/lib/httpmime.jar /usr/share/java/jcl-over-slf4j.jar /usr/share/solr/WEB-INF/lib/jcl-over-slf4j.jar /usr/share/java/jetty.jar /usr/share/solr/WEB-INF/lib/jetty.jar /usr/share/java/jetty-util.jar /usr/share/solr/WEB-INF/lib/jetty-util.jar -- Solr - web service for full-text indexing and searching - Debian packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r16062 - trunk/libcommons-codec-java/debian
Author: jamespage-guest Date: 2012-05-24 15:25:32 + (Thu, 24 May 2012) New Revision: 16062 Modified: trunk/libcommons-codec-java/debian/changelog trunk/libcommons-codec-java/debian/maven.rules Log: d/control,rules,maven.rules: Switch to using junit4 inline with upstream. Modified: trunk/libcommons-codec-java/debian/changelog === --- trunk/libcommons-codec-java/debian/changelog2012-05-23 16:41:32 UTC (rev 16061) +++ trunk/libcommons-codec-java/debian/changelog2012-05-24 15:25:32 UTC (rev 16062) @@ -2,14 +2,14 @@ * New upstream release: - d/patches/javac_encoding.diff: Dropped - accepted upstream. -- d/control,rules: Switch to using junit4 inline with upstream. +- d/control,rules,maven.rules: Switch to using junit4 inline with upstream. - Refreshed remaining patch. * d/control: Bumped Standards-Version to 3.9.3: - d/copyright: Tidied lintian warnings and referenced released version of DEP-5. * Added myself to uploaders. - -- James Page james.p...@ubuntu.com Wed, 23 May 2012 11:29:46 +0100 + -- James Page james.p...@ubuntu.com Thu, 24 May 2012 16:19:05 +0100 libcommons-codec-java (1.5-1) unstable; urgency=low Modified: trunk/libcommons-codec-java/debian/maven.rules === --- trunk/libcommons-codec-java/debian/maven.rules 2012-05-23 16:41:32 UTC (rev 16061) +++ trunk/libcommons-codec-java/debian/maven.rules 2012-05-24 15:25:32 UTC (rev 16062) @@ -1 +1 @@ -junit junit jar s/3\..*/3.x/ +junit junit jar s/4\..*/4.x/ ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
Bug#673765: dom4j FTBFS with openjdk-7
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hi Niels On 23/05/12 07:27, Niels Thykier wrote: However, I must admit I am a bit concerned in the use of of != with reals (floats/doubles)[0]. To my understanding (in at least C/C++) that is very likely to always be true due to even minor rounding errors[1]. Presumably this is why upstream used Math.round in the first place. It is possible that it only apply to expressions (and not stored values in variables) or Java handles this better, but in this case, I believe a comment in the code documenting this assertion would be prudent. I had the same concern when writing this patch but reading into this in a bit more detail I decided that this was actually OK for the following reason. The priority (see [0]) is always one of four values: -0.25 0.5 0.0 -0.5 I did a quick check and all four of these values can be represented accurately in Java (this is not true of all float/double literals). I'll update the patch with an appropriate comment to this effect. Cheers James [0] http://www.w3.org/TR/xslt11/#conflict - -- James Page Ubuntu Core Developer -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBCAAGBQJPvJ2lAAoJEL/srsug59jDGIoP/jLm1923bfy2YujGzeoD9Ap9 Wb2N6ZSI/bRqGTrz2zo533RN2BeVPsPZknj1g/0VqT42pAEgwWafzLBow8w7KafV X3Wvio6IMdlhbASQo+iYxlXaFlykHH+UVhWYJfcrRuiCIaCDTGJfTE/Hct7ReGa/ ydk8k95kg7sGmZWXCRc4Rb+ctz48Va1a7mWiCMRGBMREkJs5oLV9FQUVSIEnwp// zMgQ274PD736HfkkwfOSNDdnarW2rVo1+19Lf3eONNznxJm2L67BHYkDPPx5d895 979JLO+R1gYFSdrvx6WWJ26jXZux8bjKhJniVkpePhRmc+UA/uyObtcrGz7Cd8fH dGgOUcMJIfxc6uVHYNOs34v9lMViQgyCd365GsAvZNczLg6fPBuR/ANHfNRzlo4X B+ZL/aNffXjklJZL1PQgfEoaakhXQ+qqwBuKrma3/dw96EP35fqMr6aYaVqU83II tDpspmnRCbhGRTXYeexQZcOt/m/g5U3XI9jO5pvFrCLAynR6FOCxfqR4RETSKSTL 5MFvuA0GWnicDkHT3L57os5/1lOjgusZApHP4RGhsKWHjpE0TgLgOeAzYFjQ6snV aWcfweRLV0+NPUX+brdmyM/RgJxUfFZMgDr7OLL4/OgK1HSzi5V4jdISl8hy4TeU dSCfkd9hhE0TdSuijMsX =5aMD -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#673765: dom4j FTBFS with openjdk-7
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 23/05/12 09:48, Niels Thykier wrote: Revisiting this, couldn't we use Double.compare(double, double) for this? This way we should be safe from changes (if any) in how doubles are handled in the future as well as any changes to the standard (possible exceptions include allowing the use NaN or INF values). Actually that's much nicer - I'll update to use that method. Thanks for pointing that out. Cheers James - -- James Page Ubuntu Core Developer -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBCAAGBQJPvLk0AAoJEL/srsug59jDqNgQAJxqstr9yBdKNHiN44ZV0yte jQdjNNMMR9e92367WKHsjwLugRO1R/7t2pqLLub1pw8aYam0idTwKrlT4S6NN4T/ ztfzcW1yBxZPkhK0YMBgeG0GMm+YBrnWkvI7zYYLtGd5XsRwVDT96rcXKEGOj/ms kZmS4aiPovk2xk39SIfbGHoJ/I4Iv5Y/PI4mgO1OqRSLNpQPAE8DL52mZCKtlF/Z Ms2LlFUDPsiuYo7o1Bfd76qDvm9zE8MmywXVImCh6izSeP0lefrARpReEN79kAZc ox/l4aI87ThC+7QI4iTPFdoTFRuvmkbOUwSB4z7RbvN32lK9qNsvLsZvwy9rGpBV V6Azc0na6NG6eeCX+Na+mW/26THO7ecntRaPyJw5zhQhq/WLXl/lqsS7oHz/SpKI 4gpq8O5Ig2OeicM44NmXobAcaalXAgL9rZJNa4HPeyKaurZHOpcMfsfPg7qj3Ski sMn3+U2r2xFEYWLHkG4CHEquJGvq0uY+7KLV07hNMjbSlMCH86cI44KJzA2hna9X V1JAwhdNB7VOk5HaV6ZvPzOVqB2a38u9hqf8yy1KJiNFoR4YfQxDVIW0vEWswaCy EdbTGduq3n1QE4gm8TydZJvXQB7ofrAGJkQjT2/hgz/Z2Nor2lQ5Yd9G/ij8As6u gVri/zU7dDctD9AfpRRl =4iD3 -END PGP SIGNATURE- __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
[pkg-java] r16060 - in trunk/libcommons-codec-java/debian: . patches
Author: jamespage-guest Date: 2012-05-23 10:55:20 + (Wed, 23 May 2012) New Revision: 16060 Removed: trunk/libcommons-codec-java/debian/patches/javac_encoding.diff Modified: trunk/libcommons-codec-java/debian/changelog trunk/libcommons-codec-java/debian/control trunk/libcommons-codec-java/debian/copyright trunk/libcommons-codec-java/debian/patches/manifest.diff trunk/libcommons-codec-java/debian/patches/series trunk/libcommons-codec-java/debian/rules Log: * New upstream release: - d/patches/javac_encoding.diff: Dropped - accepted upstream. - d/control,rules: Switch to using junit4 inline with upstream. - Refreshed remaining patch. * d/control: Bumped Standards-Version to 3.9.3: - d/copyright: Tidied lintian warnings and referenced released version of DEP-5. * Added myself to uploaders. Modified: trunk/libcommons-codec-java/debian/changelog === --- trunk/libcommons-codec-java/debian/changelog2012-05-20 10:39:27 UTC (rev 16059) +++ trunk/libcommons-codec-java/debian/changelog2012-05-23 10:55:20 UTC (rev 16060) @@ -1,3 +1,16 @@ +libcommons-codec-java (1.6-1) unstable; urgency=low + + * New upstream release: +- d/patches/javac_encoding.diff: Dropped - accepted upstream. +- d/control,rules: Switch to using junit4 inline with upstream. +- Refreshed remaining patch. + * d/control: Bumped Standards-Version to 3.9.3: +- d/copyright: Tidied lintian warnings and referenced released version + of DEP-5. + * Added myself to uploaders. + + -- James Page james.p...@ubuntu.com Wed, 23 May 2012 11:29:46 +0100 + libcommons-codec-java (1.5-1) unstable; urgency=low * New upstream release. Modified: trunk/libcommons-codec-java/debian/control === --- trunk/libcommons-codec-java/debian/control 2012-05-20 10:39:27 UTC (rev 16059) +++ trunk/libcommons-codec-java/debian/control 2012-05-23 10:55:20 UTC (rev 16060) @@ -2,10 +2,11 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org -Uploaders: Wolfgang Baer wb...@gmx.de, Damien Raude-Morvan draz...@debian.org, Torsten Werner twer...@debian.org +Uploaders: Wolfgang Baer wb...@gmx.de, Damien Raude-Morvan draz...@debian.org, + Torsten Werner twer...@debian.org, James Page james.p...@ubuntu.com Build-Depends: cdbs, debhelper (= 7), ant, default-jdk -Build-Depends-Indep: maven-repo-helper, ant-optional, junit -Standards-Version: 3.9.2 +Build-Depends-Indep: maven-repo-helper, ant-optional, junit4 +Standards-Version: 3.9.3 Homepage: http://commons.apache.org/codec/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-codec-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-codec-java Modified: trunk/libcommons-codec-java/debian/copyright === --- trunk/libcommons-codec-java/debian/copyright2012-05-20 10:39:27 UTC (rev 16059) +++ trunk/libcommons-codec-java/debian/copyright2012-05-23 10:55:20 UTC (rev 16060) @@ -1,10 +1,10 @@ -Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=filerev=166 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 Upstream-Name: Commons Codec Upstream-Contact: Apache Commons http://commons.apache.org/codec/ Source: http://www.apache.org/dist/commons/codec/ Files: * -Copyright: Copyright 2002-2011 The Apache Software Foundation +Copyright: 2002-2011 The Apache Software Foundation License: Apache-2.0 On Debian systems the full text of the Apache License can be found in `/usr/share/common-licenses/Apache-2.0'. @@ -28,8 +28,8 @@ Matthew Inger mattin...@yahoo.com Files: src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java -Copyright: Copyright 2002-2011 The Apache Software Foundation -Copyright: Copyright (C) 2002 Kevin Atkinson (kev...@gnu.org) +Copyright: 2002-2011 The Apache Software Foundation, + 2002 Kevin Atkinson (kev...@gnu.org) License: Apache-2.0 On Debian systems the full text of the Apache License can be found in `/usr/share/common-licenses/Apache-2.0'. @@ -41,8 +41,8 @@ provided this notice is preserved. Files: debian/* -Copyright: Copyright 2004 Arnaud Vandyck av...@debian.org -Copyright: Copyright 2010-2011 Damien Raude-Morvan draz...@debian.org +Copyright: 2004 Arnaud Vandyck av...@debian.org, + 2010-2011 Damien Raude-Morvan draz...@debian.org License: Apache-2.0 On Debian systems the full text of the Apache License can be found in `/usr/share/common-licenses/Apache-2.0'. Deleted: trunk/libcommons-codec-java/debian/patches/javac_encoding.diff === --- trunk/libcommons-codec-java/debian/patches/javac_encoding.diff 2012-05-20 10:39:27 UTC (rev 16059) +++ trunk/libcommons-codec
[SCM] Solr - web service for full-text indexing and searching - Debian packaging branch, master, updated. debian/1.4.0+ds1-2-14-gab43224
The following commit has been merged in the master branch:
commit 8ffd51414b72caac19a9f7ab9c8a8a8f57319933
Author: James Page james.p...@ubuntu.com
Date: Wed May 23 16:21:10 2012 +0100
Added myself to uploaders.
* Added myself to uploaders.
* Bumped Standards-Version to 3.9.3:
- d/copyright: Referenced released version of DEP-5 and tidied up
obsolete field names.
* Added commons-logging.jar to WEB-INF/lib (Closes: #587512).
* Added http[client,core,mime].jar to WEB-INF/lib (Closes: #587510).
* Install utility scripts to correct location under ${solr.home}
(Closes: #538229), create symlink for backwards compatibility.
* Link /var/log/solr to ${solr.home}/logs.
* Added Italian debconf translation (Closes: #659388). Thanks to Beatrice
Torracca for this work.
* Sync changes from Ubuntu and fix FTBFS with current versions of lucene
(Closes: #593027).
* Drop dependency on glassfish-mail, no longer required (Closes: #575208).
diff --git a/debian/ant.properties b/debian/ant.properties
index b8f2fa9..6542be0 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -8,4 +8,4 @@ build.compiler=javac1.5
compile.debug=on
compile.optimize=on
ant.library.dir=/usr/share/ant/lib
-lucene_version=2.9.2
+lucene_version=2.9.4
diff --git a/debian/changelog b/debian/changelog
index cd7f6c8..88f310a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,25 @@
solr (1.4.1+dfsg1-3) UNRELEASED; urgency=low
+ [ Jan-Pascal van Best ]
* Removed Jan-Pascal from uploaders.
- -- Jan-Pascal van Best janpas...@vanbest.org Tue, 16 Aug 2011 21:27:22
+0200
+ [ James Page ]
+ * Added myself to uploaders.
+ * Bumped Standards-Version to 3.9.3:
+- d/copyright: Referenced released version of DEP-5 and tidied up
+ obsolete field names.
+ * Added commons-logging.jar to WEB-INF/lib (Closes: #587512).
+ * Added http[client,core,mime].jar to WEB-INF/lib (Closes: #587510).
+ * Install utility scripts to correct location under ${solr.home}
+(Closes: #538229), create symlink for backwards compatibility.
+ * Link /var/log/solr to ${solr.home}/logs.
+ * Added Italian debconf translation (Closes: #659388). Thanks to Beatrice
+Torracca for this work.
+ * Sync changes from Ubuntu and fix FTBFS with current versions of lucene
+(Closes: #593027).
+ * Drop dependency on glassfish-mail, no longer required (Closes: #575208).
+
+ -- James Page james.p...@ubuntu.com Wed, 23 May 2012 16:10:48 +0100
solr (1.4.1+dfsg1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index dbf6457..6264698 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: solr
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Thomas Koch tho...@koch.ro
+Uploaders: Thomas Koch tho...@koch.ro, James Page james.p...@ubuntu.com
DM-Upload-Allowed: yes
Homepage: http://lucene.apache.org/solr/
Vcs-Browser: http://git.debian.org/?p=pkg-java/solr.git
Vcs-Git: git://git.debian.org/git/pkg-java/solr.git
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
Build-Depends: debhelper (= 8), po-debconf,
default-jdk,
ant (= 1.7.0), ant-optional (= 1.7.0),
@@ -16,13 +16,13 @@ Build-Depends: debhelper (= 8), po-debconf,
libcommons-fileupload-java (= 1.2.1),
libcommons-httpclient-java (= 3.1),
libcommons-io-java (= 1.4),
+ libcommons-logging-java,
libjaxp1.3-java (= 1.3.04),
libjetty-java (= 6.1.21),
liblucene2-java (= 2.9.1),
libservlet2.5-java (= 6.0.20),
libslf4j-java (= 1.5.10),
libxml-commons-external-java (= 1.3.04),
- glassfish-mail (= 1:2ur2-b04),
junit4,
libjmock-java
@@ -36,13 +36,15 @@ Depends: ${misc:Depends},
libcommons-fileupload-java (= 1.2.1),
libcommons-httpclient-java (= 3.1),
libcommons-io-java (= 1.4),
+ libcommons-logging-java,
+ libhttpclient-java,
+ libhttpmime-java,
libjaxp1.3-java (= 1.3.05-1),
libjetty-java (= 6.1.21),
liblucene2-java (= 2.9.1),
libservlet2.5-java (= 6.0.20),
libslf4j-java (= 1.5.10),
- libxml-commons-external-java (= 1.3.04),
- glassfish-mail (= 1:2ur2-b04),
+ libxml-commons-external-java (= 1.3.04)
Recommends: solr-tomcat (= ${binary:Version}) | solr-jetty (=
${binary:Version})
Suggests: libmysql-java
Description: enterprise search server based on Lucene - common files
diff --git a/debian/copyright b/debian/copyright
index 4a4435f..c8d89ca 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
-Format-Specification:
http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=filerev=REVISION
-Name: solr
-Maintainer: solr-...@lucene.apache.org
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: solr
+Upstream-Contact: solr-...@lucene.apache.org
Source: http://lucene.apache.org/solr/
Files: *
diff --git a/debian/po/cs.po b/debian/po/it.po
similarity index 52%
copy from debian/po/cs.po
copy to debian/po/it.po
[SCM] Solr - web service for full-text indexing and searching - Debian packaging branch, master, updated. debian/1.4.0+ds1-2-14-gab43224
The following commit has been merged in the master branch:
commit ab432244d940fbc9a001bcf00b019805f3f98aad
Author: James Page james.p...@ubuntu.com
Date: Wed May 23 16:41:52 2012 +0100
Added patches and drop use of topgit for this package
diff --git a/debian/changelog b/debian/changelog
index 88f310a..c0aceb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,10 @@ solr (1.4.1+dfsg1-3) UNRELEASED; urgency=low
* Sync changes from Ubuntu and fix FTBFS with current versions of lucene
(Closes: #593027).
* Drop dependency on glassfish-mail, no longer required (Closes: #575208).
+ * Dropped Suggests: libmysql-java for solr-common and updated description
+as this package does not ship dataimporthandler.
- -- James Page james.p...@ubuntu.com Wed, 23 May 2012 16:10:48 +0100
+ -- James Page james.p...@ubuntu.com Wed, 23 May 2012 16:34:14 +0100
solr (1.4.1+dfsg1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6264698..f647df8 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,12 @@ Homepage: http://lucene.apache.org/solr/
Vcs-Browser: http://git.debian.org/?p=pkg-java/solr.git
Vcs-Git: git://git.debian.org/git/pkg-java/solr.git
Standards-Version: 3.9.3
-Build-Depends: debhelper (= 8), po-debconf,
+Build-Depends:
+ ant (= 1.7.0),
+ ant-optional (= 1.7.0),
+ debhelper (= 8),
default-jdk,
- ant (= 1.7.0), ant-optional (= 1.7.0),
+ junit4,
libcommons-codec-java (= 1.4),
libcommons-csv-java (= 0.1-SNAPSHOT+svn678580),
libcommons-fileupload-java (= 1.2.1),
@@ -19,18 +22,18 @@ Build-Depends: debhelper (= 8), po-debconf,
libcommons-logging-java,
libjaxp1.3-java (= 1.3.04),
libjetty-java (= 6.1.21),
+ libjmock-java,
liblucene2-java (= 2.9.1),
libservlet2.5-java (= 6.0.20),
libslf4j-java (= 1.5.10),
libxml-commons-external-java (= 1.3.04),
- junit4,
- libjmock-java
+ po-debconf
Package: solr-common
Architecture: all
-Depends: ${misc:Depends},
+Depends:
+ curl,
debconf (= 1.5),
- openjdk-6-jre-headless | java5-runtime-headless | java6-runtime-headless,
libcommons-codec-java (= 1.4),
libcommons-csv-java (= 0.1-SNAPSHOT+svn678580),
libcommons-fileupload-java (= 1.2.1),
@@ -44,45 +47,44 @@ Depends: ${misc:Depends},
liblucene2-java (= 2.9.1),
libservlet2.5-java (= 6.0.20),
libslf4j-java (= 1.5.10),
- libxml-commons-external-java (= 1.3.04)
-Recommends: solr-tomcat (= ${binary:Version}) | solr-jetty (=
${binary:Version})
-Suggests: libmysql-java
+ libxml-commons-external-java (= 1.3.04),
+ openjdk-6-jre-headless | java5-runtime-headless | java6-runtime-headless,
+ ${misc:Depends}
+Recommends:
+ solr-tomcat (= ${binary:Version}) | solr-jetty (= ${binary:Version})
Description: enterprise search server based on Lucene - common files
- Solr is an open source enterprise search server based on the Lucene
- Java search library, with XML/HTTP and JSON APIs, hit highlighting,
- faceted search, caching, replication, and a web administration
+ Solr is an open source enterprise search server based on the Lucene
+ Java search library, with XML/HTTP and JSON APIs, hit highlighting,
+ faceted search, caching, replication, and a web administration
interface. It runs in a Java servlet container such as Tomcat.
.
This package provides the common files for Solr. Install
solr-tomcat or solr-jetty to use Solr under Tomcat or Jetty.
- .
- This package also contains the dataimporthandler contrib while omiting
- dataimporthandler-extras, clustering, extraction and velocity due to missing
- dependencies.
- .
- libmysql-java is necessary to connect the dataimporthandler to MySQL.
Package: solr-tomcat
Architecture: all
-Depends: ${misc:Depends}, solr-common (= ${binary:Version}), tomcat6 (=
6.0.20)
+Depends: solr-common (= ${binary:Version}), tomcat6 (= 6.0.20),
${misc:Depends}
Conflicts: solr-jetty, solr-tomcat6
Description: enterprise search server based on Lucene - Tomcat integration
- Solr is an open source enterprise search server based on the Lucene
- Java search library, with XML/HTTP and JSON APIs, hit highlighting,
- faceted search, caching, replication, and a web administration
+ Solr is an open source enterprise search server based on the Lucene
+ Java search library, with XML/HTTP and JSON APIs, hit highlighting,
+ faceted search, caching, replication, and a web administration
interface. It runs in a Java servlet container such as Tomcat.
.
- This package provides the Tomcat integration files for Solr.
+ This package provides the Tomcat integration files for Solr.
Package: solr-jetty
Architecture: all
-Depends: ${misc:Depends}, solr-common (= ${binary:Version}), jetty (= 6.1.22),
- libjetty-extra-java (= 6.1.22)
+Depends:
+ jetty (= 6.1.22),
+ libjetty-extra-java (= 6.1.22),
+ solr-common (= ${binary:Version}),
+ ${misc:Depends}
Conflicts: solr-tomcat
Description: enterprise search server based on Lucene - Jetty integration
- Solr is an open source enterprise search server based
[SCM] Solr - web service for full-text indexing and searching - Debian packaging branch, master, updated. debian/1.4.0+ds1-2-15-g061e141
The following commit has been merged in the master branch: commit 061e1418318f3402685a85df482df2047f393e89 Author: James Page james.p...@ubuntu.com Date: Wed May 23 16:48:48 2012 +0100 Pickup maintenance of this package until solr3/lucene3 supercedes it. (Closes: #652729). diff --git a/debian/changelog b/debian/changelog index c0aceb8..6576515 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,8 +20,10 @@ solr (1.4.1+dfsg1-3) UNRELEASED; urgency=low * Drop dependency on glassfish-mail, no longer required (Closes: #575208). * Dropped Suggests: libmysql-java for solr-common and updated description as this package does not ship dataimporthandler. + * Pickup maintenance of this package until solr3/lucene3 supercedes it. +(Closes: #652729). - -- James Page james.p...@ubuntu.com Wed, 23 May 2012 16:34:14 +0100 + -- James Page james.p...@ubuntu.com Wed, 23 May 2012 16:45:04 +0100 solr (1.4.1+dfsg1-2) unstable; urgency=low -- Solr - web service for full-text indexing and searching - Debian packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] Solr - web service for full-text indexing and searching - Debian packaging branch, master, updated. debian/1.4.0+ds1-2-16-g26a4a21
The following commit has been merged in the master branch:
commit 26a4a217061b1ad641a1c8ac5995fec66723d9f3
Author: James Page james.p...@ubuntu.com
Date: Wed May 23 16:53:44 2012 +0100
Re-instate stuff for dataimporthandler - it is built
diff --git a/debian/changelog b/debian/changelog
index 6576515..3f2e4c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,12 +18,10 @@ solr (1.4.1+dfsg1-3) UNRELEASED; urgency=low
* Sync changes from Ubuntu and fix FTBFS with current versions of lucene
(Closes: #593027).
* Drop dependency on glassfish-mail, no longer required (Closes: #575208).
- * Dropped Suggests: libmysql-java for solr-common and updated description
-as this package does not ship dataimporthandler.
* Pickup maintenance of this package until solr3/lucene3 supercedes it.
(Closes: #652729).
- -- James Page james.p...@ubuntu.com Wed, 23 May 2012 16:45:04 +0100
+ -- James Page james.p...@ubuntu.com Wed, 23 May 2012 16:52:15 +0100
solr (1.4.1+dfsg1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f647df8..34d0d91 100644
--- a/debian/control
+++ b/debian/control
@@ -52,6 +52,7 @@ Depends:
${misc:Depends}
Recommends:
solr-tomcat (= ${binary:Version}) | solr-jetty (= ${binary:Version})
+Suggests: libmysql-java
Description: enterprise search server based on Lucene - common files
Solr is an open source enterprise search server based on the Lucene
Java search library, with XML/HTTP and JSON APIs, hit highlighting,
@@ -60,6 +61,12 @@ Description: enterprise search server based on Lucene -
common files
.
This package provides the common files for Solr. Install
solr-tomcat or solr-jetty to use Solr under Tomcat or Jetty.
+ .
+ This package also contains the dataimporthandler contrib while omiting
+ dataimporthandler-extras, clustering, extraction and velocity due to missing
+ dependencies.
+ .
+ libmysql-java is necessary to connect the dataimporthandler to MySQL.
Package: solr-tomcat
Architecture: all
--
Solr - web service for full-text indexing and searching - Debian packaging
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
Bug#673765: dom4j FTBFS with openjdk-7
be first, array[0] == r2 ); assertTrue( r1
+ * should be next, array[1] == r1 );
+ *
+ * set = new TreeSet(); set.add( r2 ); set.add( r1 );
+ *
+ * assertTrue( r2 should be first, set.first() == r2 ); assertTrue(
+ * r1 should be next, set.last() == r1 );
+ *
+ * array = set.toArray();
+ *
+ * assertTrue( r2 should be first, array[0] == r2 ); assertTrue( r1
+ * should be next, array[1] == r1 );
+ */
+}
+
+public void testDocument() {
+Rule rule = createRule(/);
+Document document = factory.createDocument();
+document.addElement(foo);
+
+assertTrue(/ matches document, rule.matches(document));
+assertTrue(/ does not match root element, !rule.matches(document
+.getRootElement()));
+}
+
+public void testTextMatchesCDATA() {
+CDATA cdata = factory.createCDATA();
+Rule rule = createRule(text());
+
+assertTrue(text() matches CDATA, rule.matches(cdata));
+}
+
+protected Rule createRule(String expr) {
+Pattern pattern = factory.createPattern(expr);
+
+return new Rule(pattern);
+}
+}
+
+/*
+ * Redistribution and use of this software and associated documentation
+ * (Software), with or without modification, are permitted provided that the
+ * following conditions are met:
+ *
+ * 1. Redistributions of source code must retain copyright statements and
+ * notices. Redistributions must also contain a copy of this document.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. The name DOM4J must not be used to endorse or promote products derived
+ * from this Software without prior written permission of MetaStuff, Ltd. For
+ * written permission, please contact dom4j-i...@metastuff.com.
+ *
+ * 4. Products derived from this Software may not be called DOM4J nor may
+ * DOM4J appear in their names without prior written permission of MetaStuff,
+ * Ltd. DOM4J is a registered trademark of MetaStuff, Ltd.
+ *
+ * 5. Due credit should be given to the DOM4J Project - http://www.dom4j.org
+ *
+ * THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL METASTUFF, LTD. OR ITS CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+ */
=== modified file 'debian/changelog'
=== modified file 'debian/control'
--- debian/control 2011-08-17 18:43:40 +
+++ debian/control 2012-05-21 09:39:38 +
@@ -1,7 +1,8 @@
Source: dom4j
Section: java
Priority: optional
-Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org
Uploaders: Marcus Better mar...@better.se, Michael Koch konque...@gmx.de
Build-Depends: debhelper (= 7), ant-optional, default-jdk, maven-repo-helper, cdbs
Build-Depends-Indep: antlr, libjaxen-java, libjaxme-java, libxpp2-java, libxpp3-java, libxerces2-java, libxalan2-java (= 2.7.0), libbackport-util-concurrent-java, junit, libjunitperf-java
=== added file 'debian/patches/java7-compat.patch'
--- debian/patches/java7-compat.patch 1970-01-01 00:00:00 +
+++ debian/patches/java7-compat.patch 2012-05-21 09:48:19 +
@@ -0,0 +1,63 @@
+Description: Fixup compareTo function in Rule class to be compliant
+ with the Java 7 (and Java 6) API. Comparisons where not symmetric
+ with the upstream handling in this function:
+ .
+r1 r2 but ! r2 r1
+ .
+ Also added extra tests to ensure that comparison works both ways.
+Author: James Page james.p...@ubuntu.com
+Forwarded: no
+
+Index: dom4j/src/java/org/dom4j/rule/Rule.java
+===
+--- dom4j.orig/src/java/org/dom4j/rule/Rule.java 2012-05-21 10:29:53.305207061 +0100
dom4j/src/java/org/dom4j/rule/Rule.java 2012-05-21 10:30:54.217451201 +0100
+@@ -99,16 +99,16 @@
+ * @return DOCUMENT ME!
+ */
+ public int compareTo(Rule that) {
+-int answer = this.importPrecedence - that.importPrecedence
Bug#673175: cglib: Fix test suite failure with OpenJDK7
Package: cglib Version: 2.2.2+dfsg-2 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Fix FTBFS with OpenJDK7: - d/ant.properties: Ensure that all classes are built to target Java 1.5 to ensure backwards compatibility and correct execution of test suite. Obviously this won't be an issue in Debian yet as the default-jdk is still openjdk-6 but this future fix won't impact current functionality, Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers quantal-updates APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 'quantal') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-24-generic (SMP w/8 CPU cores) Locale: LANG=C, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJPs9XDAAoJEL/srsug59jDNu4P/AzHlX+b5Gd8hWe1rIZA4841 Lwxf4HmtmS/krQN9dPE+JAYpf6ZME0ZTSd6VpS2lwqLN6tNWKbktpl/PyFY7xWsC ZOswuk3WlFmRM/Nq16q+JMvmqRaq03OtvNirMygxGbjpeGonld8DV3O9a7hPtFcK kTutM+hjLvLyaWQrkENXseLoqJ+jGdK9QrLivwszXabjTK7H6i2nKaYQNBQ4ZJB5 U7Bi6uaDA7W/9zoz8iSW5sdWfXamrezYqaHP90qkHsnb+RwbaSDMIEv4hNW+LSRV wqZSdsWcFmNItwg/lV+Xl+N3AGy0q7YMMiJ7DwHe/A3Ss3TKDlyDfEaiEpDrN7tX rw9kMuZbg/R+6VelkSnY8yaPLZRvl+q543yap8yaAD9GxcwdgGN+2E3elpTlGvIm Nv1kpPHf/9KvG1recvdtoDy1x+MuWUJJFmeHY6mdZNsJmqgwrq7cM7VuCbABBXUj crL6YQpHcY4t09XwMb4PHZgnHUk6r4DwSAMRQ+2orhfyXpf2YNSkJV++CUgldicH lVEBvg5YmP/FIw12iu8Yh6iTjDMcktPVorg+VAuNxwLsNXGiY9fusTg8S98FlNNM 4KH0dACCLCjn9Ahlc40OUiKqOf7G3OgdWsuyE5WzzZHxhvrpBIVfQc+7seuLg/Nh FHJ/oHdc1hAKdkiz/wVw =YIhn -END PGP SIGNATURE- === modified file 'debian/ant.properties' --- debian/ant.properties 2009-10-08 21:23:45 + +++ debian/ant.properties 2012-05-16 16:12:45 + @@ -1 +1,3 @@ compile.target = 1.4 +ant.build.javac.source=1.5 +ant.build.javac.target=1.5 __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#673177: libxerces2-java: Ensure classes are backwards compatible with previous versions of java
Package: libxerces2-java Version: 2.11.0-5 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/rules: Build class files with source/target = 1.4 to ensure backwards compatibility (LP: #999749). By default, this package aligns source/target to the version of Java being used to compile the code - in Ubuntu default java has switch to OpenJDK7 which means that this package generates classes which are not compatible with earlier versions of Java Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers quantal-updates APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 'quantal') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-24-generic (SMP w/8 CPU cores) Locale: LANG=C, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJPs9cHAAoJEL/srsug59jDYcQQANI5Ji/f+tIV6ODtCoFfn/+t cGHByUih8wBioEVNjddNpC7hh2PB5UoUICbfYEm7qjciUbNo+l4phpk6dtZuseUa AWrOTItetpjGmPFO3XO21ZfLCDOpKjQtl2I69cYHkpA3CLMWZHVoYLwwl4szqg08 VI9yecCzrWSvv5nw1lutOYM4KXWDWFs0M6SeMWWPo7g4a5khaUmV5bc0CROdjnBF KG5A58R0fgoRjsl7TALj4GB7wOiw9fw3PPm5mZBflGxJU+38NKkdka6hhSMXJbcq w9AL9A1uW7lZvPZhcVRlNYD33w9XVF4M37VNGeeb6HtxbUbyEAyjZSyKyHqMzkVO kRT6+2QNcpwUhnSa8iFYk7cuIBXj9kNw964Yv0AdkPbIsqK9bVPgm6S5pnbMi1uX D1ESvg6cIzjypTZVSbl9GbloEDO9CQWqc6/Sq8pGMblZ7iU3cdyIotPKJHwfRoeH UoE+VwU+FwqByVv8KRA351nsfI3POlNL85OTLhRp5QQ9HUu2jM8IraIvRiczYZyw LLzGfPHfk0llsSSmWRXUIXDOKM3aBc99Nl+wNuQsFttyhL779hFbRtqttrZa3R+G 1L/yW9HiQmey+JRm+Zfz2LSEoGExmfJFCj8kjzroGNMwl14mqaoPF3H431WFQl88 AkybHVGisw7Wl9rw51vd =Y1bF -END PGP SIGNATURE- diff -Nru libxerces2-java-2.11.0/debian/rules libxerces2-java-2.11.0/debian/rules --- libxerces2-java-2.11.0/debian/rules 2011-12-02 07:43:46.0 + +++ libxerces2-java-2.11.0/debian/rules 2012-05-15 18:45:47.0 +0100 @@ -9,7 +9,7 @@ VERSION := $(DEB_UPSTREAM_VERSION) JAVA_HOME:= /usr/lib/jvm/default-java ANT_HOME := /usr/share/ant -ANT_OPTS = -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 +ANT_OPTS = -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -Djavac.source=1.4 -Djavac.target=1.4 include /usr/share/gcj/debian_defaults ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs))) __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#671370: tomcat7: Java7 compatibility patch for tomcat7
Package: tomcat7
Version: 7.0.26-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* d/patches/0012-java7-compat.patch: Added compatibility patch to
support compilation with openjdk-7 as default-jdk (LP: #889002).
* d/default_root/index.html: Fixup instructions for enabling
manager web application access (LP: #910368).
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-24-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJPop08AAoJEL/srsug59jDz5cP/0nCyVSyYjChEetEr7lRRK3k
OSsfcsyzSGeXDGCsffTSyXDKutwn7IwO9XygaGITDhZYndCVp+HnljfgA8L4Uwii
3gV5PnEj5pgVTvTnO5Yb+BKE+9YgYA2pOUOZyHNtE1MWZBaUEXw0Zf0xfOmu6Ck+
brJHVR/h0+zXRl4TvWZB18FUILpLdLQA+QkdzWDZYpq0F7oxIcI6eVSFxSqBFUfu
dW6NFOwIHyTqhjDSvdS2gPLCrnwrenPe2Htb/6pzdDuR+QxMAbTC6eHB4flQkwej
cpzJyb9aa0OBRJy7HXvQji/pHc3dOLkfkFc59Qb5ZVp2BCeRs/QB55USWNvdwUaH
fmaMMSgnKIxVVnPHBBKFoJ0incogXzC1QsHEO5OZnechBUddudOcROnkfPA8CptM
9xLeKxh1azJnMrY3I9YN4hhRvmP6PWJx7XPMNQtANrQEIg8wkz7uEchFCa8VrHFj
2Pqvrho72RdNM717ogXjoKoG/5I5SisDkb++zafOFo0qpll+ijdjpSkWrKdRrecA
F7LAIrugY4ssgmSbIpcSXbpkJCovwoJ8vuepvITcxY+Cqj4ghDx/Dl5WCj4ytNm1
v/pJFQqMJv0zf92mzarNx2gWtBe9XR2eL77rJu87phpnM7LWQg+SIGnChbseMd/h
AgLG6FI7hR4byXEBJMre
=WmsE
-END PGP SIGNATURE-
diff -Nru tomcat7-7.0.26/debian/changelog tomcat7-7.0.26/debian/changelog
diff -Nru tomcat7-7.0.26/debian/control tomcat7-7.0.26/debian/control
--- tomcat7-7.0.26/debian/control 2012-04-27 05:48:04.0 +0100
+++ tomcat7-7.0.26/debian/control 2012-05-03 14:46:34.0 +0100
@@ -1,7 +1,8 @@
Source: tomcat7
Section: java
Priority: optional
-Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org
Uploaders: James Page james.p...@ubuntu.com,
Miguel Landaeta mig...@miguel.cc, tony mancill tmanc...@debian.org,
Jakub Adam jakub.a...@ktknet.cz
diff -Nru tomcat7-7.0.26/debian/default_root/index.html tomcat7-7.0.26/debian/default_root/index.html
--- tomcat7-7.0.26/debian/default_root/index.html 2012-04-27 05:48:04.0 +0100
+++ tomcat7-7.0.26/debian/default_root/index.html 2012-05-03 14:57:47.0 +0100
@@ -23,7 +23,7 @@
pbtomcat7-admin/b: This package installs two web applications that can help managing this Tomcat instance. Once installed, you can access the a href=manager/htmlmanager webapp/a and the a href=host-manager/htmlhost-manager webapp/a.p
-pNOTE: For security reasons, using the manager webapp is restricted to users with role manager. The host-manager webapp is restricted to users with role admin. Users are defined in code/etc/tomcat7/tomcat-users.xml/code./p
+pNOTE: For security reasons, using the manager webapp is restricted to users with role manager-gui. The host-manager webapp is restricted to users with role admin-gui. Users are defined in code/etc/tomcat7/tomcat-users.xml/code./p
/body
/html
diff -Nru tomcat7-7.0.26/debian/patches/0012-java7-compat.patch tomcat7-7.0.26/debian/patches/0012-java7-compat.patch
--- tomcat7-7.0.26/debian/patches/0012-java7-compat.patch 1970-01-01 01:00:00.0 +0100
+++ tomcat7-7.0.26/debian/patches/0012-java7-compat.patch 2012-05-03 14:42:28.0 +0100
@@ -0,0 +1,27 @@
+Description: Compatibility patch to support compilation of tomcat7
+ using openjdk-7
+Author: James Page james.p...@ubuntu.com
+Forwarded: not-needed
+
+Index: tomcat7-7.0.26/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
+===
+--- tomcat7-7.0.26.orig/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java 2012-05-03 14:41:45.741927187 +0100
tomcat7-7.0.26/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java 2012-05-03 14:42:25.730122612 +0100
+@@ -28,6 +28,8 @@
+ import org.apache.juli.logging.Log;
+ import org.apache.juli.logging.LogFactory;
+
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
+
+ /**
+ * A DataSource that can be instantiated through IoC and implements the DataSource interface
+@@ -153,5 +155,7 @@
+ }
+ }
+
+-
++public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++throw new SQLFeatureNotSupportedException();
++}
+ }
diff -Nru tomcat7-7.0.26/debian/patches
Bug#671373: tomcat6: Support for paths with spaces in tomcat6-instance-create and multiple instances of system tomcat's
Package: tomcat6
Version: 6.0.35-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
- d/tomcat6-instance-create: Quote access to files and directories
so that spaces can be used when creating user instances.
- d/tomcat6.init: Make NAME dynamic, to allow starting multiple instances.
It would be great if these patches could be merged into the Debian packaging
so we can re-sync on the next set of updates
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-24-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJPoqPmAAoJEL/srsug59jDCoYQAMYbuCAUS44zizpgIRL4sSIZ
JSVbep+4+n8LNhIbiUE1WJR73FOEtZLHrtv+e6ZchuLAKzAFIewV8LxQsDvA7W3V
I0RbzYMOaUQSrfrDXyg8nmPel05LyciWQPNXmCJffcZyAWdireL0vvTjsod6X0Pb
3ubZIz7MBGGHWFnk7S7YILpEKd23bOhQ0u4nGjt8S2ybfbkkg1vEmuDjHZmb4PQo
Lc1rfIRsLUqHlcPo35BzLkTRInwuuohutSxcBE2csWG9bgcZjsQGnpsFEJGbxFHt
0815tPqgolUTqN7oNVGxuzaQWIt5jjG2l1DLFG1H0Vuxpj9ZntijV6gFajtSdAHj
SJF9FJr2P2MaT62mKteKm3vJZ9GZVaKLdBInn5/AnFi2JH9W59C5brRQv1vDiDYZ
icjyx6Uxu1sl2o0hIR/ocblT8c/siIKhkMKQ65LIrTkrRhF7ZzRC6WAKW+I2K3qn
5jOZTtF8ncWXUxPeu/NXrFmT4g4ZhcNRlWhweCWb1+ZwtrtXgtkTD6WKFLIeJnZo
k3rzXL/nikq/XVILS2HQljDbvrT1uuyird0cE5jrcWXMM22URDyB6MHeytgufjSx
E3pgriYpdk4IjYZMlmmsGCj7ylJiySpA4tEyJZ/dx6vK+jC9disr5ATyyBP03yvC
asDSUGZap/SNUbwn8dDz
=hDnW
-END PGP SIGNATURE-
diff -Nru tomcat6-6.0.35/debian/tomcat6.init tomcat6-6.0.35/debian/tomcat6.init
--- tomcat6-6.0.35/debian/tomcat6.init 2012-04-14 19:01:15.0 +0100
+++ tomcat6-6.0.35/debian/tomcat6.init 2012-05-03 16:03:43.0 +0100
@@ -23,7 +23,7 @@
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
-NAME=tomcat6
+NAME=$(basename $0 | sed 's/^[KS][0-9]\{2\}//')
DESC=Tomcat servlet engine
DEFAULT=/etc/default/$NAME
JVM_TMP=/tmp/tomcat6-$NAME-tmp
diff -Nru tomcat6-6.0.35/debian/tomcat6-instance-create tomcat6-6.0.35/debian/tomcat6-instance-create
--- tomcat6-6.0.35/debian/tomcat6-instance-create 2012-04-14 19:01:15.0 +0100
+++ tomcat6-6.0.35/debian/tomcat6-instance-create 2012-05-03 16:03:43.0 +0100
@@ -117,38 +117,38 @@
read answer
fi
-mkdir -p ${TARGET}
+mkdir -p ${TARGET}
-FULLTARGET=`cd ${TARGET} /dev/null pwd`
+FULLTARGET=`cd ${TARGET} /dev/null pwd`
-mkdir ${TARGET}/conf
-mkdir ${TARGET}/logs
-mkdir ${TARGET}/webapps
-mkdir ${TARGET}/work
-mkdir ${TARGET}/temp
-cp -r /usr/share/tomcat6/skel/* ${TARGET}
+mkdir ${TARGET}/conf
+mkdir ${TARGET}/logs
+mkdir ${TARGET}/webapps
+mkdir ${TARGET}/work
+mkdir ${TARGET}/temp
+cp -r /usr/share/tomcat6/skel/* ${TARGET}
# Create necessary symbolic links so that eclipse can be properly configured
-ln -s /usr/share/tomcat6/lib ${TARGET}/lib
-ln -s /usr/share/tomcat6/bin/bootstrap.jar ${TARGET}/bin/bootstrap.jar
+ln -s /usr/share/tomcat6/lib ${TARGET}/lib
+ln -s /usr/share/tomcat6/bin/bootstrap.jar ${TARGET}/bin/bootstrap.jar
-sed -i -e s/Connector port=\8080\/Connector port=\${HPORT}\/;s/Server port=\8005\ shutdown=\SHUTDOWN\/Server port=\${CPORT}\ shutdown=\${CWORD}\/ ${TARGET}/conf/server.xml
+sed -i -e s/Connector port=\8080\/Connector port=\${HPORT}\/;s/Server port=\8005\ shutdown=\SHUTDOWN\/Server port=\${CPORT}\ shutdown=\${CWORD}\/ ${TARGET}/conf/server.xml
-cat ${TARGET}/bin/startup.sh EOT
+cat ${TARGET}/bin/startup.sh EOT
#!/bin/sh
-export CATALINA_BASE=${FULLTARGET}
+export CATALINA_BASE=${FULLTARGET}
/usr/share/tomcat6/bin/startup.sh
echo Tomcat started
EOT
-cat ${TARGET}/bin/shutdown.sh EOT
+cat ${TARGET}/bin/shutdown.sh EOT
#!/bin/sh
-export CATALINA_BASE=${FULLTARGET}
+export CATALINA_BASE=${FULLTARGET}
/usr/share/tomcat6/bin/shutdown.sh
echo Tomcat stopped
EOT
-chmod a+x ${TARGET}/bin/startup.sh ${TARGET}/bin/shutdown.sh
+chmod a+x ${TARGET}/bin/startup.sh ${TARGET}/bin/shutdown.sh
echo * New Tomcat instance created in ${TARGET}
echo * You might want to edit default configuration in ${TARGET}/conf
echo * Run ${TARGET}/bin/startup.sh to start your Tomcat instance
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers.
Please use
debian-j...@lists.debian.org for discussions and questions.
[SCM] jenkins packaging branch, master, updated. debian/1.424.3+dfsg-1-11-gde57da4
The following commit has been merged in the master branch: commit 7dafa30a5a48dbfd2357864b18973d3deda7811a Merge: d8ab72cfbc161f46dab1e21a1b9f2b42b78c82cf bcff6b7d692e5fbac2ef83e882834a70c1f54bab Author: James Page james.p...@ubuntu.com Date: Thu Apr 26 14:09:39 2012 +0100 Merge tag 'upstream/1.447.1+dfsg' Upstream version 1.447.1+dfsg -- jenkins packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] jenkins packaging branch, master, updated. debian/1.424.3+dfsg-1-11-gde57da4
The following commit has been merged in the master branch:
commit de57da4b370a75391a562622379b9079abcb4c16
Author: James Page james.p...@ubuntu.com
Date: Wed May 2 15:13:30 2012 +0100
d/patches/build/remove-findbugs.patch: Drop findbugs annotations from the
codebase as this tool is not packaged for Debian.
diff --git a/debian/changelog b/debian/changelog
index d11bf93..3dfc6e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ jenkins (1.447.1+dfsg-1) unstable; urgency=low
- d/patches/build/build.patch: Allow building with Maven 2, this works
OK for this package as Maven 3 features are not used by the package
build process at the moment.
+- d/patches/build/remove-findbugs.patch: Drop findbugs annotations from
+ the codebase as this tool is not packaged for Debian.
- Refreshed all other patches.
- d/maven.ignoreRules, d/maven.properties: Disable unit testing and ignore
powermock dependencies until powermock is packaged.
@@ -17,7 +19,7 @@ jenkins (1.447.1+dfsg-1) unstable; urgency=low
packaged and let users know this feature is missing.
- d/control: Added new dependencies on libsisu-guice-java, libmockito-java.
- -- James Page james.p...@ubuntu.com Wed, 02 May 2012 15:10:44 +0100
+ -- James Page james.p...@ubuntu.com Wed, 02 May 2012 15:12:45 +0100
jenkins (1.424.6+dfsg-1) unstable; urgency=low
diff --git a/debian/patches/build/remove-findbugs.patch
b/debian/patches/build/remove-findbugs.patch
new file mode 100644
index 000..6aa27b0
--- /dev/null
+++ b/debian/patches/build/remove-findbugs.patch
@@ -0,0 +1,96 @@
+Description: The Debian build process does not run findbugs as
+ this is not packaged for Debian.
+ .
+ This patch removes all calls to the findbugs annotations package
+ as this is not packaged either.
+Author: James Page james.p...@ubuntu.com
+Forwarded: not-needed
+
+Index: jenkins/core/src/main/java/hudson/logging/LogRecorderManager.java
+===
+--- jenkins.orig/core/src/main/java/hudson/logging/LogRecorderManager.java
2012-04-26 14:09:39.199341012 +0100
jenkins/core/src/main/java/hudson/logging/LogRecorderManager.java
2012-04-30 12:26:52.355201214 +0100
+@@ -112,7 +112,6 @@
+ /**
+ * Configure the logging level.
+ */
+-
@edu.umd.cs.findbugs.annotations.SuppressWarnings(LG_LOST_LOGGER_DUE_TO_WEAK_REFERENCE)
+ public HttpResponse doConfigLogger(@QueryParameter String name,
@QueryParameter String level) {
+ Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
+ Level lv;
+Index: jenkins/core/src/main/java/hudson/util/PluginServletFilter.java
+===
+--- jenkins.orig/core/src/main/java/hudson/util/PluginServletFilter.java
2012-04-26 14:09:39.215341004 +0100
jenkins/core/src/main/java/hudson/util/PluginServletFilter.java
2012-04-30 12:27:25.555306327 +0100
+@@ -58,7 +58,6 @@
+ public PluginServletFilter() {
+ }
+
+-
@edu.umd.cs.findbugs.annotations.SuppressWarnings(ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD)
+ public void init(FilterConfig filterConfig) throws ServletException {
+ PluginServletFilter.filterConfig = filterConfig;
+ synchronized (LIST) {
+Index: jenkins/core/src/main/java/hudson/WebAppMain.java
+===
+--- jenkins.orig/core/src/main/java/hudson/WebAppMain.java 2012-04-26
14:09:39.195341014 +0100
jenkins/core/src/main/java/hudson/WebAppMain.java 2012-04-30
12:27:08.699252835 +0100
+@@ -260,7 +260,6 @@
+ /**
+ * Installs log handler to monitor all Hudson logs.
+ */
+-
@edu.umd.cs.findbugs.annotations.SuppressWarnings(LG_LOST_LOGGER_DUE_TO_WEAK_REFERENCE)
+ private void installLogger() {
+ Jenkins.logRecords = handler.getView();
+ Logger.getLogger(hudson).addHandler(handler);
+Index: jenkins/core/src/main/java/jenkins/model/Jenkins.java
+===
+--- jenkins.orig/core/src/main/java/jenkins/model/Jenkins.java 2012-04-26
14:09:39.219341002 +0100
jenkins/core/src/main/java/jenkins/model/Jenkins.java 2012-04-30
12:26:58.503220606 +0100
+@@ -670,7 +670,6 @@
+ * @param pluginManager
+ * If non-null, use existing plugin manager. create a new one.
+ */
+-@edu.umd.cs.findbugs.annotations.SuppressWarnings(SC_START_IN_CTOR) //
bug in FindBugs. It flags UDPBroadcastThread.start() call but that's for
another class
+ protected Jenkins(File root, ServletContext context, PluginManager
pluginManager) throws IOException, InterruptedException, ReactorException {
+ // As hudson is starting, grant this process full control
+ SecurityContextHolder.getContext().setAuthentication(ACL.SYSTEM);
+@@ -2871,7 +2870,6 @@
+ /**
+ * For debugging. Expose URL
[SCM] jenkins packaging branch, pristine-tar, updated. 61e548de473e6677c5bd2a76d5308fe1d32736a4
The following commit has been merged in the pristine-tar branch: commit 61e548de473e6677c5bd2a76d5308fe1d32736a4 Author: James Page james.p...@ubuntu.com Date: Thu Apr 26 14:09:38 2012 +0100 pristine-tar data for jenkins_1.447.1+dfsg.orig.tar.gz diff --git a/jenkins_1.447.1+dfsg.orig.tar.gz.delta b/jenkins_1.447.1+dfsg.orig.tar.gz.delta new file mode 100644 index 000..aeeab84 Binary files /dev/null and b/jenkins_1.447.1+dfsg.orig.tar.gz.delta differ diff --git a/jenkins_1.447.1+dfsg.orig.tar.gz.id b/jenkins_1.447.1+dfsg.orig.tar.gz.id new file mode 100644 index 000..9f65b86 --- /dev/null +++ b/jenkins_1.447.1+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +bcff6b7d692e5fbac2ef83e882834a70c1f54bab -- jenkins packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] jenkins packaging annotated tag, debian/1.447.1+dfsg-1, created. debian/1.447.1+dfsg-1
The annotated tag, debian/1.447.1+dfsg-1 has been created at c8295e38f2fd7dc7750fb787fa6987e626170a4f (tag) tagging de57da4b370a75391a562622379b9079abcb4c16 (commit) replaces debian/1.424.3+dfsg-1 tagged by James Page on Wed May 2 15:14:27 2012 +0100 - Shortlog Debian release 1.447.1+dfsg-1 James Page (11): Switch upstart configuration to use start-stop-daemon to allow desktop systems to shutdown. Imported Upstream version 1.424.6+dfsg Merge tag 'upstream/1.424.6+dfsg' New upstream release, fixing XSS security vulnerability (Closes: #664057): Switch upstart configurations to use start-stop-daemon to allow Tidied up NEWS file Annotated patch Imported Upstream version 1.447.1+dfsg Merge tag 'upstream/1.447.1+dfsg' New upstream release: d/patches/build/remove-findbugs.patch: Drop findbugs annotations from the codebase as this tool is not packaged for Debian. --- -- jenkins packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
