Bug#745815: libjarjar-java: generate jars with invalid information
Hi Miguel, hi Emmanuel ! Sorry to come back to you so late... 2014-05-03 19:50 GMT+02:00 Miguel Landaeta nomad...@debian.org: On Sat, May 03, 2014 at 07:30:20PM +0200, Emmanuel Bourg wrote: Le 03/05/2014 18:41, Miguel Landaeta a écrit : Well, the bug was not introduced by upstream as I thought. I can only reproduce this bug when patch szzepiq_jar_resources.diff is applied. When I remove that patch, jarjar works OK for me. Interesting, the question is to know what issue this patch fixed. There is no mention of a bug in the changelog. However, the patch itself contains these headers: Description: Create patch from fork at URL: https://github.com/szczepiq/jarjar. which resolve the issue with jarjar not updating the fully qualified class names in the jar's resources. For instance, with this patch jarjar is able to replace classname (based on requested rules) in META-INF/plexus/components.xml files. Source: https://github.com/szczepiq/jarjar Author: Szczepan Faber Author: Damien Raude-Morvan draz...@debian.org Last-Update: 2013-01-08 Damien, do you remember what issue fixed this patch in jarjar package? I think there is a serious issue with this patch. Any file not matching .class, .java or MANIFEST.MF ends being treated like a text file so it ends modifying .groovy, .png, .properties, anything under META-INF, etc. I've cherry-picked this patch after having issues with some maven plugins but you're right it might introduce more issues than it solved. They were repacking themself using jarjar but it won't update references in META-INF/plexus/components.xml. As you can see from Gradle debian/changelog : gradle (1.4-1) unstable; urgency=low * d/control: Build-Depends on libjarjar-java (= 1.4+svn142-1) to build Gradle with jarjar which handle correctly updating the fully qualified class names in the jar's resources. Otherwise, we get errors during plexus startup. Maybe recent releases of Gradle might not needed this tricks anymore. Cheers, -- Damien - Debian Developper http://wiki.debian.org/DamienRaudeMorvan __ 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#721474: Please provide Maven artifacts with debian or 2.x version
Hi Emmanuel, 2013/9/1 Emmanuel Bourg ebo...@apache.org Le 01/09/2013 03:26, Miguel Landaeta a écrit : A POM file with 'debian' or '2.x' version should be provided with this package. The Maven plugins don't have a generic 'debian' or 1.x version, but I'm not sure to understand why. Ludovic, Damien, do you remember the reason behind this choice ? IIRC, it was an issue with Maven 2.x handling of plugin default version : Maven use a super-pom (embeded inside maven-core.jar AFAIK) which enforce versions of some plugins when user doesn't define a specific version. Maybe we should recheck this behavior with new Maven 3.x dependency handling... Cheers, -- Damien - Debian Developper http://wiki.debian.org/DamienRaudeMorvan __ 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#719415: gradle: FTBFS: build hangs during codenarc steps
Hi Miguel, FTR, I'm working on git repository right now and I've create a new patch to skip codeNarcMain task. Chers, __ 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#712100: maven compiler plugin default source version
Hi Yohann, 2013/6/13 Yohann Martineau yohann.martin...@gmail.com Hello, On a fresh debian-wheezy install, I installed default openjdk and maven packages from standard debian repository and tried to build an already existing maven java project. This project uses java annotations. I got the following error: maven debian generics are not supported in -source 1.3 As debian maven version is maven-3.0.4-3, I thought default source version would be at least java 1.5. I removed debian maven package and installed apache-maven-3.0.5 from apache.org, and had no issue, project built as expected. I kept the default debian java package. I did not wrote a tiny java project using annotations as a demo for this issue but it should be the same on any project using annotations. Maven core delegates all compilation tasks to a plugin, maven-compiler-plugin. Each version of maven-compiler-plugin define its own default source and target version, which you can override in you pom.xml. In this case, upstream (apache.org) provide more recent default version of this plugin than Debian package : Debian Wheezy has only 2.0.2 version whereas Maven from apache.org provide at least 2.3 (AFAIK). It's not ideal situation but it's difficult to do otherwise : we support both Maven 3.x and Maven 2.x series inside Debian... I can give you two advices : - Always define your source and target version (otherwise it might depends on installed JDK) http://maven.apache.org/plugins/maven-compiler-plugin/examples/set-compiler-source-and-target.html - It's also recommended to define version of each used plugin (IIRC, Maven 3.x will print a warning if version is not set explicitly in your pom.xml) I'll keep this bug open for other users to find a quick solution to their issues and for me to find a solution to find a workaround. Cheers, -- Damien - Debian Developper http://wiki.debian.org/DamienRaudeMorvan __ 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#666851: Apache 2.4 upload date scheduled for May 30
Hi Arno and Tony, 2013/5/30 Arno Töll a...@debian.org Hi Tony, On 30.05.2013 22:30, tony mancill wrote: I'll take a look at updating the package tonight based on Damien's work on libapache-mod-jk 1:1.2.35-1. Or if you have a debdiff ready to go, please attach it to the bug report. No need for an NMU. no I don't, but I had the same plan as you, that is to take the existing package in Experimental and possibly upload that to Sid. I was planning to work on this package tomorow evening, but no problem if you beat me (merging back changes done in 1.2.35-1 should do it). Cheers, -- Damien - Debian Developper http://wiki.debian.org/DamienRaudeMorvan __ 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#707298: libcglib-java: code changes break libmockito-java
Hi Stefan, 2013/5/8 Stefan Denker stefan+deb...@dn-kr.de Dear Maintainer, The current version of libcglib in debian breaks the libmockito-java package. I've put together a test class (With code taken from http://docs.mockito.googlecode.com/hg/latest/org/mockito/Mockito.html#13 ) |List list = new LinkedList(); |List spy = spy(list); | |// using the spy calls real methods |spy.add(one); |spy.add(two); Trying to run this yields : |java.lang.RuntimeException: Unable to set MockitoNamingPolicy on cglib generator which creates FastClasses |at org.mockito.internal.creation.cglib.CGLIBHacker.setMockitoNamingPolicy(CGLIBHacker.java:29) |at org.mockito.internal.creation.MethodInterceptorFilter.intercept(MethodInterceptorFilter.java:42) |at $java.util.LinkedList$$EnhancerByMockitoWithCGLIB$$440d9615.add(generated) |at testSpy.spying(testSpy.java:17) |Caused by: java.lang.NullPointerException |at org.mockito.internal.creation.cglib.CGLIBHacker.setMockitoNamingPolicy(CGLIBHacker.java:23) Downgrading libcglib to 2.2+dfsg-2 (squeeze) fixes this. Browsing the changes in cglib, I traced this down to the MethodProxy.java class, particularly this change: http://cglib.cvs.sourceforge.net/viewvc/cglib/cglib/src/proxy/net/sf/cglib/proxy/MethodProxy.java?r1=1.14r2=1.15 I believe the change was accidental, so the attached patch restores the old behaviour. Applying it to libcglib-java makes my test run. This is just a workaround, but it is the minimal change to get Mockito working again in Debian. Thanks for your analysis of this issue and your provided workaround. I'm a bit reluctant to apply your patch as-is because, in fact, upstream added createInfo = null; to fix http://sourceforge.net/p/cglib/bugs/28/ I'll check with them how to fix this properly... Regards, -- Damien __ 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#666851: Apache 2.4 transition is ready in VCS
tag 666851 + pending thanks I've already worked on transition (see here : http://packages.qa.debian.org/liba/libapache-mod-jk/news/20120404T205024Z.html ) so I'm just waiting for a GO before uploading to experimental. Regards, -- Damien - Debian Developper http://wiki.debian.org/DamienRaudeMorvan __ 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#633958: libjaffl-java: Library does not declare any dependencies and hence does not work correctly
Hi James ! libjaffl-java does not declare any dependencies on other Java libraries; however it needs at least libjffl-java and libasm3-java to work correctly. It may also need libjnr-x86asm-java but I did not have issues with that being missing. This should be fixed by 0.5.9-3 upload in unstable. Could you please check ? Cheers, -- Damien signature.asc Description: This is a digitally signed message part. __ 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#699352: please update to 1.7R4
Hi Thomas, Le jeudi 14 février 2013 20:13:49, Thomas Koch a écrit : The git repo of rhino is now at http://git.debian.org/?p=pkg-java/rhino.git Thanks! I've merged upstreams 1.7R4 tag from github. Upstream now just links to the tag download link of github instead of uploading a tarball somewhere. Therefor I've not imported anything to pristine-tar for 1.7R4. The thing even builds! Please have a look, test and probably upload to experimental. I'll test whether I can build closure-compiler against 1.7R4. After some round of testing your update to 1.7R4 seems to work (some old bugs reported by Debian users where closed upstream!), so I've uploaded to experimental. BTW, I've removed code from old SVN repository. Regards, -- Damien - Debian Developper http://wiki.debian.org/DamienRaudeMorvan __ 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#699352: please update to 1.7R4
Hi, Le mercredi 30 janvier 2013 15:53:04, Thomas Koch a écrit : closure compiler (which is a dep of gerrit) depends on version 1.7R4 + patches of rhino. Closure compiler keeps the source tree of rhino in its own SVN because it had some patches at a time. But at the moment there's no relevant difference between mozillas master branch and the code copy of closure compiler. Many projects use modified / forks of Rhino source code :/ In any case I want to build closure compiler using the Debian package of Rhino and not the copy of the rhino source in the closure compilers SVN. Would you like if I'd migrate the packaging repo from SVN to Git? Rhino upstream uses Git and you could track upstreams Git in your packaging repo. Yes, please ! If you have time, please migrate Rhino package to a Git repository. Would you like if I'd make a watch file for Rhino? Same apply as above :) Thanks, -- Damien - Debian Developper http://wiki.debian.org/DamienRaudeMorvan signature.asc Description: This is a digitally signed message part. __ 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#667077: Update
Hi, On Mon, 03 Dec 2012 05:30:59 -0800, shawnland...@gmail.com wrote: Can you post your work on this so that I can do some work that depends on this without replicating your work? WiP packages are here : http://people.debian.org/~drazzib/gradle/ I've started working on gradle 1.3 in git : http://anonscm.debian.org/gitweb/?p=pkg-java/gradle.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#690204: Add no-await trigger support and Breaks to fix ca-certificates-java breakage
Hi Don! Your fix seems sensible - at least from my quick review : I lack time to properly maintain ca-certificate-java right now, so thanks for your time. Small question : is your fix targeted for wheezy ? maybe you should also contact release team in advance to check if they are ok with this. Regards, On 13/11/2012 22:18, Don Armstrong wrote: Control: tag -1 patch Please find the attached patches which fix this problem. I've tested them a bit, but please review them. ca-certificates (20121112+nmu1) unstable; urgency=low * Non-maintainer upload * Breaks ca-certificates-java (20121112+nmu1); partially fixing #537051. * Provide update-ca-certificates and update-ca-certificates-fresh triggers. * Call the triggers using no-await so that the configuration files from the newer version of ca-certificates-java are in places before the upgrade. Closes: #537051. ca-certificates-java (20121112+nmu1) unstable; urgency=low * Non-maintainer upload * Fix test for dpkg-query in postinst; there was an extraneous --version here. [Probably don't even need to bother to check for dpkg-query, but why not.] (Closes: #690204) * Library path for softokn3pkg and nsspkg is potentially wrong if there are multiple different paths; fix it. * Do not run the hook if ca-certificates-java has been removed but not purged. * Use the new trigger support provided by ca-certificates (=20121112). -- Don Armstrongd...@debian.org Mon, 12 Nov 2012 15:45:50 -0800 I plan on uploading an NMU for ca-certificates-java as soon as I have an ACK from the ca-certificates team that the fix looks reasonable (unless I hear from ca-certificates-java that they want to do it.) [I can also upload a fixed ca-certificates and pull my changes into ca-certificates unless y'all want to handle that.] Don Armstrong -- Damien __ 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#637273: Gradle doesn't work with Groovy 1.8.x
Hi, AFAIK, support for Groovy 1.8.x is not a priority for upstream until after 1.0 release, so it doesn't make sense to hold Groovy 1.8.x from entering unstable. The maintainance of this package will continue when upstream make a suitable release. A new version a Gradle is being packaged (1.1) which work with Groovy 1.8 but this new release also need new upstream releases of dependencies' packages [1]. So, for Wheezy, I think we have to drop Gradle (and maybe re-add it latter throught backport) [1] http://lists.debian.org/debian-java/2012/08/msg00062.html -- Damien __ 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#685516: libtcnative-1: Tomcat 7 requires newer libtcnative (at least version 1.1.24)
Hi Tony, On 22/08/2012 07:23, tony mancill wrote: On 08/21/2012 07:31 AM, Peter De Wachter wrote: Package: libtcnative-1 Version: 1.1.23-1 Severity: important Dear Maintainer, When starting Tomcat 7 (Debian version 7.0.28-2) with this version of libtcnative, the following error message is logged: SEVERE: An incompatible version 1.1.23 of the APR based Apache Tomcat Native library is installed, while Tomcat requires version 1.1.24 Hello Peter, Thank you for taking the time to report this bug. We can certainly do a better job of coordinating uploads of new upstream versions of tomcat-native and tomcat in the future. In this case, it didn't take long for tomcat7 to require the latest version of tomcat-native (tcn 1.1.24 was released on 2012/06/13 and tomcat 7.0.28 just 6 days later). I have built a copy of upstream 1.1.24 to get a look at the differences between the upstream source versions. The upstream source differences are fairly minimal - about 95% of the diff consists of the configure script and documentation changes - but we'll have to see if we can get a freeze exception to allow the newer version of tomcat-native into wheezy and I want to coordinate with Damien before uploading to unstable. I've checked diff between 1.1.23 / 1.1.24 and it seems, as you say, pretty small. But one modification seems dangerous : in jni/native/include/tcn.h, tcn_socket_t got two new fields last_active and timeout. Are you sure this change is backward compatible ? at least with tomcat 6.x package... All others modifications are just new handling of timeout on pooler connection... Cheers, -- Damien __ 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#684815: Bug#684841: wagon2: FTBFS: missing org.bouncycastle:bcprov:jar:debian
Like for #684841, maybe there is a missing versionned depends on libbcprov-java (since I need at least 1.44+dfsg-3 with maven artifacts) but I'm now waiting for a fix for #678904 to allow transition of new bouncycastle to wheezy. Cheers, -- Damien - Debian Developper http://wiki.debian.org/DamienRaudeMorvan __ 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#678904: bouncycastle: FTBFS with gcj
Hi all, I haven't seen that bouncycastle package was under pkg-java team maintainance, so I'll fix this myself (Team upload) and prepare a new upload real soon now. Cheers, On 17/08/2012 00:26, Damien Raude-Morvan wrote: reopen 678904 found 678904 1.46+dfsg-6 thanks Hi, It seems that bouncycastle still FTBFS with GCJ after 1.46+dfsg-6 upload. However, this is a different failure : [...] [javac] 822. ERROR in /build/buildd-bouncycastle_1.46+dfsg-6-kfreebsd- amd64-0I1Ozr/bouncycastle-1.46+dfsg/build/artifacts/jdk1.5/bcprov- jdk15-146/src/org/bouncycastle/jce/ECPointUtil.java [javac] (at line 3) [javac]import java.security.spec.ECFieldF2m; [javac] ^ [javac] The import java.security.spec.ECFieldF2m cannot be resolved [...] So there is some missing classes from GCJ classpath, like java.security.spec.ECFieldF2m (linked to elliptic curve ciffer which is in JDK API since 1.5). For now, so you might to Build-Depends on default-jdk (= 1:1.6) and request removal of binaries on kfreebsd-* Regards, -- Damien - Debian Developper http://wiki.debian.org/DamienRaudeMorvan __ 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#684841: wagon2: FTBFS: missing org.bouncycastle:bcprov:jar:debian
Hi, On 14/08/2012 09:36, Lucas Nussbaum wrote: Missing: -- 1) org.bouncycastle:bcprov:jar:debian Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.bouncycastle -DartifactId=bcprov -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.bouncycastle -DartifactId=bcprov -Dversion=debian -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.maven.wagon:wagon-ssh-external:jar:2.2 2) org.bouncycastle:bcprov:jar:debian Maybe there is a missing versionned depends on libbcprov-java (since I need at least 1.44+dfsg-3 with maven artifacts) but I'm now waiting for a fix for #678904 to allow transition of new bouncycastle to wheezy. Thanks for you report. -- Damien __ 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#685025: jsvc fails to load libcap.so.2 on amd64
Hi, On 16/08/2012 08:20, tony mancill wrote: On 08/15/2012 03:14 PM, Tristan Seligmann wrote: Package: jsvc Version: 1.0.10-2 Severity: important Tags: upstream jsvc fails with this error: failed loading capabilities library -- /usr/lib/libcap.so: cannot open shared object file: No such file or directory. Hello Tristan, Thank you for reporting this bug. Damien and Marcus, I committed updates for -3 of the package the packaging repo including the patch available in JIRA, but wanted to coordinate with you before uploading to unstable. I am assuming this we may want to request an unblock request for this package since the bug exists in the version in wheezy. tony, I've just reviewed your changes, it seems ok for my point of view (seems a sensible default to use dlopen default search path :). You can upload your changes and request an unblock. Cheers, -- Damien __ 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#678904: bouncycastle: FTBFS with gcj
reopen 678904 found 678904 1.46+dfsg-6 thanks Hi, It seems that bouncycastle still FTBFS with GCJ after 1.46+dfsg-6 upload. However, this is a different failure : [...] [javac] 822. ERROR in /build/buildd-bouncycastle_1.46+dfsg-6-kfreebsd- amd64-0I1Ozr/bouncycastle-1.46+dfsg/build/artifacts/jdk1.5/bcprov- jdk15-146/src/org/bouncycastle/jce/ECPointUtil.java [javac] (at line 3) [javac] import java.security.spec.ECFieldF2m; [javac]^ [javac] The import java.security.spec.ECFieldF2m cannot be resolved [...] So there is some missing classes from GCJ classpath, like java.security.spec.ECFieldF2m (linked to elliptic curve ciffer which is in JDK API since 1.5). For now, so you might to Build-Depends on default-jdk (= 1:1.6) and request removal of binaries on kfreebsd-* Regards, -- Damien - Debian Developper http://wiki.debian.org/DamienRaudeMorvan signature.asc Description: This is a digitally signed message part. __ 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#679616: jenkins: Please package a more recent upstream version
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 ? Cheers, -- Damien __ 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#678379: [ca-certificates-java] Installation fails on non-english characters in certificate names
Hi Antonio, This is known limitation of ca-certificate-java version in Squeeze. This is now fixed in Wheezy / Sid package but I don't know if we can backport this fix to Squeeze version (as simple workaround is to rename actual certificate to remove any Unicode char from filename). Le 21/06/2012 12:16, Antonio Marcos López Alonso a écrit : Package installation fails when addind/removing certs with non-english characters in their names. For instance: error adding mozilla/AC_RaÃz_Certicámara_S.A..crt Regards, Antonio __ 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#677814: Bug#670901: Spring: Multiple security issues
Hi Moritz, Le lundi 30 avril 2012 09:55:39, Moritz Muehlenhoff a écrit : CVE-2011-2730 seems to affect libspring-2.5-java? If so, please clone or reassign as needed. I've prepared an upload of libspring-2.5-java for squeeze to fix CVE-2011-2730. You can find it on http://people.debian.org/~drazzib/security/ Could you please review it ? Cheers, -- Damien - Debian Developper http://wiki.debian.org/DamienRaudeMorvan signature.asc Description: This is a digitally signed message part. __ 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] r16070 - in trunk/libxstream-java/debian: . patches
Author: drazzib
Date: 2012-05-28 22:24:17 + (Mon, 28 May 2012)
New Revision: 16070
Added:
trunk/libxstream-java/debian/build.properties
trunk/libxstream-java/debian/build.xml
trunk/libxstream-java/debian/manifest
trunk/libxstream-java/debian/maven.ignoreRules
Removed:
trunk/libxstream-java/debian/patches/01_fix_classpath.diff
Modified:
trunk/libxstream-java/debian/changelog
trunk/libxstream-java/debian/control
trunk/libxstream-java/debian/libxstream-java.poms
trunk/libxstream-java/debian/maven.rules
trunk/libxstream-java/debian/patches/series
trunk/libxstream-java/debian/rules
Log:
* Update Standards-Version: 3.9.3.
* New upstream release:
- Add Build-Depends on libstax-java, libwoodstox-java, libstax2-api-java
and libkxml2-java (and Suggests).
* Use maven-ant-helper for build:
- Add Build-Depends on maven-ant-helper.
- New debian/build.xml.
- Drop patch on MANIFEST.MF update and use jh_manifest.
- Add Build-Depends on javahelper.
* Add myself as Uploader.
Added: trunk/libxstream-java/debian/build.properties
===
--- trunk/libxstream-java/debian/build.properties
(rev 0)
+++ trunk/libxstream-java/debian/build.properties 2012-05-28 22:24:17 UTC
(rev 16070)
@@ -0,0 +1,7 @@
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5
+
+javadoc.dir=target/api
+build.sourceDirectory=src/java
+classpath.compile=\
+ ${basedir}/xstream/build/xstream-${version}.jar
\ No newline at end of file
Added: trunk/libxstream-java/debian/build.xml
===
--- trunk/libxstream-java/debian/build.xml (rev 0)
+++ trunk/libxstream-java/debian/build.xml 2012-05-28 22:24:17 UTC (rev
16070)
@@ -0,0 +1,47 @@
+?xml version=1.0?
+
+project name=xstream default=package basedir=..
+
+ property file=debian/build.properties/
+ property name=maven.build
value=/usr/share/maven-ant-helper/maven-build.xml/
+ property file=/usr/share/maven-ant-helper/maven-defaults.properties/
+
+ macrodef name=cleanmodule
+attribute name=dir/
+sequential
+ ant target=clean antfile=${maven.build} dir=@{dir}
+property name=debian.dir location=debian /
+property name=project.dir value=@{dir} /
+ /ant
+/sequential
+ /macrodef
+
+ macrodef name=packagemodule
+attribute name=dir/
+sequential
+ ant target=package antfile=${maven.build} dir=@{dir}
+property name=debian.dir location=debian /
+property name=project.dir value=@{dir} /
+ /ant
+/sequential
+ /macrodef
+
+ target name=clean
+delete dir=build/
+cleanmodule dir=xstream//
+cleanmodule dir=xstream-benchmark//
+ /target
+
+ target name=package
+packagemodule dir=xstream//
+ packagemodule dir=xstream-benchmark//
+ /target
+
+ target name=javadoc
+javadoc destdir=${javadoc.dir}
+ packageset dir=xstream/src/java//
+ packageset dir=xstream-benchmark/src/java//
+/javadoc
+ /target
+
+/project
Modified: trunk/libxstream-java/debian/changelog
===
--- trunk/libxstream-java/debian/changelog 2012-05-27 14:45:43 UTC (rev
16069)
+++ trunk/libxstream-java/debian/changelog 2012-05-28 22:24:17 UTC (rev
16070)
@@ -1,11 +1,22 @@
-libxstream-java (1.3.1-8) UNRELEASED; urgency=low
+libxstream-java (1.4.2-1) unstable; urgency=low
- * Team upload.
+ [ tony mancill ]
* Remove Michael Koch from Uploaders (Closes: #654106)
- * Update Standards-Version: 3.9.2.
+ * Update Standards-Version: 3.9.3.
- -- tony mancill tmanc...@debian.org Sat, 14 Jan 2012 10:26:44 -0800
+ [ Damien Raude-Morvan ]
+ * New upstream release:
+- Add Build-Depends on libstax-java, libwoodstox-java, libstax2-api-java
+ and libkxml2-java (and Suggests).
+ * Use maven-ant-helper for build:
+- Add Build-Depends on maven-ant-helper.
+- New debian/build.xml.
+- Drop patch on MANIFEST.MF update and use jh_manifest.
+- Add Build-Depends on javahelper.
+ * Add myself as Uploader.
+ -- Damien Raude-Morvan draz...@debian.org Mon, 28 May 2012 23:14:16 +0200
+
libxstream-java (1.3.1-7) unstable; urgency=low
* Switch to source format 3.0.
Modified: trunk/libxstream-java/debian/control
===
--- trunk/libxstream-java/debian/control2012-05-27 14:45:43 UTC (rev
16069)
+++ trunk/libxstream-java/debian/control2012-05-28 22:24:17 UTC (rev
16070)
@@ -2,21 +2,45 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Torsten Werner twer...@debian.org, Varun Hiremath
va...@debian.org
-Build-Depends: debhelper (= 7), cdbs
-Build-Depends-Indep: ant, default-jdk, libxom-java, libjoda-time-java,
- libjettison-java, libcglib-java
[pkg-java] r16071 - in tags/libxstream-java: . 1.4.2-1/debian 1.4.2-1/debian/patches
) unstable; urgency=low
-
- * Add missing dependencies to Depends and Suggests
-
- -- Ludovic Claude ludovic.cla...@laposte.net Fri, 14 Aug 2009 23:30:34
+0100
-
-libxstream-java (1.3.1-3) unstable; urgency=low
-
- * Upload to unstable.
-
- -- Torsten Werner twer...@debian.org Sun, 09 Aug 2009 12:57:52 +0200
-
-libxstream-java (1.3.1-2) experimental; urgency=low
-
- * Change section to java
- * Bump up Standards-Version to 3.8.2
- * Add ${misc:Depends} to Depends to clear Lintian warnings
- * Remove Depends on Java runtimes as it is a library
- * Add the Maven POM to the package
- * Add a Build-Depends-Indep dependency on maven-repo-helper
-
- -- Ludovic Claude ludovic.cla...@laposte.net Tue, 28 Jul 2009 20:51:09
+0100
-
-libxstream-java (1.3.1-1) unstable; urgency=low
-
- * New upstream release
- * Minor cleanups
-
- -- Torsten Werner twer...@debian.org Thu, 01 Jan 2009 01:20:34 +0100
-
-libxstream-java (1.3-4) unstable; urgency=low
-
- * Fix java bytecode / java runtime version mismatch by setting -source
-and -target to 1.5 (Closes: #503789)
-
- -- Varun Hiremath va...@debian.org Sat, 01 Nov 2008 11:41:26 -0400
-
-libxstream-java (1.3-3) unstable; urgency=low
-
- * Really move package to main.
-
- -- Torsten Werner twer...@debian.org Mon, 11 Aug 2008 18:13:41 +0200
-
-libxstream-java (1.3-2) unstable; urgency=low
-
- * Build package with OpenJDK now.
- * Move package to main.
- * Bump Standards-Version: 3.8.0 (no changes needed).
-
- -- Torsten Werner twer...@debian.org Mon, 11 Aug 2008 17:50:31 +0200
-
-libxstream-java (1.3-1) unstable; urgency=low
-
- * New upstream release
- * Add myself to Uploaders
- * Bump Standards-Version to 3.7.3
- * Remove patches/encoding.diff - not required
-
- -- Varun Hiremath va...@debian.org Thu, 28 Feb 2008 15:30:34 +0530
-
-libxstream-java (1.2.2-1) unstable; urgency=low
-
- * initial version (Closes: #453149)
-
- -- Torsten Werner twer...@debian.org Sat, 24 Nov 2007 00:01:40 +0100
Copied: tags/libxstream-java/1.4.2-1/debian/changelog (from rev 16070,
trunk/libxstream-java/debian/changelog)
===
--- tags/libxstream-java/1.4.2-1/debian/changelog
(rev 0)
+++ tags/libxstream-java/1.4.2-1/debian/changelog 2012-05-28 22:30:16 UTC
(rev 16071)
@@ -0,0 +1,120 @@
+libxstream-java (1.4.2-1) unstable; urgency=low
+
+ [ tony mancill ]
+ * Remove Michael Koch from Uploaders (Closes: #654106)
+ * Update Standards-Version: 3.9.3.
+
+ [ Damien Raude-Morvan ]
+ * New upstream release:
+- Add Build-Depends on libstax-java, libwoodstox-java, libstax2-api-java
+ and libkxml2-java (and Suggests).
+ * Use maven-ant-helper for build:
+- Add Build-Depends on maven-ant-helper.
+- New debian/build.xml.
+- Drop patch on MANIFEST.MF update and use jh_manifest.
+- Add Build-Depends on javahelper.
+ * Add myself as Uploader.
+
+ -- Damien Raude-Morvan draz...@debian.org Mon, 28 May 2012 23:14:16 +0200
+
+libxstream-java (1.3.1-7) unstable; urgency=low
+
+ * Switch to source format 3.0.
+ * Update Standards-Version: 3.9.1.
+
+ -- Torsten Werner twer...@debian.org Thu, 18 Aug 2011 15:01:00 +0200
+
+libxstream-java (1.3.1-6) unstable; urgency=low
+
+ [ Onkar Shinde ]
+ * debian/control
+- Add quilt build dependency.
+ * debian/rules
+- Include patchsys-quilt.mk rule.
+ * debian/patches/01_fix_classpath.diff
+- Add appropriate jar files in classpath using manifest attribute.
+ (LP: #457660)
+ * debian/patches/series
+- Create new and include the new patch added.
+ * debian/README.source
+- Add to comply with policy.
+
+ [ Michael Koch ]
+ * Added myself to Uploaders.
+
+ -- Michael Koch konque...@gmx.de Wed, 04 Nov 2009 21:10:05 +0100
+
+libxstream-java (1.3.1-5) unstable; urgency=low
+
+ * Switch to default-jdk
+ * Build-Depends: replace cglib2.1 with cglib (Closes: #550613)
+ * Bump Standards-Version to 3.8.3
+ * Bump dh compat to 7
+
+ -- Varun Hiremath va...@debian.org Thu, 15 Oct 2009 14:35:55 -0400
+
+libxstream-java (1.3.1-4) unstable; urgency=low
+
+ * Add missing dependencies to Depends and Suggests
+
+ -- Ludovic Claude ludovic.cla...@laposte.net Fri, 14 Aug 2009 23:30:34
+0100
+
+libxstream-java (1.3.1-3) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Torsten Werner twer...@debian.org Sun, 09 Aug 2009 12:57:52 +0200
+
+libxstream-java (1.3.1-2) experimental; urgency=low
+
+ * Change section to java
+ * Bump up Standards-Version to 3.8.2
+ * Add ${misc:Depends} to Depends to clear Lintian warnings
+ * Remove Depends on Java runtimes as it is a library
+ * Add the Maven POM to the package
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+
+ -- Ludovic Claude ludovic.cla...@laposte.net Tue, 28 Jul 2009 20:51:09
+0100
+
+libxstream-java (1.3.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Minor cleanups
+
+ -- Torsten Werner twer...@debian.org
[SCM] Debian packaging for libcommons-lang3-java branch, master, updated. debian/3.0.1-1-6-ge78f967
The following commit has been merged in the master branch:
commit 622349ecaf38db63685d92bdc4e19bc483e7ea5e
Author: Damien Raude-Morvan draz...@debian.org
Date: Fri Dec 16 23:35:49 2011 +0100
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index bc17eb7..0a8faaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libcommons-lang3-java (3.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Damien Raude-Morvan draz...@debian.org Fri, 16 Dec 2011 23:35:26 +0100
+
libcommons-lang3-java (3.0.1-1) unstable; urgency=low
* Initial release (Closes: #642333).
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index db07259..632043a 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -3,14 +3,8 @@
VERSION=$2
TAR=../libcommons-lang3-java_$VERSION.orig.tar.gz
DIR=libcommons-lang3-java-$VERSION
-TAG=$(echo libcommons-lang3-java-$VERSION | sed -re's/~(alpha|beta)/-\1-/')
+TAG=$(echo LANG_$VERSION | sed -re's/\./_/')
svn export http://svn.apache.org/repos/asf/commons/proper/lang/tags/${TAG} $DIR
GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
rm -rf $DIR ../$TAG
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir echo moved $TAR to $origDir
-fi
diff --git a/debian/watch b/debian/watch
index 2c63deb..9ebe27d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
-opts=uversionmangle=s/-(alpha|beta)-/~$1/ \
+opts=uversionmangle=s/_/./ \
http://svn.apache.org/repos/asf/commons/proper/lang/tags/ \
- libcommons-lang3-java-(\d.*)/ debian debian/orig-tar.sh
+ LANG_([\d_]*)/ debian debian/orig-tar.sh
--
Debian packaging for libcommons-lang3-java
___
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] Debian packaging for libcommons-lang3-java branch, master, updated. debian/3.0.1-1-6-ge78f967
The following commit has been merged in the master branch: commit e260426f6d32c30f362618529f870237deda0c56 Author: Damien Raude-Morvan draz...@debian.org Date: Sun May 27 13:45:27 2012 +0200 d/poms: Pass --java-lib to force install of JAR into /usr/share/java/. diff --git a/debian/changelog b/debian/changelog index 1290c2f..78fc153 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libcommons-lang3-java (3.1-1) UNRELEASED; urgency=low * Diable failing test SystemUtilsTest#testGetUserHome because it depends on current user $HOME (which is not mounted inside buildd chroot) (Closes: #674392). + * d/poms: Pass --java-lib to force install of JAR into /usr/share/java/. -- Damien Raude-Morvan draz...@debian.org Fri, 16 Dec 2011 23:35:26 +0100 diff --git a/debian/libcommons-lang3-java.poms b/debian/libcommons-lang3-java.poms index 93706bb..8516e3c 100644 --- a/debian/libcommons-lang3-java.poms +++ b/debian/libcommons-lang3-java.poms @@ -23,4 +23,4 @@ # it will be installed with mh_install. # --classifier=classifier: Optional, the classifier for the jar. Empty by default. # -pom.xml --no-parent --has-package-version +pom.xml --no-parent --has-package-version --java-lib -- Debian packaging for libcommons-lang3-java ___ 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] Debian packaging for libcommons-lang3-java annotated tag, debian/3.1-1, created. debian/3.1-1
The annotated tag, debian/3.1-1 has been created at 28085289820f2066aa977c27690416db651caf69 (tag) tagging e78f967b6b9eb3fe8cd08d5cfeda6655a8214551 (commit) replaces debian/3.0.1-1 tagged by Damien Raude-Morvan on Sun May 27 13:50:56 2012 +0200 - Shortlog Debian release 3.1-1 Damien Raude-Morvan (6): New upstream release. Imported Upstream version 3.1 Merge commit 'upstream/3.1' Diable failing test SystemUtilsTest#testGetUserHome because it depends on current user $HOME (which is not mounted inside buildd chroot) (Closes: #674392). d/poms: Pass --java-lib to force install of JAR into /usr/share/java/. Release to unstable. --- -- Debian packaging for libcommons-lang3-java ___ 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] Debian packaging for libcommons-lang3-java branch, master, updated. debian/3.0.1-1-6-ge78f967
The following commit has been merged in the master branch:
commit d20b423b0bbf423a5931773b90413503586a1681
Author: Damien Raude-Morvan draz...@debian.org
Date: Sun May 27 13:37:37 2012 +0200
Diable failing test SystemUtilsTest#testGetUserHome because it depends on
current user $HOME (which is not mounted inside buildd chroot) (Closes:
#674392).
diff --git a/debian/changelog b/debian/changelog
index 0a8faaa..1290c2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
libcommons-lang3-java (3.1-1) UNRELEASED; urgency=low
* New upstream release.
+ * Diable failing test SystemUtilsTest#testGetUserHome because it depends
+on current user $HOME (which is not mounted inside buildd chroot)
+(Closes: #674392).
-- Damien Raude-Morvan draz...@debian.org Fri, 16 Dec 2011 23:35:26 +0100
diff --git a/debian/patches/disable_testGetUserHome_test.diff
b/debian/patches/disable_testGetUserHome_test.diff
new file mode 100644
index 000..ebed752
--- /dev/null
+++ b/debian/patches/disable_testGetUserHome_test.diff
@@ -0,0 +1,21 @@
+Description: Disable SystemUtilsTest#testGetUserHome as it depends on
+ $HOME (which is not available on buildd).
+Author: Damien Raude-Morvan draz...@debian.org
+Last-Update: 2012-05-27
+Forwarded: not-needed
+--- a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java
b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java
+@@ -81,11 +81,11 @@
+ /**
+ * Assums no security manager exists.
+ */
+-public void testGetUserHome() {
++/*public void testGetUserHome() {
+ File dir = SystemUtils.getUserHome();
+ Assert.assertNotNull(dir);
+ Assert.assertTrue(dir.exists());
+-}
++}*/
+
+ public void testIS_JAVA() {
+ String javaVersion = System.getProperty(java.version);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..1e4781e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable_testGetUserHome_test.diff
--
Debian packaging for libcommons-lang3-java
___
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] Debian packaging for libcommons-lang3-java branch, pristine-tar, updated. e4f98f958a34bcc59582f0fd9fba66f3b99b2714
The following commit has been merged in the pristine-tar branch: commit e4f98f958a34bcc59582f0fd9fba66f3b99b2714 Author: Damien Raude-Morvan draz...@debian.org Date: Sun May 27 14:00:26 2012 +0200 pristine-tar data for libcommons-lang3-java_3.1.orig.tar.gz diff --git a/libcommons-lang3-java_3.1.orig.tar.gz.delta b/libcommons-lang3-java_3.1.orig.tar.gz.delta new file mode 100644 index 000..c03c898 Binary files /dev/null and b/libcommons-lang3-java_3.1.orig.tar.gz.delta differ diff --git a/libcommons-lang3-java_3.1.orig.tar.gz.id b/libcommons-lang3-java_3.1.orig.tar.gz.id new file mode 100644 index 000..d429525 --- /dev/null +++ b/libcommons-lang3-java_3.1.orig.tar.gz.id @@ -0,0 +1 @@ +757978247cbbf52a0d469024aec1d4c71e96602e -- Debian packaging for libcommons-lang3-java ___ 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] r16063 - in trunk/ca-certificates-java: . debian
Author: drazzib Date: 2012-05-24 20:17:42 + (Thu, 24 May 2012) New Revision: 16063 Removed: trunk/ca-certificates-java/debian/preinst Modified: trunk/ca-certificates-java/UpdateCertificates.java trunk/ca-certificates-java/debian/changelog trunk/ca-certificates-java/debian/jks-keystore.hook.in trunk/ca-certificates-java/debian/postinst.in trunk/ca-certificates-java/debian/rules Log: * debian/preinst, debian/postinst: remove the 20110912ubuntu1 work-around since it is no longer needed. * debian/postinst: don't put a symlink in / if jvm doesn't contain nss configuration. (Closes: #665754, #665749). * debian/postinst: force migration to new alias names again. The migration was supposed to occur on upgrades to Oneiric, but failed because of an NSS error. * debian/postinst: forcibly remove diginotar cert. It could be left behind under certain circumstances. (LP: #920758) * debian/postinst: also look for jvm in multiarch locations (LP: #962378) * debian/postinst: retrigger first_install to properly get cert store. * d/rules: Ensure java is built with source/target == 1.6 for backwards compatibility with openjdk-6. * Sync handling of nss.cfg between debian/jks-keystore.hook.in and debian/postinst.in. * Merge changes from Ubuntu (Thanks to James Page and Marc Deslauriers). * Improve handling of certificate with UTF-8 filenames: - UpdateCertificates: Force read System.in with UTF-8 - debian/postinst: Set LC_CTYPE to C.UTF-8 Modified: trunk/ca-certificates-java/UpdateCertificates.java === --- trunk/ca-certificates-java/UpdateCertificates.java 2012-05-24 15:25:32 UTC (rev 16062) +++ trunk/ca-certificates-java/UpdateCertificates.java 2012-05-24 20:17:42 UTC (rev 16063) @@ -50,7 +50,8 @@ password = passwordString.toCharArray(); keystore = createKeyStore(); certFactory = CertificateFactory.getInstance(X.509); -processChanges(new InputStreamReader(System.in)); +// Force reading of inputstream int UTF-8 +processChanges(new InputStreamReader(System.in, UTF8)); writeKeyStore(); } Modified: trunk/ca-certificates-java/debian/changelog === --- trunk/ca-certificates-java/debian/changelog 2012-05-24 15:25:32 UTC (rev 16062) +++ trunk/ca-certificates-java/debian/changelog 2012-05-24 20:17:42 UTC (rev 16063) @@ -1,3 +1,32 @@ +ca-certificates-java (20120524) unstable; urgency=low + + [ Marc Deslauriers ] + * debian/preinst, debian/postinst: remove the 20110912ubuntu1 work-around +since it is no longer needed. + * debian/postinst: don't put a symlink in / if jvm doesn't contain nss +configuration. (Closes: #665754, #665749). + * debian/postinst: force migration to new alias names again. The +migration was supposed to occur on upgrades to Oneiric, but failed +because of an NSS error. + * debian/postinst: forcibly remove diginotar cert. It could be left +behind under certain circumstances. (LP: #920758) + * debian/postinst: also look for jvm in multiarch locations (LP: #962378) + * debian/postinst: retrigger first_install to properly get cert store. + + [ James Page ] + * d/rules: Ensure java is built with source/target == 1.6 for backwards +compatibility with openjdk-6. + + [ Damien Raude-Morvan ] + * Sync handling of nss.cfg between debian/jks-keystore.hook.in and +debian/postinst.in. + * Merge changes from Ubuntu (Thanks to James Page and Marc Deslauriers). + * Improve handling of certificate with UTF-8 filenames: +- UpdateCertificates: Force read System.in with UTF-8 +- debian/postinst: Set LC_CTYPE to C.UTF-8 + + -- Damien Raude-Morvan draz...@debian.org Tue, 22 May 2012 23:41:41 +0200 + ca-certificates-java (20120225) unstable; urgency=low [ Steve Langasek ] Modified: trunk/ca-certificates-java/debian/jks-keystore.hook.in === --- trunk/ca-certificates-java/debian/jks-keystore.hook.in 2012-05-24 15:25:32 UTC (rev 16062) +++ trunk/ca-certificates-java/debian/jks-keystore.hook.in 2012-05-24 20:17:42 UTC (rev 16063) @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh set -e @@ -12,6 +12,8 @@ . /etc/default/cacerts fi +arch=`dpkg --print-architecture` + echo if [ $cacerts_updates != yes ] || [ $CACERT_UPDATES = disabled ]; then echo updates of cacerts keystore disabled. @@ -23,31 +25,32 @@ exit 1 fi -for jdir in /usr/lib/jvm/java-[67]-openjdk* /usr/lib/jvm/java-6-sun; do -if [ -x $jdir/bin/java ]; then - break -fi +for jvm in java-6-openjdk-$arch java-6-openjdk \ + java-7-openjdk-$arch java-7-openjdk java-6-sun; do +if [ -x /usr/lib/jvm/$jvm/bin/java ]; then + break +fi done -export JAVA_HOME=$jdir +export JAVA_HOME=/usr/lib/jvm/$jvm PATH=$JAVA_HOME/bin:$PATH temp_jvm_cfg= -if [ ! -f /etc/$jvm/jvm.cfg
Bug#623882: error installing certs with non-ascii characters in their names
Hi Miguel, Le samedi 29 octobre 2011 21:08:36, Miguel Landaeta a écrit : Is this really fixed? I ask because I still can see some warnings or errors when ca-certificates-java install certificates with non-ascii filenames: [snip] Setting up ca-certificates-java (20110912) ... Adding debian:Taiwan_GRCA.pem Adding debian:Digital_Signature_Trust_Co._Global_CA_1.pem Adding debian:AddTrust_Qualified_Certificates_Root.pem Adding debian:NetLock_Notary_=Class_A=_Root.pem Adding debian:ValiCert_Class_1_VA.pem Adding debian:signet_ca3_pem.pem Adding debian:UTN_USERFirst_Hardware_Root_CA.pem Warning: there was a problem reading the certificate file /etc/ssl/certs/T??B??TAK_UEKAE_K??k_Sertifika_Hizmet_Sa??lay??c??s??_-_S?? r??m_3.pem. Message: /etc/ssl/certs/T??B??TAK_UEKAE_K??k_Sertifika_Hizmet_Sa??lay??c??s??_-_S?? r??m_3.pem (No such file or directory) Adding debian:cacert.org.pem Warning: there was a problem reading the certificate file /etc/ssl/certs/Certinomis_-_Autorit??_Racine.pem. Message: /etc/ssl/certs/Certinomis_-_Autorit??_Racine.pem (No such file or directory) Adding debian:Verisign_Class_4_Public_Primary_Certification_Authority_-_G2.pem Adding debian:Certplus_Class_2_Primary_CA.pem Warning: there was a problem reading the certificate file /etc/ssl/certs/AC_Ra??z_Certic??mara_S.A..pem. Message: /etc/ssl/certs/AC_Ra??z_Certic??mara_S.A..pem (No such file or directory) I've improved existing fix for encoding issues into 20120524 upload, so you might not see this warning anymore :) Cheers, -- Damien signature.asc Description: This is a digitally signed message part. __ 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] r16064 - in tags/ca-certificates-java: . 20120524 20120524/debian
;
+if (certInputFile.canRead()) {
+certInputStream = new FileInputStream(certInputFile);
+}
+try {
+ks.load(certInputStream, password);
+}
+catch (IOException e) {
+System.err.println(Cannot open Java keystore. Is the password
correct? Message:\n +
+e.getMessage());
+System.exit(1);
+}
+if (certInputStream != null) {
+certInputStream.close();
+}
+return ks;
+}
+
+private static void processChanges(Reader reader)
+throws IOException, GeneralSecurityException {
+String line;
+BufferedReader bufferedStdinReader = new BufferedReader(reader);
+while((line = bufferedStdinReader.readLine()) != null) {
+parseLine(line);
+}
+}
+
+private static void deleteAlias(String alias) throws
GeneralSecurityException {
+if (keystore.containsAlias(alias)) {
+System.out.println(Removing + alias);
+keystore.deleteEntry(alias);
+}
+}
+
+private static void parseLine(String line)
+throws GeneralSecurityException, IOException {
+String path = line.substring(1);
+String filename = path.substring(path.lastIndexOf(/) + 1);
+String alias = debian: + filename;
+if(line.startsWith(+)) {
+Certificate cert = createCertificate(path);
+if (cert == null) {
+return;
+}
+if(keystore.containsAlias(alias)) {
+System.out.println(Replacing + alias);
+keystore.deleteEntry(alias);
+}
+else {
+System.out.println(Adding + alias);
+}
+keystore.setCertificateEntry(alias, cert);
+}
+else if (line.startsWith(-)) {
+deleteAlias(alias);
+// Remove old non-prefixed aliases, too. This code should be
+// removed after the release of Wheezy.
+deleteAlias(filename);
+}
+else {
+System.err.println(Unknown input: + line);
+}
+}
+
+private static Certificate createCertificate(String path) {
+Certificate cert = null;
+try {
+FileInputStream certFile = new FileInputStream(path);
+cert = certFactory.generateCertificate(certFile);
+certFile.close();
+}
+catch (Exception e) {
+System.err.println(Warning: there was a problem reading the
certificate file +
+path + . Message:\n + e.getMessage());
+}
+return cert;
+}
+
+private static void writeKeyStore() throws GeneralSecurityException {
+try {
+FileOutputStream certOutputFile = new
FileOutputStream(/etc/ssl/certs/java/cacerts);
+keystore.store(certOutputFile, password);
+certOutputFile.close();
+}
+catch (IOException e) {
+System.err.println(There was a problem saving the new Java
keystore. Message:\n +
+e.getMessage());
+System.exit(1);
+}
+}
+}
Deleted: tags/ca-certificates-java/20120524/debian/changelog
===
--- trunk/ca-certificates-java/debian/changelog 2012-05-20 10:39:27 UTC (rev
16059)
+++ tags/ca-certificates-java/20120524/debian/changelog 2012-05-24 20:21:54 UTC
(rev 16064)
@@ -1,178 +0,0 @@
-ca-certificates-java (20120225) unstable; urgency=low
-
- [ Steve Langasek ]
- * debian/jks-keystore.hook: If we *don't* find libnss3 / libnss3-1d,
-don't remove files from the filesystem in do_cleanup(),
-since this has a nasty tendency of nuking system libraries.
-LP: #855171.
- * debian/preinst, debian/postinst: when upgrading from version
-20110912ubuntu1, disable the buggy hook script early to prevent it from
-being run before our new version is configured; and re-enable the script
-in the postinst. LP: #855246.
-
- [ Matthias Klose ]
- * Mark as Multi-Arch: foreign.
- * Adjust the libnss3-1d versioned dependency.
-
- [ Damien Raude-Morvan ]
- * Add myself to Uploaders.
- * Use dh_gencontrol and dpkg-vendor to allow:
-- New substvar ${nss:Depends} for libnss3-1d versionning.
-- New @NSS_LIB@ parameter for debian/*.in files.
- * Bump Standards-Version to 3.9.3:
-- Add recommended build-arch / build-indep targets.
-
- -- Damien Raude-Morvan draz...@debian.org Sat, 25 Feb 2012 15:06:32 +0100
-
-ca-certificates-java (20111223) unstable; urgency=low
-
- * Support new multiarch JRE packages in postinst.
-
- -- Torsten Werner twer...@debian.org Fri, 23 Dec 2011 13:46:15 +0100
-
-ca-certificates-java (20110912) unstable; urgency=low
-
- * Support new multiarch JRE packages in jks-keystore. (Closes: #641306)
- * Support OpenJDK 7. (Closes: #641305)
-
- -- Torsten Werner twer...@debian.org Mon, 12 Sep 2011
[pkg-java] r16065 - trunk/libcommons-codec-java/debian
Author: drazzib Date: 2012-05-25 00:10:37 + (Fri, 25 May 2012) New Revision: 16065 Modified: trunk/libcommons-codec-java/debian/ant.properties trunk/libcommons-codec-java/debian/changelog trunk/libcommons-codec-java/debian/control Log: * Set DMUA flag for James Page. * d/ant.properties: Use includeantruntime=true to allow javac ant task to get junit4 into classpath. Modified: trunk/libcommons-codec-java/debian/ant.properties === --- trunk/libcommons-codec-java/debian/ant.properties 2012-05-24 20:21:54 UTC (rev 16064) +++ trunk/libcommons-codec-java/debian/ant.properties 2012-05-25 00:10:37 UTC (rev 16065) @@ -1 +1,4 @@ compile.encoding=UTF-8 +# Use includeantruntime=true as we pass junit4 in DEB_JARS +# (and not in javac classpath) +compile.includeantruntime=true Modified: trunk/libcommons-codec-java/debian/changelog === --- trunk/libcommons-codec-java/debian/changelog2012-05-24 20:21:54 UTC (rev 16064) +++ trunk/libcommons-codec-java/debian/changelog2012-05-25 00:10:37 UTC (rev 16065) @@ -1,5 +1,6 @@ libcommons-codec-java (1.6-1) unstable; urgency=low + [ James Page ] * New upstream release: - d/patches/javac_encoding.diff: Dropped - accepted upstream. - d/control,rules,maven.rules: Switch to using junit4 inline with upstream. @@ -9,6 +10,11 @@ of DEP-5. * Added myself to uploaders. + [ Damien Raude-Morvan ] + * Set DMUA flag for James Page. + * d/ant.properties: Use includeantruntime=true to allow javac ant task to +get junit4 into classpath. + -- 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/control === --- trunk/libcommons-codec-java/debian/control 2012-05-24 20:21:54 UTC (rev 16064) +++ trunk/libcommons-codec-java/debian/control 2012-05-25 00:10:37 UTC (rev 16065) @@ -10,6 +10,7 @@ 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 +DM-Upload-Allowed: yes Package: libcommons-codec-java Architecture: all ___ 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] r16066 - in tags/libcommons-codec-java: . 1.6-1/debian
Author: drazzib Date: 2012-05-25 00:15:55 + (Fri, 25 May 2012) New Revision: 16066 Added: tags/libcommons-codec-java/1.6-1/ tags/libcommons-codec-java/1.6-1/debian/ant.properties tags/libcommons-codec-java/1.6-1/debian/changelog tags/libcommons-codec-java/1.6-1/debian/control Removed: tags/libcommons-codec-java/1.6-1/debian/ant.properties tags/libcommons-codec-java/1.6-1/debian/changelog tags/libcommons-codec-java/1.6-1/debian/control Log: [svn-buildpackage] Tagging libcommons-codec-java 1.6-1 Deleted: tags/libcommons-codec-java/1.6-1/debian/ant.properties === --- trunk/libcommons-codec-java/debian/ant.properties 2012-05-24 20:21:54 UTC (rev 16064) +++ tags/libcommons-codec-java/1.6-1/debian/ant.properties 2012-05-25 00:15:55 UTC (rev 16066) @@ -1 +0,0 @@ -compile.encoding=UTF-8 Copied: tags/libcommons-codec-java/1.6-1/debian/ant.properties (from rev 16065, trunk/libcommons-codec-java/debian/ant.properties) === --- tags/libcommons-codec-java/1.6-1/debian/ant.properties (rev 0) +++ tags/libcommons-codec-java/1.6-1/debian/ant.properties 2012-05-25 00:15:55 UTC (rev 16066) @@ -0,0 +1,4 @@ +compile.encoding=UTF-8 +# Use includeantruntime=true as we pass junit4 in DEB_JARS +# (and not in javac classpath) +compile.includeantruntime=true Deleted: tags/libcommons-codec-java/1.6-1/debian/changelog === --- trunk/libcommons-codec-java/debian/changelog2012-05-24 20:21:54 UTC (rev 16064) +++ tags/libcommons-codec-java/1.6-1/debian/changelog 2012-05-25 00:15:55 UTC (rev 16066) @@ -1,143 +0,0 @@ -libcommons-codec-java (1.6-1) unstable; urgency=low - - * New upstream release: -- d/patches/javac_encoding.diff: Dropped - accepted 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 Thu, 24 May 2012 16:19:05 +0100 - -libcommons-codec-java (1.5-1) unstable; urgency=low - - * New upstream release. - * Remove Arnaud Vandyck from Uploaders. Thanks! - * Fix debian/MANIFEST.MF: don't Import-Package on itself. - * Switch to 3.0 (quilt) source format: -- d/control: Drop B-D on quilt. -- d/README.source: Drop file. -- d/rules: Remove patchsys-quilt.mk usage. - * d/control: Drop needless-dependency-on-jre since its a library package. - * d/control: Bump Standards-Version to 3.9.2 (no changes needed). - * Bump to debhelper 7 compat level. - * d/rules: Use mh_clean in clean target. - * d/patches/javac_encoding.diff: New patch to force javac encoding to UTF-8. - * d/copyright: Update and format using DEP-5. - - -- Damien Raude-Morvan draz...@debian.org Fri, 15 Apr 2011 20:25:31 +0200 - -libcommons-codec-java (1.4-2) unstable; urgency=low - - * Update my email address - * Use quilt as patch system -- Build-Depends on quilt -- Add debian/README.source -- Use CDBS patchsys-quilt.mk - * Add debian/MANIFEST.MF for OSGi metadata (Closes: #558179) - * New debian/patches/manifest.diff to include OSGi in JAR - - -- Damien Raude-Morvan draz...@debian.org Sun, 29 Nov 2009 01:06:40 +0100 - -libcommons-codec-java (1.4-1) unstable; urgency=low - - * New upstream release. -- Remove build.patch: Merged upstream - * No more patches: Remove Build-Depends on quilt and debian/README.source - * Use Maven POM from upstream instead of debian/pom.xml - * Bump Standards-Version to 3.8.3 (no changes needed) - - -- Damien Raude-Morvan draz...@drazzib.com Sat, 22 Aug 2009 13:32:58 +0200 - -libcommons-codec-java (1.3-8) unstable; urgency=low - - * Upload to unstable. - - -- Torsten Werner twer...@debian.org Sun, 09 Aug 2009 11:57:29 +0200 - -libcommons-codec-java (1.3-7) experimental; urgency=low - - [ Ludovic Claude ] - * Fix version for junit in the maven POM dependencies - * Move api documentation to /usr/share/doc/libcommons-codec-java/api - * Add a quilt patch to ignore the LICENSE file not included in the -source tarball, replace all previous simple patches by quilt - - [ Damien Raude-Morvan ] - * Build-Depends on default-jdk instead of default-jdk-builddep -because we don't build a native GCJ package. - - [ Torsten Werner ] - * Add myself to Uploaders. - * Don't install API documentation into both binary packages. - * Don't install extra license file. - - -- Torsten Werner twer...@debian.org Mon, 03 Aug 2009 21:22:02 +0200 - -libcommons-codec-java (1.3-6) experimental; urgency=low - - * Add the Maven POM to the package - * Add a Build-Depends-Indep dependency on maven-repo-helper - * Use mh_installpom and mh_installjar
[pkg-java] r16055 - trunk/libapache-mod-jk/debian
Author: drazzib
Date: 2012-05-18 17:21:19 + (Fri, 18 May 2012)
New Revision: 16055
Added:
trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst
trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm
Modified:
trunk/libapache-mod-jk/debian/changelog
trunk/libapache-mod-jk/debian/control
trunk/libapache-mod-jk/debian/copyright
trunk/libapache-mod-jk/debian/libapache2-mod-jk.install
trunk/libapache-mod-jk/debian/rules
Log:
Revert Apache 2.4 transition.
Modified: trunk/libapache-mod-jk/debian/changelog
===
--- trunk/libapache-mod-jk/debian/changelog 2012-05-18 04:56:41 UTC (rev
16054)
+++ trunk/libapache-mod-jk/debian/changelog 2012-05-18 17:21:19 UTC (rev
16055)
@@ -1,3 +1,9 @@
+libapache-mod-jk (1:1.2.35-2) UNRELEASED; urgency=low
+
+ * Revert Apache 2.4 transition.
+
+ -- Damien Raude-Morvan draz...@debian.org Fri, 18 May 2012 19:20:50 +0200
+
libapache-mod-jk (1:1.2.35-1) experimental; urgency=low
* New upstream release:
Modified: trunk/libapache-mod-jk/debian/control
===
--- trunk/libapache-mod-jk/debian/control 2012-05-18 04:56:41 UTC (rev
16054)
+++ trunk/libapache-mod-jk/debian/control 2012-05-18 17:21:19 UTC (rev
16055)
@@ -3,10 +3,9 @@
Priority: optional
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
Uploaders: Damien Raude-Morvan draz...@debian.org
-Build-Depends: apache2-dev,
+Build-Depends: apache2-threaded-dev,
autotools-dev,
debhelper (= 8.1.3~),
- dh-apache2,
libtool
Build-Depends-Indep: lynx, xsltproc
Standards-Version: 3.9.3
@@ -16,7 +15,7 @@
Package: libapache2-mod-jk
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: apache2.2-common, ${misc:Depends}, ${shlibs:Depends}
Suggests: libapache-mod-jk-doc, tomcat6
Conflicts: libapache2-mod-jk2
Replaces: libapache2-mod-jk2
Modified: trunk/libapache-mod-jk/debian/copyright
===
--- trunk/libapache-mod-jk/debian/copyright 2012-05-18 04:56:41 UTC (rev
16054)
+++ trunk/libapache-mod-jk/debian/copyright 2012-05-18 17:21:19 UTC (rev
16055)
@@ -16,4 +16,3 @@
License: Apache-2.0
A complete copy of the Apache License, Version 2.0, can be found in
/usr/share/common-licenses/Apache-2.0 on Debian Systems.
-
Modified: trunk/libapache-mod-jk/debian/libapache2-mod-jk.install
===
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.install 2012-05-18
04:56:41 UTC (rev 16054)
+++ trunk/libapache-mod-jk/debian/libapache2-mod-jk.install 2012-05-18
17:21:19 UTC (rev 16055)
@@ -1,4 +1,4 @@
+conf/jk.conf /etc/apache2/mods-available/
+debian/jk.load /etc/apache2/mods-available/
debian/workers.properties /etc/libapache2-mod-jk/
-debian/jk.load /etc/apache2/mods-available/
-conf/jk.conf /etc/apache2/mods-available/
native/apache-2.0/mod_jk.so/usr/lib/apache2/modules/
Added: trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst
===
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst
(rev 0)
+++ trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst2012-05-18
17:21:19 UTC (rev 16055)
@@ -0,0 +1,24 @@
+#!/bin/sh
+set -e
+
+#DEBHELPER#
+
+case $1 in
+configure)
+
+ # Only activate jk if this is not an upgrade
+ if [ -z $2 ]; then
+ a2enmod jk || true
+ fi
+;;
+
+abort-upgrade|abort-remove|abort-deconfigure)
+;;
+
+*)
+ echo $0 called with unknown argument \`$1' 2
+ exit 1
+;;
+esac
+
+exit 0
Added: trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm
===
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm
(rev 0)
+++ trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm 2012-05-18
17:21:19 UTC (rev 16055)
@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e
+
+#DEBHELPER#
+
+case $1 in
+upgrade|failed-upgrade)
+ # Nothing to do here
+;;
+
+deconfigure|remove)
+ # Disable jk if this is not an upgrade
+ a2dismod jk || true
+;;
+
+*)
+ echo $0 called with unknown argument \`$1' 2
+ exit 1
+;;
+esac
+
+exit 0
Modified: trunk/libapache-mod-jk/debian/rules
===
--- trunk/libapache-mod-jk/debian/rules 2012-05-18 04:56:41 UTC (rev 16054)
+++ trunk/libapache-mod-jk/debian/rules 2012-05-18 17:21:19 UTC (rev 16055)
@@ -4,7 +4,7 @@
CFLAGS = -D_LARGEFILE_SUPPORT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
$(shell dpkg-buildflags --get
[pkg-java] r16056 - trunk/libapache-mod-jk/debian
Author: drazzib Date: 2012-05-18 17:26:45 + (Fri, 18 May 2012) New Revision: 16056 Removed: trunk/libapache-mod-jk/debian/libapache2-mod-jk.apache2 Log: Missing file. Deleted: trunk/libapache-mod-jk/debian/libapache2-mod-jk.apache2 === --- trunk/libapache-mod-jk/debian/libapache2-mod-jk.apache2 2012-05-18 17:21:19 UTC (rev 16055) +++ trunk/libapache-mod-jk/debian/libapache2-mod-jk.apache2 2012-05-18 17:26:45 UTC (rev 16056) @@ -1,2 +0,0 @@ -mod native/apache-2.0/mod_jk.so -mod debian/jk.load ___ 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] r16057 - in trunk/libapache-mod-jk/debian: . patches
Author: drazzib
Date: 2012-05-18 17:35:01 + (Fri, 18 May 2012)
New Revision: 16057
Modified:
trunk/libapache-mod-jk/debian/changelog
trunk/libapache-mod-jk/debian/patches/0001-disable-logo.patch
trunk/libapache-mod-jk/debian/patches/0002-debianize-log-directory.patch
trunk/libapache-mod-jk/debian/patches/0003-upgrade-info-to-error-message.patch
Log:
* New upstream release.
* Revert Apache 2.4 transition (ie. just for wheezy release).
* Refresh patches.
Modified: trunk/libapache-mod-jk/debian/changelog
===
--- trunk/libapache-mod-jk/debian/changelog 2012-05-18 17:26:45 UTC (rev
16056)
+++ trunk/libapache-mod-jk/debian/changelog 2012-05-18 17:35:01 UTC (rev
16057)
@@ -1,6 +1,8 @@
-libapache-mod-jk (1:1.2.35-2) UNRELEASED; urgency=low
+libapache-mod-jk (1:1.2.36-1) unstable; urgency=low
- * Revert Apache 2.4 transition.
+ * New upstream release.
+ * Revert Apache 2.4 transition (ie. just for wheezy release).
+ * Refresh patches.
-- Damien Raude-Morvan draz...@debian.org Fri, 18 May 2012 19:20:50 +0200
Modified: trunk/libapache-mod-jk/debian/patches/0001-disable-logo.patch
===
--- trunk/libapache-mod-jk/debian/patches/0001-disable-logo.patch
2012-05-18 17:26:45 UTC (rev 16056)
+++ trunk/libapache-mod-jk/debian/patches/0001-disable-logo.patch
2012-05-18 17:35:01 UTC (rev 16057)
@@ -6,8 +6,6 @@
xdocs/style.xsl |8
1 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/xdocs/style.xsl b/xdocs/style.xsl
-index 4c44431..fabfd91 100644
--- a/xdocs/style.xsl
+++ b/xdocs/style.xsl
@@ -93,15 +93,15 @@
@@ -30,4 +28,3 @@
xsl:commentAPACHE LOGO/xsl:comment
a href=http://www.apache.org/;
---
Modified:
trunk/libapache-mod-jk/debian/patches/0002-debianize-log-directory.patch
===
--- trunk/libapache-mod-jk/debian/patches/0002-debianize-log-directory.patch
2012-05-18 17:26:45 UTC (rev 16056)
+++ trunk/libapache-mod-jk/debian/patches/0002-debianize-log-directory.patch
2012-05-18 17:35:01 UTC (rev 16057)
@@ -2,19 +2,6 @@
Author: Damien Raude-Morvan draz...@debian.org
Last-Update: 2011-07-13
Description: Debianize log directory (in source code and default configuration)
a/native/apache-2.0/mod_jk.c
-+++ b/native/apache-2.0/mod_jk.c
-@@ -98,8 +98,8 @@
- #include jk_shm.h
- #include jk_url.h
-
--#define JK_LOG_DEF_FILE (logs/mod_jk.log)
--#define JK_SHM_DEF_FILE (logs/jk-runtime-status)
-+#define JK_LOG_DEF_FILE (/var/log/apache2/mod_jk.log)
-+#define JK_SHM_DEF_FILE (/var/log/apache2/jk-runtime-status)
- #define JK_ENV_REMOTE_ADDR (JK_REMOTE_ADDR)
- #define JK_ENV_REMOTE_PORT (JK_REMOTE_PORT)
- #define JK_ENV_REMOTE_HOST (JK_REMOTE_HOST)
--- a/conf/httpd-jk.conf
+++ b/conf/httpd-jk.conf
@@ -16,26 +16,21 @@
@@ -47,3 +34,16 @@
# Define a new log format you can use in any CustomLog in order
# to add mod_jk specific information to your access log.
+--- a/native/apache-2.0/mod_jk.c
b/native/apache-2.0/mod_jk.c
+@@ -98,8 +98,8 @@
+ #include jk_shm.h
+ #include jk_url.h
+
+-#define JK_LOG_DEF_FILE (logs/mod_jk.log)
+-#define JK_SHM_DEF_FILE (logs/jk-runtime-status)
++#define JK_LOG_DEF_FILE (/var/log/apache2/mod_jk.log)
++#define JK_SHM_DEF_FILE (/var/log/apache2/jk-runtime-status)
+ #define JK_ENV_REMOTE_ADDR (JK_REMOTE_ADDR)
+ #define JK_ENV_REMOTE_PORT (JK_REMOTE_PORT)
+ #define JK_ENV_REMOTE_HOST (JK_REMOTE_HOST)
Modified:
trunk/libapache-mod-jk/debian/patches/0003-upgrade-info-to-error-message.patch
===
---
trunk/libapache-mod-jk/debian/patches/0003-upgrade-info-to-error-message.patch
2012-05-18 17:26:45 UTC (rev 16056)
+++
trunk/libapache-mod-jk/debian/patches/0003-upgrade-info-to-error-message.patch
2012-05-18 17:35:01 UTC (rev 16057)
@@ -8,7 +8,7 @@
--- a/native/apache-2.0/mod_jk.c
+++ b/native/apache-2.0/mod_jk.c
-@@ -2683,7 +2683,7 @@
+@@ -2793,7 +2793,7 @@
}
}
else {
___
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#666851: Revert 2.4 transition for wheezy
reopen 666851 found 666851 1.2.36-1 I've reverted changes for 2.4 transition to get back Apache 2.2 as dependency. Cheers, -- Damien signature.asc Description: This is a digitally signed message part. __ 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#611138: CVE-2010-4438 / CVE-2011-5035
Hi all, Le dimanche 13 mai 2012 18:54:38, Steve McIntyre a écrit : Sadly, no :/ I must admit that Oracle does not publish details of its fixes so it's hard to confirm firmly what's component is exactly impacted. I'll try to revive my contact @Oracle to get some feedback on this issue (on future security issues). Hi, Any news on this? I'll just start by restating my initial comment on both issues : - We don't build any real Glassfish Server but just some parts of API library used as Java EE specifications. As for any specification, this is just a collection of interfaces and don't have much more implementations than dumb or stub code. - So I don't think that CVE-2010-4438 or CVE-2011-5035 affect Debian binary packages. But I cannot be 100% sure since : - Upstream bugtracker [1] doesn't contains ref to those security issues - My Oracle contact (GlassFish community manager) only told me that CVE-2011-5035 is integrated in GlassFish 3.1.1 Patch 2 (an update to 3.1.1 for paying customers). The fix is in the trunk and will be integrated in the 3.1.2 release scheduled for later this quarter I don't think I'll do further investigation on those issues... At least, there is one instructing thing : we have to think twice before integrating of a full blown Glassfish JEE server (ie. not just API) into Debian as from my point of view Glassfish Security is not handled as an open source should. [1] http://java.net/jira/browse/GLASSFISH Cheers, -- Damien - Debian Developper http://wiki.debian.org/DamienRaudeMorvan signature.asc Description: This is a digitally signed message part. __ 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] jsoup HTML parser branch, master, updated. debian/1.6.1-2-14-gfd6a99a
The following commit has been merged in the master branch: commit fd6a99aa464efe099e7cfe0dc4759e2263eafca5 Author: Damien Raude-Morvan draz...@debian.org Date: Sat May 12 18:55:15 2012 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index a4e9238..6e5c0a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -jsoup (1.6.2-1) UNRELEASED; urgency=low +jsoup (1.6.2-1) unstable; urgency=low * New upstream release. * Add OSGi metadata to JAR manifest. -- jsoup HTML parser ___ 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] jsoup HTML parser annotated tag, debian/1.6.2-1, created. debian/1.6.2-1
The annotated tag, debian/1.6.2-1 has been created at ceb065d940b63f358e4dd468e1014095c9973c56 (tag) tagging fd6a99aa464efe099e7cfe0dc4759e2263eafca5 (commit) replaces debian/1.6.1-2 tagged by Damien Raude-Morvan on Sat May 12 18:57:22 2012 +0200 - Shortlog Debian release 1.6.2-1 Damien Raude-Morvan (1): Upload to unstable Jakub Adam (11): Add OSGi metadata to JAR manifest Add myself to Uploaders Updated Standards-Version to 3.9.3 Fixed syntax-error-in-dep5-copyright lintian warning Don't install javadoc jar to maven-repo Fix installation of library to /usr/share/java Imported Upstream version 1.6.2 Update d/changelog for new upstream release Add d/get-orig-source Merge tag 'upstream/1.6.2' Replace possibly non-distributable test data with CC-BY-SA 3.0 Wikipedia article Niels Thykier (1): Fix Torsten Werner's recursive copyright statement Torsten Werner (1): Imported Upstream version 1.6.1 --- -- jsoup HTML parser ___ 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] r16050 - in trunk/yui-compressor/debian: . patches
Author: drazzib
Date: 2012-05-12 21:13:44 + (Sat, 12 May 2012)
New Revision: 16050
Modified:
trunk/yui-compressor/debian/changelog
trunk/yui-compressor/debian/control
trunk/yui-compressor/debian/copyright
trunk/yui-compressor/debian/patches/use-system-libraries.patch
trunk/yui-compressor/debian/rules
Log:
* New upstream release.
* Bump Standards-Version to 3.9.3.1 (no changes needed).
* d/control: Add missing librhino-java in Build-Depends.
* d/rules: js.jar is not needed in DEB_JARS (only used for
cssmin testsuite).
* d/control: Wrap-and-sort fields.
Modified: trunk/yui-compressor/debian/changelog
===
--- trunk/yui-compressor/debian/changelog 2012-05-12 04:27:50 UTC (rev
16049)
+++ trunk/yui-compressor/debian/changelog 2012-05-12 21:13:44 UTC (rev
16050)
@@ -1,3 +1,14 @@
+yui-compressor (2.4.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * Bump Standards-Version to 3.9.3.1 (no changes needed).
+ * d/control: Add missing librhino-java in Build-Depends.
+ * d/rules: js.jar is not needed in DEB_JARS (only used for
+cssmin testsuite).
+ * d/control: Wrap-and-sort fields.
+
+ -- Damien Raude-Morvan draz...@debian.org Sat, 12 May 2012 22:56:01 +0200
+
yui-compressor (2.4.6+rhino17R2-1) unstable; urgency=low
* Re-add some part of embedded Rhino source code:
Modified: trunk/yui-compressor/debian/control
===
--- trunk/yui-compressor/debian/control 2012-05-12 04:27:50 UTC (rev 16049)
+++ trunk/yui-compressor/debian/control 2012-05-12 21:13:44 UTC (rev 16050)
@@ -2,19 +2,22 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Dominik Smatana dominik.smat...@gmail.com, Damien Raude-Morvan
draz...@debian.org,
- Michael Gilbert michael.s.gilb...@gmail.com
-Build-Depends: cdbs, debhelper (= 7), default-jdk, ant
-Build-Depends-Indep: libjargs-java
+Uploaders: Dominik Smatana dominik.smat...@gmail.com,
+ Damien Raude-Morvan draz...@debian.org,
+ Michael Gilbert michael.s.gilb...@gmail.com
+Build-Depends: ant, cdbs, debhelper (= 7), default-jdk
+Build-Depends-Indep: libjargs-java, librhino-java
Homepage: http://yuilibrary.com/projects/yuicompressor/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/yui-compressor/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/yui-compressor/
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3.1
Package: yui-compressor
Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless,
- libjargs-java, java-wrappers
+Depends: default-jre-headless | java5-runtime-headless,
+ java-wrappers,
+ libjargs-java,
+ ${misc:Depends}
Description: JavaScript/CSS minifier
The YUI Compressor is a JavaScript compressor which, in addition to removing
comments and white-spaces, obfuscates local variables using the smallest
Modified: trunk/yui-compressor/debian/copyright
===
--- trunk/yui-compressor/debian/copyright 2012-05-12 04:27:50 UTC (rev
16049)
+++ trunk/yui-compressor/debian/copyright 2012-05-12 21:13:44 UTC (rev
16050)
@@ -112,4 +112,3 @@
License: GPL-3
On Debian systems the full text of the GNU General Public License version 3
can be found in the '/usr/share/common-licenses/GPL-3' file.
-
Modified: trunk/yui-compressor/debian/patches/use-system-libraries.patch
===
--- trunk/yui-compressor/debian/patches/use-system-libraries.patch
2012-05-12 04:27:50 UTC (rev 16049)
+++ trunk/yui-compressor/debian/patches/use-system-libraries.patch
2012-05-12 21:13:44 UTC (rev 16050)
@@ -6,20 +6,17 @@
Last-Update: 2010-01-17
--- a/build.xml
+++ b/build.xml
-@@ -20,10 +20,9 @@
-includes=**/*.java
-deprecation=off
-debug=on
-- source=1.4
-+ source=1.5
+@@ -23,8 +23,7 @@
+ target=1.5
+source=1.5
classpath
-pathelement location=${lib.dir}/jargs-1.0.jar/
-pathelement location=${lib.dir}/rhino-1.6R7.jar/
-+ pathelement location=/usr/share/java/jargs.jar/
++pathelement location=/usr/share/java/jargs.jar/
/classpath
/javac
/target
-@@ -32,13 +31,12 @@
+@@ -33,13 +32,12 @@
mkdir dir=${build.dir}/jar/
!-- The order is important here. Rhino MUST be unjarred first!
(some of our own classes will override the Rhino classes) --
Modified: trunk/yui-compressor/debian/rules
===
--- trunk/yui-compressor/debian/rules 2012-05-12 04:27:50 UTC (rev 16049)
+++ trunk/yui-compressor/debian/rules 2012-05-12 21:13:44
[pkg-java] r16051 - in tags/yui-compressor: . 2.4.7-1/debian 2.4.7-1/debian/patches
Author: drazzib
Date: 2012-05-12 21:16:07 + (Sat, 12 May 2012)
New Revision: 16051
Added:
tags/yui-compressor/2.4.7-1/
tags/yui-compressor/2.4.7-1/debian/changelog
tags/yui-compressor/2.4.7-1/debian/control
tags/yui-compressor/2.4.7-1/debian/copyright
tags/yui-compressor/2.4.7-1/debian/patches/use-system-libraries.patch
tags/yui-compressor/2.4.7-1/debian/rules
Removed:
tags/yui-compressor/2.4.7-1/debian/changelog
tags/yui-compressor/2.4.7-1/debian/control
tags/yui-compressor/2.4.7-1/debian/copyright
tags/yui-compressor/2.4.7-1/debian/patches/use-system-libraries.patch
tags/yui-compressor/2.4.7-1/debian/rules
Log:
[svn-buildpackage] Tagging yui-compressor 2.4.7-1
Deleted: tags/yui-compressor/2.4.7-1/debian/changelog
===
--- trunk/yui-compressor/debian/changelog 2012-05-07 05:15:53 UTC (rev
16045)
+++ tags/yui-compressor/2.4.7-1/debian/changelog2012-05-12 21:16:07 UTC
(rev 16051)
@@ -1,60 +0,0 @@
-yui-compressor (2.4.6+rhino17R2-1) unstable; urgency=low
-
- * Re-add some part of embedded Rhino source code:
-(Closes: #630542).
-- d/copyright: Readd copyright notice.
-- d/control: Drop Depends and Build-Depends on rhino.
-- d/fetch-upstream: Update script to download rhino source code.
-
- -- Damien Raude-Morvan draz...@debian.org Mon, 04 Jul 2011 23:26:08 +0200
-
-yui-compressor (2.4.6+debian1-1) unstable; urgency=low
-
- * New source tarball without embedded Rhino source code:
-- Update d/copyright since there is no more Rhino source code in this
- tarball.
-- d/patches/{parser,token,decompiler,tokenstream}.patch: Dropped.
- * d/patches/fix_testsuite.diff: Fix test suite to use /usr/share/java/js.jar
- * d/patches/rhino17R3.diff: Use Rhino AST API to plug-in this compressor.
-
- -- Damien Raude-Morvan draz...@debian.org Sun, 12 Jun 2011 22:04:43 +0200
-
-yui-compressor (2.4.6-1) unstable; urgency=low
-
- * New upstream release (Closes: #622856).
- * Bump Standards-Version to 3.9.2 (no changes needed).
- * Switch to 3.0 (quilt) source format.
- * d/watch: Upstream has broken scanning. Disable uscan for now.
- * d/copyright: Update copyright years and paste full licence text.
-
- -- Damien Raude-Morvan draz...@debian.org Mon, 25 Apr 2011 11:50:28 +0200
-
-yui-compressor (2.4.2-2) unstable; urgency=low
-
- * Add Depends on a Java runtime (Closes: #565645)
- * Depends on libjargs-java instead of embedding it inside yui-compressor
-(see use-system-libraries.patch)
- * Update Vcs-* fields to reflect package name change
-(yuicompressor - yui-compressor)
- * Create extended manpage from help output
-- remove docbook debian/yui-compressor.1.xml
-- remove Build-Depends on docbook2x
- * Use java-wrappers for bin/yui-compressor launcher script
-
- -- Damien Raude-Morvan draz...@debian.org Sun, 17 Jan 2010 19:51:06 +0100
-
-yui-compressor (2.4.2-1) unstable; urgency=low
-
- [ Dominik Smatana ]
- * Initial release (closes: #519938)
-
- [ Michael Gilbert ]
- * Download the required rhino source files in the orig tarball
-fetching script.
- * Add patches for build file to use system rhino and jargs libraries.
- * Apply yui-compressor patches to the included rhino source.
- * Add a README.source to describe the patch system.
- * Add a launcher shell script.
- * Add a manpage for the shell script.
-
- -- Michael Gilbert michael.s.gilb...@gmail.com Thu, 07 Jan 2010 21:34:14
-0500
Copied: tags/yui-compressor/2.4.7-1/debian/changelog (from rev 16050,
trunk/yui-compressor/debian/changelog)
===
--- tags/yui-compressor/2.4.7-1/debian/changelog
(rev 0)
+++ tags/yui-compressor/2.4.7-1/debian/changelog2012-05-12 21:16:07 UTC
(rev 16051)
@@ -0,0 +1,71 @@
+yui-compressor (2.4.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * Bump Standards-Version to 3.9.3.1 (no changes needed).
+ * d/control: Add missing librhino-java in Build-Depends.
+ * d/rules: js.jar is not needed in DEB_JARS (only used for
+cssmin testsuite).
+ * d/control: Wrap-and-sort fields.
+
+ -- Damien Raude-Morvan draz...@debian.org Sat, 12 May 2012 22:56:01 +0200
+
+yui-compressor (2.4.6+rhino17R2-1) unstable; urgency=low
+
+ * Re-add some part of embedded Rhino source code:
+(Closes: #630542).
+- d/copyright: Readd copyright notice.
+- d/control: Drop Depends and Build-Depends on rhino.
+- d/fetch-upstream: Update script to download rhino source code.
+
+ -- Damien Raude-Morvan draz...@debian.org Mon, 04 Jul 2011 23:26:08 +0200
+
+yui-compressor (2.4.6+debian1-1) unstable; urgency=low
+
+ * New source tarball without embedded Rhino source code:
+- Update d/copyright since there is no more Rhino source code in this
+ tarball.
+- d/patches/{parser,token,decompiler,tokenstream}.patch: Dropped.
+ * d/patches
[SCM] Debian packaging for activemq branch, master, updated. debian/5.5.0+dfsg-6-1-g5332fdc
The following commit has been merged in the master branch:
commit 5332fdc12d905b771731a0a96d69f41578fddb71
Author: Damien Raude-Morvan draz...@debian.org
Date: Tue May 1 14:38:58 2012 +0200
Install the activemq-{core,console,run} and kahadb jar files to
/usr/share/java. (Closes: #668943)
* Install the activemq-{core,console,run} and kahadb jar files to
/usr/share/java. (Closes: #668943)
- Add the necessary --java-lib flag to d/libactivemq-java.poms
* Thanks to Ulrich Dangel for RC bugfix, upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index c705271..8459706 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+activemq (5.5.0+dfsg-7) unstable; urgency=low
+
+ [ Ulrich Dangel ]
+ * Install the activemq-{core,console,run} and kahadb jar files to
+/usr/share/java. (Closes: #668943)
+- Add the necessary --java-lib flag to d/libactivemq-java.poms
+
+ [ Damien Raude-Morvan ]
+ * Thanks to Ulrich Dangel for RC bugfix, upload to unstable.
+
+ -- Damien Raude-Morvan draz...@debian.org Tue, 01 May 2012 14:38:27 +0200
+
activemq (5.5.0+dfsg-6) unstable; urgency=low
* d/patches/activemq-admin.patch: Fix activemq-admin unexpected operator
diff --git a/debian/libactivemq-java.poms b/debian/libactivemq-java.poms
index 25d1d2f..364f427 100644
--- a/debian/libactivemq-java.poms
+++ b/debian/libactivemq-java.poms
@@ -24,16 +24,16 @@
# temporarily for certain artifacts such as Javadoc jars.
#
pom.xml --no-parent --has-package-version
-activemq-core/pom.xml --has-package-version
-kahadb/pom.xml --has-package-version
+activemq-core/pom.xml --has-package-version --java-lib
+kahadb/pom.xml --has-package-version --java-lib
activemq-jmdns_1.0/pom.xml --has-package-version
activemq-jaas/pom.xml --has-package-version
activemq-ra/pom.xml --has-package-version
activemq-pool/pom.xml --has-package-version
activemq-spring/pom.xml --has-package-version
activemq-fileserver/pom.xml --has-package-version
-activemq-console/pom.xml --has-package-version
-activemq-run/pom.xml --has-package-version
+activemq-console/pom.xml --has-package-version --java-lib
+activemq-run/pom.xml --has-package-version --java-lib
activemq-optional/pom.xml --ignore-pom
activemq-karaf/pom.xml --ignore-pom
--
Debian packaging for activemq
___
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] Debian packaging for activemq annotated tag, debian/5.5.0+dfsg-7, created. debian/5.5.0+dfsg-7
The annotated tag, debian/5.5.0+dfsg-7 has been created
at 8b1c2cad17e32525a9be06a3aff2f841b01d2f98 (tag)
tagging 5332fdc12d905b771731a0a96d69f41578fddb71 (commit)
replaces debian/5.5.0+dfsg-6
tagged by Damien Raude-Morvan
on Tue May 1 14:53:47 2012 +0200
- Shortlog
Debian release 5.5.0+dfsg-7
Damien Raude-Morvan (1):
Install the activemq-{core,console,run} and kahadb jar files to
/usr/share/java. (Closes: #668943)
---
--
Debian packaging for activemq
___
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#657870: Multiple issues in Struts
Hi Moritz, There was another report for a Struts security issue: CVE-2012-1592: http://seclists.org/bugtraq/2012/Mar/110 Can you please contact upstream, whether this needs to be fixed in our Struts 1.2? Struts 1.x is not affected by this issue (there is no XSLTResult file or similar mecanism). BTW, Red Hat also flaged their struts 1.x package as Not Vulnerable. Cheers, -- Damien __ 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] r15913 - trunk/commons-beanutils/debian
Author: drazzib
Date: 2012-04-08 16:13:40 + (Sun, 08 Apr 2012)
New Revision: 15913
Added:
trunk/commons-beanutils/debian/libcommons-beanutils-java-doc.lintian-overrides
Modified:
trunk/commons-beanutils/debian/changelog
trunk/commons-beanutils/debian/control
trunk/commons-beanutils/debian/libcommons-beanutils-java.poms
trunk/commons-beanutils/debian/maven.rules
Log:
* Update Standards-Version: 3.9.3.
* Install commons-beanutils into /usr/share/java (Closes: #667601).
* Drop --no-parent option and add Build-Depends on libcommons-parent-java.
* Remove Michael Koch from Uploaders list. (Closes: #654004).
Modified: trunk/commons-beanutils/debian/changelog
===
--- trunk/commons-beanutils/debian/changelog2012-04-08 15:45:47 UTC (rev
15912)
+++ trunk/commons-beanutils/debian/changelog2012-04-08 16:13:40 UTC (rev
15913)
@@ -1,3 +1,12 @@
+commons-beanutils (1.8.3-3) unstable; urgency=low
+
+ * Update Standards-Version: 3.9.3.
+ * Install commons-beanutils into /usr/share/java (Closes: #667601).
+ * Drop --no-parent option and add Build-Depends on libcommons-parent-java.
+ * Remove Michael Koch from Uploaders list. (Closes: #654004).
+
+ -- Damien Raude-Morvan draz...@debian.org Sun, 08 Apr 2012 17:54:26 +0200
+
commons-beanutils (1.8.3-2) unstable; urgency=low
* Team upload.
Modified: trunk/commons-beanutils/debian/control
===
--- trunk/commons-beanutils/debian/control 2012-04-08 15:45:47 UTC (rev
15912)
+++ trunk/commons-beanutils/debian/control 2012-04-08 16:13:40 UTC (rev
15913)
@@ -2,33 +2,38 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Michael Koch konque...@gmx.de, Ludovic Claude
ludovic.cla...@laposte.net,
- Damien Raude-Morvan draz...@debian.org
-Build-Depends: debhelper (= 7), cdbs, default-jdk, maven-debian-helper (=
1.4)
-Build-Depends-Indep: libclirr-maven-plugin-java, libmaven-antrun-plugin-java,
libmaven-javadoc-plugin-java,
- libcommons-logging-java, default-jdk-doc, libcommons-logging-java-doc
-Standards-Version: 3.9.2
+Uploaders: Ludovic Claude ludovic.cla...@laposte.net,
+ Damien Raude-Morvan draz...@debian.org
+Build-Depends: cdbs, debhelper (= 7), default-jdk, maven-debian-helper (=
1.4)
+Build-Depends-Indep: default-jdk-doc,
+ libclirr-maven-plugin-java,
+ libcommons-logging-java,
+ libcommons-logging-java-doc,
+ libcommons-parent-java,
+ libmaven-antrun-plugin-java,
+ libmaven-javadoc-plugin-java
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-beanutils/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-beanutils/
Homepage: http://commons.apache.org/beanutils/
Package: libcommons-beanutils-java
Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
Recommends: ${maven:OptionalDepends}
Suggests: libcommons-beanutils-java-doc
Description: utility for manipulating JavaBeans
The BeanUtils Component contains a set of Java classes that provide
static utility methods useful in manipulating Java classes that conform
- to the JavaBeans Specification naming patterns for bean properties in a
- dynamic fashion.
+ to the JavaBeans Specification naming patterns for bean properties in a
+ dynamic fashion.
Package: libcommons-beanutils-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}, ${maven:DocDepends}
+Depends: ${maven:DocDepends}, ${misc:Depends}
Recommends: ${maven:DocOptionalDepends}
Suggests: libcommons-beanutils-java
Description: Javadoc API for libcommons-beanutils-java
- The javadocs API for libcommons-beanutils-java which is utility for
+ The javadocs API for libcommons-beanutils-java which is utility for
manipulating JavaBeans.
Added:
trunk/commons-beanutils/debian/libcommons-beanutils-java-doc.lintian-overrides
===
---
trunk/commons-beanutils/debian/libcommons-beanutils-java-doc.lintian-overrides
(rev 0)
+++
trunk/commons-beanutils/debian/libcommons-beanutils-java-doc.lintian-overrides
2012-04-08 16:13:40 UTC (rev 15913)
@@ -0,0 +1,2 @@
+# Javadoc jar is expected to be without any .class files
+libcommons-beanutils-java-doc binary: codeless-jar
Modified: trunk/commons-beanutils/debian/libcommons-beanutils-java.poms
===
--- trunk/commons-beanutils/debian/libcommons-beanutils-java.poms
2012-04-08 15:45:47 UTC (rev 15912)
+++ trunk/commons-beanutils/debian/libcommons-beanutils-java.poms
2012-04-08 16:13:40 UTC (rev 15913)
@@ -23,4 +23,4 @@
# --ignore-pom: don't install
[pkg-java] r15914 - in tags/commons-beanutils: . 1.8.3-3/debian
Author: drazzib
Date: 2012-04-08 16:16:06 + (Sun, 08 Apr 2012)
New Revision: 15914
Added:
tags/commons-beanutils/1.8.3-3/
tags/commons-beanutils/1.8.3-3/debian/changelog
tags/commons-beanutils/1.8.3-3/debian/control
tags/commons-beanutils/1.8.3-3/debian/libcommons-beanutils-java-doc.lintian-overrides
tags/commons-beanutils/1.8.3-3/debian/libcommons-beanutils-java.poms
tags/commons-beanutils/1.8.3-3/debian/maven.rules
Removed:
tags/commons-beanutils/1.8.3-3/debian/changelog
tags/commons-beanutils/1.8.3-3/debian/control
tags/commons-beanutils/1.8.3-3/debian/libcommons-beanutils-java.poms
tags/commons-beanutils/1.8.3-3/debian/maven.rules
Log:
[svn-buildpackage] Tagging commons-beanutils 1.8.3-3
Deleted: tags/commons-beanutils/1.8.3-3/debian/changelog
===
--- trunk/commons-beanutils/debian/changelog2012-04-08 15:45:47 UTC (rev
15912)
+++ tags/commons-beanutils/1.8.3-3/debian/changelog 2012-04-08 16:16:06 UTC
(rev 15914)
@@ -1,200 +0,0 @@
-commons-beanutils (1.8.3-2) unstable; urgency=low
-
- * Team upload.
-
- [ Damien Raude-Morvan ]
- * d/control: Drop Depends on any JRE as a Java library don't need to
-depends on a runtime (Java Policy)
-
- [ Torsten Werner ]
- * Update Standards-Version: 3.9.2.
- * Use Maven to build a package.
- * Change debian/watch to point to upstream's svn repo.
-
- -- Torsten Werner twer...@debian.org Thu, 22 Sep 2011 23:24:31 +0200
-
-commons-beanutils (1.8.3-1) unstable; urgency=low
-
- * New upstream release.
- * Remove Arnaud Vandyck from Uploaders
- * Bump Standards-Version to 3.8.4: no changes needed
- * Switch to 3.0 (quilt) format:
-- Remove B-D on quilt
-- debian/rules: remove quilt.mk
-- Add d/source/format
- * Install RELEASE-NOTES.txt as upstream changelog
- * Install Javadoc API to /usr/share/doc/libcommons-beanutils-java/api/
-
- -- Damien Raude-Morvan draz...@debian.org Mon, 05 Apr 2010 23:57:44 +0200
-
-commons-beanutils (1.8.2-1) unstable; urgency=low
-
- * New upstream release.
- * Add myself to Uploaders.
-
- -- Damien Raude-Morvan draz...@debian.org Sun, 29 Nov 2009 18:18:04 +0100
-
-commons-beanutils (1.8.1-1) unstable; urgency=low
-
- * New upstream release.
- * Updated debhelper to = 7.
- * Updated Standards-Version to 3.8.3.
-
- -- Michael Koch konque...@gmx.de Sun, 25 Oct 2009 21:21:45 +0100
-
-commons-beanutils (1.8.0-2) unstable; urgency=low
-
- * Upload to unstable.
-
- -- Torsten Werner twer...@debian.org Sun, 09 Aug 2009 10:39:56 +0200
-
-commons-beanutils (1.8.0-1) experimental; urgency=low
-
- [Ludovic Claude]
- * New upstream version, add myself to Uploaders
- * Change section to java, bump up Standards-Version to 3.8.1
- * Bump up debhelper to 6
- * Add the Maven POM to the package,
- * Add a Build-Depends-Indep dependency on maven-repo-helper
- * Use mh_installpom and mh_installjar to install the POM and the jar to the
-Maven repository
- * Add ${misc:Depends} to Depends to clear Lintian warnings
- * Remove the full text of the Apache license
-
- [Matthias Klose]
- * (Build-)depend on default-jre/-jdk.
-
- [ Emmanuel Bourg ]
- * Update of the URLs
-
- -- Ludovic Claude ludovic.cla...@laposte.net Fri, 15 May 2009 14:01:58
+0100
-
-commons-beanutils (1.8.0~beta-1) unstable; urgency=low
-
- [ Kumar Appaiah ]
- * Add a watch file.
- * debian/control:
-+ Add Vcs-{Svn,Browser}.
-+ Add Homepage field.
-
- [ Michael Koch ]
- * New upstream version.
- * Updated Standards-Version to 3.7.3.
-
- -- Michael Koch konque...@gmx.de Sun, 06 Jan 2008 21:25:27 +0100
-
-commons-beanutils (1.7.0-5) unstable; urgency=low
-
- * Use java-gcj-compat instead of kaffe.
- * Moved libcommons-beanutils-java-doc to doc section.
- * Moved Build-Depends-Indep to Build-Depends.
- * Removed Wolfgang from Uploaders and added myself.
- * Updated Standards-Version.
-
- -- Michael Koch konque...@gmx.de Sun, 17 Jun 2007 19:51:31 +0200
-
-commons-beanutils (1.7.0-4) unstable; urgency=low
-
- * removed Takashi Okamoto from the uploaders (closes: #352977).
-
- -- Arnaud Vandyck av...@debian.org Thu, 9 Mar 2006 21:27:55 +
-
-commons-beanutils (1.7.0-3) unstable; urgency=low
-
- * kaffe compiler transition
-+ Removed explicit usage of jikes build compiler property
-+ Removed jikes from Build-Depends-Indep
-
- -- Wolfgang Baer wb...@gmx.de Sun, 15 Jan 2006 16:08:03 +0100
-
-commons-beanutils (1.7.0-2) unstable; urgency=low
-
- * Build javadocs api and registered with doc-base
- * Added a -doc package for the api as it is quite big
-
- -- Wolfgang Baer wb...@gmx.de Sat, 01 Oct 2005 14:26:55 +0200
-
-commons-beanutils (1.7.0-1) unstable; urgency=low
-
- * New upstream release (closes: #264529)
-+ Updated copyright to Apache 2.0 License
-+ Depends on commons-collections3
- * Added myself to uploaders
-
- -- Wolfgang Baer wb...@gmx.de Sat, 24 Sep 2005 00:32:01 +0200
-
-commons
[pkg-java] r15915 - trunk/commons-vfs/debian
Author: drazzib Date: 2012-04-08 16:41:25 + (Sun, 08 Apr 2012) New Revision: 15915 Modified: trunk/commons-vfs/debian/changelog trunk/commons-vfs/debian/control trunk/commons-vfs/debian/libcommons-vfs-java.poms trunk/commons-vfs/debian/maven.rules Log: * Update Standard-Version: 3.9.3. * Install JAR into /usr/share/java (Closes: #667011). * Drop --no-parent option and add Build-Depends on libcommons-parent- java. Modified: trunk/commons-vfs/debian/changelog === --- trunk/commons-vfs/debian/changelog 2012-04-08 16:16:06 UTC (rev 15914) +++ trunk/commons-vfs/debian/changelog 2012-04-08 16:41:25 UTC (rev 15915) @@ -1,3 +1,12 @@ +commons-vfs (2.0-2) unstable; urgency=low + + * Update Standard-Version: 3.9.3. + * Install JAR into /usr/share/java (Closes: #667011). + * Drop --no-parent option and add Build-Depends on libcommons-parent- +java. + + -- Damien Raude-Morvan draz...@debian.org Sun, 08 Apr 2012 18:19:31 +0200 + commons-vfs (2.0-1) unstable; urgency=low * New upstream release: Modified: trunk/commons-vfs/debian/control === --- trunk/commons-vfs/debian/control2012-04-08 16:16:06 UTC (rev 15914) +++ trunk/commons-vfs/debian/control2012-04-08 16:41:25 UTC (rev 15915) @@ -14,12 +14,13 @@ libcommons-logging-java-doc, libcommons-net2-java, libcommons-net2-java-doc, + libcommons-parent-java, libjdom1-java-doc, libjsch-java, libmaven-antrun-plugin-java, libmaven-javadoc-plugin-java Build-Depends: cdbs, debhelper (= 7), default-jdk, maven-debian-helper -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://commons.apache.org/vfs/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-vfs Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-vfs Modified: trunk/commons-vfs/debian/libcommons-vfs-java.poms === --- trunk/commons-vfs/debian/libcommons-vfs-java.poms 2012-04-08 16:16:06 UTC (rev 15914) +++ trunk/commons-vfs/debian/libcommons-vfs-java.poms 2012-04-08 16:41:25 UTC (rev 15915) @@ -1,4 +1,4 @@ -pom.xml --no-parent +pom.xml examples/pom.xml -core/pom.xml +core/pom.xml --java-lib dist/pom.xml --ignore Modified: trunk/commons-vfs/debian/maven.rules === --- trunk/commons-vfs/debian/maven.rules2012-04-08 16:16:06 UTC (rev 15914) +++ trunk/commons-vfs/debian/maven.rules2012-04-08 16:41:25 UTC (rev 15915) @@ -4,3 +4,4 @@ s/jdom/org.jdom/ * * s/.*/debian/ commons-httpclient commons-httpclient jar s/.*/3.x/ commons-net commons-net jar s/2\..*/2.x/ +org.apache.commons commons-parent pom s/.*/debian/ * * ___ 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] r15916 - in tags/commons-vfs: . 2.0-2/debian
Author: drazzib
Date: 2012-04-08 16:47:14 + (Sun, 08 Apr 2012)
New Revision: 15916
Added:
tags/commons-vfs/2.0-2/
tags/commons-vfs/2.0-2/debian/changelog
tags/commons-vfs/2.0-2/debian/control
tags/commons-vfs/2.0-2/debian/libcommons-vfs-java.poms
tags/commons-vfs/2.0-2/debian/maven.rules
Removed:
tags/commons-vfs/2.0-2/debian/changelog
tags/commons-vfs/2.0-2/debian/control
tags/commons-vfs/2.0-2/debian/libcommons-vfs-java.poms
tags/commons-vfs/2.0-2/debian/maven.rules
Log:
[svn-buildpackage] Tagging commons-vfs 2.0-2
Deleted: tags/commons-vfs/2.0-2/debian/changelog
===
--- trunk/commons-vfs/debian/changelog 2012-04-08 15:45:47 UTC (rev 15912)
+++ tags/commons-vfs/2.0-2/debian/changelog 2012-04-08 16:47:14 UTC (rev
15916)
@@ -1,103 +0,0 @@
-commons-vfs (2.0-1) unstable; urgency=low
-
- * New upstream release:
-- Drop all previous patches.
-- d/control: Build-Depends on libcommons-net2-java, junit4,
- libcommons-compress-java.
- * Bump Standards-Version 3.9.2: no changes needed.
- * d/copyright: Use DEP-5 format.
- * Switch to Maven build system:
-- d/patches/skip_examples.diff: Don't build examples module.
-- d/patches/disable_webdav_provider.diff: Disable webdav provider.
-- Drop B-D on ant, but add B-D on maven-debian-helper
-- Use ${maven:Depends} and ${maven:OptionalDepends} for Depends
- and Recommends.
- * d/docs: Update for new release.
-
- -- Damien Raude-Morvan draz...@debian.org Sun, 11 Sep 2011 00:44:27 +0200
-
-commons-vfs (1.0-6) unstable; urgency=low
-
- * Team upload
-
- [ Damien Raude-Morvan ]
- * d/control: Drop Depends on any JRE as a Java library don't need to
-depends on a runtime (Java Policy)
-
- [ Torsten Werner ]
- * Change 'maintainers' into 'Maintainers'.
- * Update Standard-Version: 3.9.1.
- * Switch to source format 3.0.
-
- -- Torsten Werner twer...@debian.org Tue, 30 Aug 2011 16:56:07 +0200
-
-commons-vfs (1.0-5) unstable; urgency=low
-
- * debian/maven.rules:
-- fix jdom groupId to org.jdom
-- use 3.x release of commons-httpclient
-- use 1.x release of commons-net
- * Update my email address
- * Bump debhelper version to = 7
-
- -- Damien Raude-Morvan draz...@debian.org Sat, 12 Dec 2009 22:02:48 +0100
-
-commons-vfs (1.0-4) unstable; urgency=low
-
- * Set Maintainer field to Debian Java Team
- * Add myself as Uploaders
- * Add ${misc:Depends} in Depends field for debhelper
- * Bump Standards-Version 3.8.3:
-- Move libcommons-vfs-java to java section
-- Add a README.source describing patch system
- * Switch to Quilt patch system:
-- Refresh all patchs
-- Add B-D on quilt
-- Include patchsys-quilt.mk in debian/rules
- * New patch 02_no_home_dir.diff: don't try to create/copy files
-in $HOME as many autobuilder won't have one
- * Use default-jdk/jre:
-- Depends on default-jre-headless instead of java-gcj-compat
-- Build-Depends on default-jdk instead of default-jdk-builddep
- because we don't build a native GCJ package.
- * Maven POMs:
-- Add a Build-Depends-Indep dependency on maven-repo-helper
-- Use mh_installpom and mh_installjar to install the POM and the jar to the
- Maven repository
- * Move api documentation to /usr/share/doc/libcommons-vfs-java/api
-
- -- Damien Raude-Morvan draz...@drazzib.com Sun, 23 Aug 2009 00:52:26 +0200
-
-commons-vfs (1.0-3) unstable; urgency=low
-
- * debian/control:
-- Build-Depend on default-jdk-builddep instead of java-gcj-compat-dev.
-- Move default-jdk-builddep form B-D-I to B-D (needed for clean)
-- Differentiate short description of -doc package
- * debian/rules: Use default-java from default-jdk-builddep as JAVA_HOME
- * Move examples (sample source code) to libcommons-vfs-java-doc package
-
- -- Damien Raude-Morvan draz...@drazzib.com Sun, 30 Nov 2008 13:11:05 +0100
-
-commons-vfs (1.0-2) unstable; urgency=low
-
- * debian/rules:
- - Include examples/ in libcommons-vfs-java
- - Install Javadoc API in /usr/share/doc/libcommons-vfs-java-doc
- - Use CDBS DEB_SOURCE_PACKAGE and DEB_UPSTREAM_VERSION instead of using
- dpkg-parsechangelog
- - get-orig-source: use --force-download for uscan
- - include simple-patchsys.mk rules before ant.mk class
- * debian/control:
- - Remove depends on java1-runtime as commons-vfs only works
- with Java = 1.4
- * debian/copyright: Relicense debian packaging under BSD
- * debian/dirs: Removed because dirs are created by dh_install
-
- -- Damien Raude-Morvan draz...@drazzib.com Sun, 10 Aug 2008 21:55:32 +0200
-
-commons-vfs (1.0-1) unstable; urgency=low
-
- * Initial release (closes: #238904).
-
- -- Damien Raude-Morvan draz...@drazzib.com Wed, 16 Jul 2008 21:56:34 +0200
Copied: tags/commons-vfs/2.0-2/debian/changelog (from rev 15915,
trunk/commons-vfs/debian/changelog
[pkg-java] r15892 - in trunk/libapache-mod-jk/debian: . patches
Author: drazzib
Date: 2012-04-04 20:34:09 + (Wed, 04 Apr 2012)
New Revision: 15892
Added:
trunk/libapache-mod-jk/debian/libapache2-mod-jk.apache2
Removed:
trunk/libapache-mod-jk/debian/libapache2-mod-jk.dirs
trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst
trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm
trunk/libapache-mod-jk/debian/patches/0004-compiler-hardening.patch
Modified:
trunk/libapache-mod-jk/debian/changelog
trunk/libapache-mod-jk/debian/control
trunk/libapache-mod-jk/debian/copyright
trunk/libapache-mod-jk/debian/patches/series
trunk/libapache-mod-jk/debian/rules
Log:
* New upstream release:
- d/patches/0004-compiler-hardening.patch: Merged upstream.
* Prepare Apache 2.4 transition (Closes: #666851):
- d/control: Add Build-Depends apache2-dev and dh-apache2.
- d/rules: Call apache2 dh addon.
- d/libapache2-mod-jk.{postinst,postrm}: Replace with
d/libapache2-mod-jk.apache2.
- d/control: Remove explicit Depends on apache2.2-common.
* d/control: Bump Standards-Version to 3.9.3, no changes needed.
* d/copyright: Upgrade to copyright-format 1.0.
Modified: trunk/libapache-mod-jk/debian/changelog
===
--- trunk/libapache-mod-jk/debian/changelog 2012-04-04 20:32:15 UTC (rev
15891)
+++ trunk/libapache-mod-jk/debian/changelog 2012-04-04 20:34:09 UTC (rev
15892)
@@ -1,10 +1,19 @@
-libapache-mod-jk (1:1.2.32-3) UNRELEASED; urgency=low
+libapache-mod-jk (1:1.2.35-1) experimental; urgency=low
- * d/*.{prerm,postint}: Add set -e to scripts.
+ * New upstream release:
+- d/patches/0004-compiler-hardening.patch: Merged upstream.
* d/rules: Just use dh_auto. No need to force using sub-directory as
debhelper is doing it for us.
+ * Prepare Apache 2.4 transition (Closes: #666851):
+- d/control: Add Build-Depends apache2-dev and dh-apache2.
+- d/rules: Call apache2 dh addon.
+- d/libapache2-mod-jk.{postinst,postrm}: Replace with
+ d/libapache2-mod-jk.apache2.
+- d/control: Remove explicit Depends on apache2.2-common.
+ * d/control: Bump Standards-Version to 3.9.3, no changes needed.
+ * d/copyright: Upgrade to copyright-format 1.0.
- -- Damien Raude-Morvan draz...@debian.org Mon, 06 Feb 2012 00:35:59 +0100
+ -- Damien Raude-Morvan draz...@debian.org Wed, 04 Apr 2012 22:32:12 +0200
libapache-mod-jk (1:1.2.32-2) unstable; urgency=low
Modified: trunk/libapache-mod-jk/debian/control
===
--- trunk/libapache-mod-jk/debian/control 2012-04-04 20:32:15 UTC (rev
15891)
+++ trunk/libapache-mod-jk/debian/control 2012-04-04 20:34:09 UTC (rev
15892)
@@ -3,17 +3,21 @@
Priority: optional
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
Uploaders: Damien Raude-Morvan draz...@debian.org
-Build-Depends: debhelper (= 8.1.3~), apache2-threaded-dev, libtool,
autotools-dev
-Build-Depends-Indep: xsltproc, lynx
-Standards-Version: 3.9.2
+Build-Depends: apache2-dev,
+ autotools-dev,
+ debhelper (= 8.1.3~),
+ dh-apache2,
+ libtool
+Build-Depends-Indep: lynx, xsltproc
+Standards-Version: 3.9.3
Homepage: http://tomcat.apache.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libapache-mod-jk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libapache-mod-jk/
Package: libapache2-mod-jk
Architecture: any
-Depends: ${shlibs:Depends}, apache2.2-common, apache2, ${misc:Depends}
-Suggests: tomcat6, libapache-mod-jk-doc
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Suggests: libapache-mod-jk-doc, tomcat6
Conflicts: libapache2-mod-jk2
Replaces: libapache2-mod-jk2
Description: Apache 2 connector for the Tomcat Java servlet engine
@@ -32,7 +36,7 @@
Conflicts: libapache-mod-jk (= 1.2.5-2)
Replaces: libapache-mod-jk (= 1.2.5-2)
Description: Documentation of libapache2-mod-jk package
- Documentation and examples of the Apache jk connector for the Tomcat
+ Documentation and examples of the Apache jk connector for the Tomcat
Java servlet engine.
.
For uptodate documentation about Tomcat connectors please take a look
Modified: trunk/libapache-mod-jk/debian/copyright
===
--- trunk/libapache-mod-jk/debian/copyright 2012-04-04 20:32:15 UTC (rev
15891)
+++ trunk/libapache-mod-jk/debian/copyright 2012-04-04 20:34:09 UTC (rev
15892)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Apache Tomcat JK Connector
Upstream-Contact: http://tomcat.apache.org/connectors-doc/
Source: http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/
@@ -9,10 +9,11 @@
Files: debian/*
Copyright: 2003, Stefan Gybas sgy...@debian.org
-Copyright: 2009, Michael Koch konque...@gmx.de
-Copyright: 2011, Damien Raude-Morvan draz
[pkg-java] r15894 - in tags/libapache-mod-jk: . 1:1.2.35-1/debian 1:1.2.35-1/debian/patches
Author: drazzib
Date: 2012-04-04 20:39:39 + (Wed, 04 Apr 2012)
New Revision: 15894
Added:
tags/libapache-mod-jk/1:1.2.35-1/
tags/libapache-mod-jk/1:1.2.35-1/debian/changelog
tags/libapache-mod-jk/1:1.2.35-1/debian/control
tags/libapache-mod-jk/1:1.2.35-1/debian/copyright
tags/libapache-mod-jk/1:1.2.35-1/debian/libapache2-mod-jk.apache2
tags/libapache-mod-jk/1:1.2.35-1/debian/patches/series
tags/libapache-mod-jk/1:1.2.35-1/debian/rules
Removed:
tags/libapache-mod-jk/1:1.2.35-1/debian/changelog
tags/libapache-mod-jk/1:1.2.35-1/debian/control
tags/libapache-mod-jk/1:1.2.35-1/debian/copyright
tags/libapache-mod-jk/1:1.2.35-1/debian/libapache2-mod-jk.dirs
tags/libapache-mod-jk/1:1.2.35-1/debian/libapache2-mod-jk.postinst
tags/libapache-mod-jk/1:1.2.35-1/debian/libapache2-mod-jk.prerm
tags/libapache-mod-jk/1:1.2.35-1/debian/patches/0004-compiler-hardening.patch
tags/libapache-mod-jk/1:1.2.35-1/debian/patches/series
tags/libapache-mod-jk/1:1.2.35-1/debian/rules
Log:
[svn-buildpackage] Tagging libapache-mod-jk 1:1.2.35-1
Deleted: tags/libapache-mod-jk/1:1.2.35-1/debian/changelog
===
--- trunk/libapache-mod-jk/debian/changelog 2012-03-22 03:37:26 UTC (rev
15869)
+++ tags/libapache-mod-jk/1:1.2.35-1/debian/changelog 2012-04-04 20:39:39 UTC
(rev 15894)
@@ -1,264 +0,0 @@
-libapache-mod-jk (1:1.2.32-3) UNRELEASED; urgency=low
-
- * d/*.{prerm,postint}: Add set -e to scripts.
- * d/rules: Just use dh_auto. No need to force using sub-directory as
-debhelper is doing it for us.
-
- -- Damien Raude-Morvan draz...@debian.org Mon, 06 Feb 2012 00:35:59 +0100
-
-libapache-mod-jk (1:1.2.32-2) unstable; urgency=low
-
- * Team upload.
- * Set debian/compat to 9; bump debhelper dependency to 8.1.3.
- * Modify debian/rules to enable hardening flags
-and add patches/0004-compiler-hardening.patch (Closes: #656876)
- * Remove Michael Koch from Uploaders. (Closes: #654045)
-
- -- tony mancill tmanc...@debian.org Sat, 04 Feb 2012 07:17:54 +
-
-libapache-mod-jk (1:1.2.32-1) unstable; urgency=low
-
- * New upstream release:
-- Fix whitespace trimming when parsing attribute lists. LP: #592576.
- * Add myself in Uploaders.
- * Include a sensible default configuration in
-/etc/apache2/mods-available/jk.conf
-and remove old sample in /usr/share/doc/libapache2-mod-jk/.
-LP: #118649.
- * Describe changes in upstream handling of JkMount in global scope
-vs in VirtualHost scope (in d/README and default configuration).
-Closes: #460398.
- * Bump Standards-Version to 3.9.2:
-- d/control: Add recommended get-orig-source target.
- * d/watch: Update to new upstream layout.
- * Refresh patches.
- * d/copyright: Upgrade to DEP-5 format.
- * d/README.source: Removed (aka dpatch one)
- * d/libapache-mod-jk.*: Remove old traces from Apache 1.3
-(dropped since lenny).
- * d/rules: Switch to dh7 handling.
- * d/compat: Switch to debhelper compat level 8.
- * Replace d/patches/0004 by autotools_dev dh sequence addons.
- * d/rules: Enable LFS with -D_FILE_OFFSET_BITS=64. Closes: #590075.
-
- -- Damien Raude-Morvan draz...@debian.org Thu, 14 Jul 2011 01:15:52 +0200
-
-libapache-mod-jk (1:1.2.31-1) unstable; urgency=low
-
- * Team upload.
- * Bump debhelper compatibility level to 7.
- * Bump Standards-Version to 3.9.1. No changes were required.
- * Remove duplicated control fields in binary packages.
- * Fix lintian warning about dh_clean -k deprecation.
- * Update package section to httpd.
- * Document in NEWS the minimal Linux version needed (= 2.6.27) to use
-this module.
-
- -- Miguel Landaeta mig...@miguel.cc Tue, 15 Feb 2011 09:29:23 -0430
-
-libapache-mod-jk (1:1.2.30-1) unstable; urgency=low
-
- * Team upload
- * New upstream release
- * Convert patches to dep3 format.
- * Switch to source format 3.0.
- * Remove Stefan (Gybas) and Arnaud from Uploaders list. Thanks to your
-contribution in the past!
- * Add Vcs-* headers.
- * Add missing Depends: ${misc:Depends}.
- * Update Standards-Version: 3.9.0 (no changes).
- * Update patch for config.guess and config.sub.
- * Switch to tomcat6 and default-java in workers.properties. Thanks to
-Olivier Berger. (Closes: #590078)
-
- -- Torsten Werner twer...@debian.org Sat, 24 Jul 2010 01:04:36 +0200
-
-libapache-mod-jk (1:1.2.28-2) unstable; urgency=low
-
- * Added debian/patches/05_config_update.dpatch which updates
-config.{guess|sub} in native/scripts/build/unix/ (Closes: #540392).
- * debian/control: Let libapache2-mod-jk suggest tomcat6 instead of
-tomcat5.5.
- * Added debian/README.source.
- * Updated Standards-Version to 3.8.3.
-
- -- Michael Koch konque...@gmx.de Thu, 20 Aug 2009 20:04:39 +0200
-
-libapache-mod-jk (1:1.2.28-1) unstable; urgency=low
-
- * New upstream release.
-- Removed debian/patches/05_bug_451494.dpatch. Applied upstream.
-- Removed debian
[pkg-java] r15884 - in trunk/cglib/debian: . patches
Author: drazzib
Date: 2012-04-01 16:50:42 + (Sun, 01 Apr 2012)
New Revision: 15884
Added:
trunk/cglib/debian/patches/04_dont_use_userhome.diff
Modified:
trunk/cglib/debian/changelog
trunk/cglib/debian/control
trunk/cglib/debian/copyright
trunk/cglib/debian/patches/03_jarjar.diff
trunk/cglib/debian/patches/04_skiptests_ParallelSorter.diff
trunk/cglib/debian/patches/series
Log:
* Bump Standards-Version to 3.9.3: no changes needed.
* d/control: Remove Michael Koch from Uploaders (Closes: #654001).
* d/patches/04_dont_use_userhome.diff: Don't use $HOME to output debug files.
(Closes: #68)
Modified: trunk/cglib/debian/changelog
===
--- trunk/cglib/debian/changelog2012-03-30 04:37:55 UTC (rev 15883)
+++ trunk/cglib/debian/changelog2012-04-01 16:50:42 UTC (rev 15884)
@@ -1,3 +1,12 @@
+cglib (2.2.2+dfsg-2) unstable; urgency=low
+
+ * Bump Standards-Version to 3.9.3: no changes needed.
+ * d/control: Remove Michael Koch from Uploaders (Closes: #654001).
+ * d/patches/04_dont_use_userhome.diff: Don't use $HOME to output debug files.
+(Closes: #68)
+
+ -- Damien Raude-Morvan draz...@debian.org Sun, 01 Apr 2012 18:46:48 +0200
+
cglib (2.2.2+dfsg-1) unstable; urgency=low
* New upstream release.
Modified: trunk/cglib/debian/control
===
--- trunk/cglib/debian/control 2012-03-30 04:37:55 UTC (rev 15883)
+++ trunk/cglib/debian/control 2012-04-01 16:50:42 UTC (rev 15884)
@@ -3,17 +3,17 @@
Priority: optional
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
Uploaders: Torsten Werner twer...@debian.org,
- Michael Koch konque...@gmx.de, Damien Raude-Morvan draz...@debian.org
-Build-Depends: debhelper (= 7), cdbs, ant, default-jdk, maven-repo-helper
-Build-Depends-Indep: libasm3-java, junit, libjarjar-java
-Standards-Version: 3.9.2
+ Damien Raude-Morvan draz...@debian.org
+Build-Depends: ant, cdbs, debhelper (= 7), default-jdk, maven-repo-helper
+Build-Depends-Indep: junit, libasm3-java, libjarjar-java
+Standards-Version: 3.9.3
Homepage: http://cglib.sourceforge.net
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cglib/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cglib
Package: libcglib-java
Architecture: all
-Depends: ${misc:Depends}, libasm3-java
+Depends: libasm3-java, ${misc:Depends}
Conflicts: libcglib2.1-java
Provides: libcglib2.1-java
Replaces: libcglib2.1-java
Modified: trunk/cglib/debian/copyright
===
--- trunk/cglib/debian/copyright2012-03-30 04:37:55 UTC (rev 15883)
+++ trunk/cglib/debian/copyright2012-04-01 16:50:42 UTC (rev 15884)
@@ -53,4 +53,4 @@
limitations under the License.
.
The full text of the Apache License can be found in
- `/usr/share/common-licenses/Apache-2.0'.
\ No newline at end of file
+ `/usr/share/common-licenses/Apache-2.0'.
Modified: trunk/cglib/debian/patches/03_jarjar.diff
===
--- trunk/cglib/debian/patches/03_jarjar.diff 2012-03-30 04:37:55 UTC (rev
15883)
+++ trunk/cglib/debian/patches/03_jarjar.diff 2012-04-01 16:50:42 UTC (rev
15884)
@@ -1,5 +1,8 @@
-Index: b/build.xml
-===
+Description: Use /usr/share/java/asm3-all.jar to
+ build a jarjar enabled cglib.
+Author: Damien Raude-Morvan draz...@debian.org
+Last-Update: 2012-04-01
+Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -127,7 +127,7 @@
Added: trunk/cglib/debian/patches/04_dont_use_userhome.diff
===
--- trunk/cglib/debian/patches/04_dont_use_userhome.diff
(rev 0)
+++ trunk/cglib/debian/patches/04_dont_use_userhome.diff2012-04-01
16:50:42 UTC (rev 15884)
@@ -0,0 +1,16 @@
+Description: Don't use user.home to get debug output.
+Author: Damien Raude-Morvan draz...@debian.org
+Last-Update: 2012-04-01
+Forwarded: not-needed
+
+--- a/build.xml
b/build.xml
+@@ -245,7 +245,7 @@
+ !-- jvmarg value=-verbose:class/ --
+ !-- jvmarg value=-Xprof/ --
+ !-- jvmarg value=-server/ --
+- !-- sysproperty key=cglib.debugLocation value=debug/ --
++ sysproperty key=cglib.debugLocation value=debug/
+ !-- jvmarg value=-Djava.security.policy==java.policy / --
+ !-- jvmarg value=-Djava.security.manager / --
+
Modified: trunk/cglib/debian/patches/04_skiptests_ParallelSorter.diff
===
--- trunk/cglib/debian/patches/04_skiptests_ParallelSorter.diff 2012-03-30
04:37:55 UTC (rev 15883)
+++ trunk/cglib/debian/patches/04_skiptests_ParallelSorter.diff 2012-04-01
16:50:42 UTC (rev 15884)
@@ -1,3 +1,8 @@
+Description: Skip failing tests.
+Author: Damien Raude-Morvan draz...@debian.org
[pkg-java] r15885 - in tags/cglib: . 2.2.2+dfsg-2/debian 2.2.2+dfsg-2/debian/patches
Author: drazzib
Date: 2012-04-01 16:53:23 + (Sun, 01 Apr 2012)
New Revision: 15885
Added:
tags/cglib/2.2.2+dfsg-2/
tags/cglib/2.2.2+dfsg-2/debian/changelog
tags/cglib/2.2.2+dfsg-2/debian/control
tags/cglib/2.2.2+dfsg-2/debian/copyright
tags/cglib/2.2.2+dfsg-2/debian/patches/03_jarjar.diff
tags/cglib/2.2.2+dfsg-2/debian/patches/04_dont_use_userhome.diff
tags/cglib/2.2.2+dfsg-2/debian/patches/04_skiptests_ParallelSorter.diff
tags/cglib/2.2.2+dfsg-2/debian/patches/series
Removed:
tags/cglib/2.2.2+dfsg-2/debian/changelog
tags/cglib/2.2.2+dfsg-2/debian/control
tags/cglib/2.2.2+dfsg-2/debian/copyright
tags/cglib/2.2.2+dfsg-2/debian/patches/03_jarjar.diff
tags/cglib/2.2.2+dfsg-2/debian/patches/04_skiptests_ParallelSorter.diff
tags/cglib/2.2.2+dfsg-2/debian/patches/series
Log:
[svn-buildpackage] Tagging cglib 2.2.2+dfsg-2
Deleted: tags/cglib/2.2.2+dfsg-2/debian/changelog
===
--- trunk/cglib/debian/changelog2012-03-22 03:37:26 UTC (rev 15869)
+++ tags/cglib/2.2.2+dfsg-2/debian/changelog2012-04-01 16:53:23 UTC (rev
15885)
@@ -1,123 +0,0 @@
-cglib (2.2.2+dfsg-1) unstable; urgency=low
-
- * New upstream release.
- * Bump Standards-Version to 3.9.2: no changes needed.
- * d/copyright: Use DEP-5 format.
- * d/rules: Enable unit testing.
- * d/patches/04_skiptests_ParallelSorter.diff: Skip some failing test.
-
- -- Damien Raude-Morvan draz...@debian.org Tue, 01 Nov 2011 22:05:40 +0100
-
-cglib (2.2+dfsg-4) unstable; urgency=low
-
- * d/rules, d/pom-nodep.xml: Install -nodep jar with another artifactId
-to avoid conflict in /usr/share/maven-repo (Closes: #617865).
-
- -- Damien Raude-Morvan draz...@debian.org Sat, 12 Mar 2011 02:03:14 +0100
-
-cglib (2.2+dfsg-3) unstable; urgency=low
-
- * d/patches/02_build_split.patch: Drop, re-enable cglib-nodep
-(Closes: #583231).
- * d/patches/03_jarjar.diff: fix location of asm.jar.
- * d/control: Build-Depends on libjarjar-java.
- * d/control: drop Depends en JRE, as its a library.
- * d/rules: add jarjar to DEB_JARS.
- * Bump Standards-Version to 3.9.1 (no changes needed).
-
- -- Damien Raude-Morvan draz...@debian.org Sun, 06 Mar 2011 01:57:24 +0100
-
-cglib (2.2+dfsg-2) unstable; urgency=low
-
- [ Gabriele Giacone ]
- * Added Maven Support
- * Standards-Version to 3.8.4
- * Source format 3.0 (quilt)
-
- [ Damien Raude-Morvan ]
- * Remove Arnaud Vandyck from Uploaders
- * Source format 3.0 (quilt):
-- Remove patchsys-quilt.mk from d/rules
-- Rework d/README.source
- * Maven Support:
-- Add get-orig-pom target in d/rules to update pom.xml
- * Remove d/README.Debian (already included in d/README.source)
-
- -- Damien Raude-Morvan draz...@debian.org Tue, 16 Mar 2010 20:42:36 +0100
-
-cglib (2.2+dfsg-1) unstable; urgency=low
-
- * New upstream release.
-- Rename source package to cglib
-- Drop unneeded Build-Depends on libaspectwerkz2-java
-- Build-Depends on libasm3-java instead of libasm-java
-- Drop uneeded debian/patches/01_build_classpath.patch
- * Build-Depends on default-jdk instead of default-jdk-builddep
-because we don't build a native GCJ package.
- * Switch to debhelper 7
- * Use Quilt patch system:
-- refresh all debian/patches
-- Build-Depends on quilt
-- Update debian/README.source
- * Update my email address
- * Bump Standards-Version to 3.8.3: no changes needed
- * Fix debian/copyright to include BSD license of
-src/proxy/net/sf/cglib/core/LocalVariablesSorter.java
-
- -- Damien Raude-Morvan draz...@debian.org Thu, 08 Oct 2009 21:23:45 +0200
-
-cglib2.1 (2.1.3.dfsg.2-2) unstable; urgency=low
-
- * Use default-java-builddep:
-- Remove B-D on java-gcj-compat-dev (Closes: #526274)
-- Add default-java-builddep to B-D
-- Use /usr/lib/jvm/default-java as JAVA_HOME
- * Move ant to B-D-I (needed for clean target)
- * Add myself as Uploaders
- * Add ${misc:Depends} as suggested by Lintian
- * Fix short-description of libcglib2.1-java-doc
-to include documentation
- * Fix Vcs-* fields to use cglib2.1 instead of cglib
- * Bump Standards-Version to 3.8.2:
-- Move to java section
-- Rename README.Debian-source to README.source
-- Describe patch system usage in README.source
-
- -- Damien Raude-Morvan draz...@drazzib.com Mon, 29 Jun 2009 22:13:35 +0200
-
-cglib2.1 (2.1.3.dfsg.2-1) unstable; urgency=low
-
- * Increase the upstream version number without changing the actual tarball
-to get the package uploaded to main.
-
- -- Torsten Werner twer...@debian.org Sun, 10 Aug 2008 22:32:44 +0200
-
-cglib2.1 (2.1.3.dfsg.1-3) unstable; urgency=low
-
- [ Michael Koch ]
- * Use uscan sf.net helper for SourceForge. Fixes upstream checking.
- * Added myself to Uploaders.
-
- [ Torsten Werner ]
- * Move package to main.
- * Reformat debian/copyright for better readability.
- * Do not quote the full text of the Apache License in debian
[SCM] Debian packaging for activemq branch, master, updated. debian/5.5.0+dfsg-5-2-geb2851d
The following commit has been merged in the master branch:
commit bc9694c49e97535d1aa3a23a232e245cdf6baa86
Author: Damien Raude-Morvan draz...@debian.org
Date: Sun Apr 1 20:25:54 2012 +0200
d/patches/activemq-admin.patch: Fix activemq-admin unexpected operator
(Closes: #662698). Thanks to Mathieu Mitchell.
diff --git a/debian/changelog b/debian/changelog
index 39e67ad..870b799 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+activemq (5.5.0+dfsg-6) unstable; urgency=low
+
+ * d/patches/activemq-admin.patch: Fix activemq-admin unexpected operator
+(Closes: #662698). Thanks to Mathieu Mitchell.
+
+ -- Damien Raude-Morvan draz...@debian.org Sun, 01 Apr 2012 20:25:04 +0200
+
activemq (5.5.0+dfsg-5) unstable; urgency=high
* Fix CVE-2011-4905 (potential Denial of Service) by backporting upstream
diff --git a/debian/patches/activemq-admin.patch
b/debian/patches/activemq-admin.patch
new file mode 100644
index 000..d15b2d6
--- /dev/null
+++ b/debian/patches/activemq-admin.patch
@@ -0,0 +1,17 @@
+Description: Fix running activemq-admin without any argument
+ which led to 132: [: =: unexpected operator.
+Author: Mathieu Mitchell mat...@gmail.com
+Last-Update: 2012-03-05
+Forwarded: no
+
+--- a/assembly/src/release/bin/activemq-admin
b/assembly/src/release/bin/activemq-admin
+@@ -129,7 +129,7 @@
+ # Set default classpath
+ ACTIVEMQ_CLASSPATH=${ACTIVEMQ_BASE}/conf;$ACTIVEMQ_CLASSPATH
+
+-if [ $1 = start ] ; then
++if [ $1 = start ] ; then
+ if [ -z $ACTIVEMQ_OPTS ] ; then
+ ACTIVEMQ_OPTS=-Xmx512M
-Dorg.apache.activemq.UseDedicatedTaskRunner=true
-Djava.util.logging.config.file=logging.properties
+ fi
diff --git a/debian/patches/series b/debian/patches/series
index 7b60e01..c777eee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ exclude_spring_osgi.diff
javadoc_links.diff
init_debian_default_values.diff
CVE-2011-4605.diff
+activemq-admin.patch
--
Debian packaging for activemq
___
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] Debian packaging for activemq branch, master, updated. debian/5.5.0+dfsg-5-2-geb2851d
The following commit has been merged in the master branch: commit eb2851dfe9e8e6fde5658d48f91f7d4d272e5394 Author: Damien Raude-Morvan draz...@debian.org Date: Sun Apr 1 20:26:30 2012 +0200 Bump Standards-Version to 3.9.3: no changes needed. diff --git a/debian/changelog b/debian/changelog index 870b799..c705271 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ activemq (5.5.0+dfsg-6) unstable; urgency=low * d/patches/activemq-admin.patch: Fix activemq-admin unexpected operator (Closes: #662698). Thanks to Mathieu Mitchell. + * Bump Standards-Version to 3.9.3: no changes needed. - -- Damien Raude-Morvan draz...@debian.org Sun, 01 Apr 2012 20:25:04 +0200 + -- Damien Raude-Morvan draz...@debian.org Sun, 01 Apr 2012 20:26:10 +0200 activemq (5.5.0+dfsg-5) unstable; urgency=high diff --git a/debian/control b/debian/control index 0d2ec08..c39d624 100644 --- a/debian/control +++ b/debian/control @@ -55,7 +55,7 @@ Build-Depends-Indep: ant, libxbean-java-doc, libxpp3-java, libxstream-java -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/pkg-java/activemq.git Vcs-Browser: http://git.debian.org/?p=pkg-java/activemq.git Homepage: http://activemq.apache.org -- Debian packaging for activemq ___ 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] Debian packaging for activemq annotated tag, debian/5.5.0+dfsg-6, created. debian/5.5.0+dfsg-6
The annotated tag, debian/5.5.0+dfsg-6 has been created at 51e077f1e4438e2a89121bf8d63999be42572b1c (tag) tagging eb2851dfe9e8e6fde5658d48f91f7d4d272e5394 (commit) replaces debian/5.5.0+dfsg-5 tagged by Damien Raude-Morvan on Mon Apr 2 00:54:12 2012 +0200 - Shortlog Debian release 5.5.0+dfsg-6 Damien Raude-Morvan (2): d/patches/activemq-admin.patch: Fix activemq-admin unexpected operator (Closes: #662698). Thanks to Mathieu Mitchell. Bump Standards-Version to 3.9.3: no changes needed. --- -- Debian packaging for activemq ___ 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] r15830 - in trunk/junit4/debian: . patches
Author: drazzib
Date: 2012-03-07 22:34:52 + (Wed, 07 Mar 2012)
New Revision: 15830
Added:
trunk/junit4/debian/ant.properties
trunk/junit4/debian/patches/
trunk/junit4/debian/patches/manifest_jar.diff
trunk/junit4/debian/patches/series
trunk/junit4/debian/patches/workaround_typing_bug.diff
Removed:
trunk/junit4/debian/build.properties
trunk/junit4/debian/build.xml
trunk/junit4/debian/junit4-doc.install
Modified:
trunk/junit4/debian/changelog
trunk/junit4/debian/control
trunk/junit4/debian/copyright
trunk/junit4/debian/junit4.poms
trunk/junit4/debian/rules
trunk/junit4/debian/watch
Log:
* New upstream release (Closes: #650662).
* Fix FTBFS with workaround_typing_bug.diff (Closes: #662807).
* d/control: Bump to 3.9.3.1 Standards-Version: no changes needed.
* d/control: Remove Michael Koch from Uploaders list (Closes: #654042).
* d/watch: Get new github tags, thanks to David Paleino
(Closes: #653597).
* d/control: Wrap-and-sort.
* d/control: Don't use maven-ant-helper anymore for build.
Copied: trunk/junit4/debian/ant.properties (from rev 15806,
trunk/junit4/debian/build.properties)
===
--- trunk/junit4/debian/ant.properties (rev 0)
+++ trunk/junit4/debian/ant.properties 2012-03-07 22:34:52 UTC (rev 15830)
@@ -0,0 +1,2 @@
+hamcrestlib=/usr/share/java/hamcrest-core.jar
+manifest=debian/MANIFEST.MF
Deleted: trunk/junit4/debian/build.properties
===
--- trunk/junit4/debian/build.properties2012-03-04 20:25:33 UTC (rev
15829)
+++ trunk/junit4/debian/build.properties2012-03-07 22:34:52 UTC (rev
15830)
@@ -1,4 +0,0 @@
-artifactId=junit
-dependency=hamcrest
-build.javaVersion=1.5
-manifest=debian/MANIFEST.MF
Deleted: trunk/junit4/debian/build.xml
===
--- trunk/junit4/debian/build.xml 2012-03-04 20:25:33 UTC (rev 15829)
+++ trunk/junit4/debian/build.xml 2012-03-07 22:34:52 UTC (rev 15830)
@@ -1,25 +0,0 @@
-project name=junit default=javadoc basedir=..
-
- property name=src value=src/main/java /
- property name=javadocdir location=build/docs/api /
-
- target name=javadoc
- javadoc destdir=${javadocdir}
-author=false
-version=false
-use=false
-windowtitle=JUnit API
-stylesheetfile=stylesheet.css
-
- excludepackage name=junit.* /
- excludepackage name=org.junit.internal.* /
- excludepackage
name=org.junit.experimental.theories.internal.* /
-
- sourcepath location=${src} /
- classpath location=/usr/share/java/hamcrest-core.jar
/
- link href=file:///usr/share/doc/libhamcrest-java/api
/
- link href=file:///usr/share/doc/default-jdk/api /
- /javadoc
- /target
-
-/project
Modified: trunk/junit4/debian/changelog
===
--- trunk/junit4/debian/changelog 2012-03-04 20:25:33 UTC (rev 15829)
+++ trunk/junit4/debian/changelog 2012-03-07 22:34:52 UTC (rev 15830)
@@ -1,3 +1,16 @@
+junit4 (4.10-1) unstable; urgency=low
+
+ * New upstream release (Closes: #650662).
+ * Fix FTBFS with workaround_typing_bug.diff (Closes: #662807).
+ * d/control: Bump to 3.9.3.1 Standards-Version: no changes needed.
+ * d/control: Remove Michael Koch from Uploaders list (Closes: #654042).
+ * d/watch: Get new github tags, thanks to David Paleino
+(Closes: #653597).
+ * d/control: Wrap-and-sort.
+ * d/control: Don't use maven-ant-helper anymore for build.
+
+ -- Damien Raude-Morvan draz...@debian.org Wed, 07 Mar 2012 22:56:14 +0100
+
junit4 (4.8.2-2) unstable; urgency=low
* Team upload.
Modified: trunk/junit4/debian/control
===
--- trunk/junit4/debian/control 2012-03-04 20:25:33 UTC (rev 15829)
+++ trunk/junit4/debian/control 2012-03-07 22:34:52 UTC (rev 15830)
@@ -1,20 +1,26 @@
Source: junit4
Section: java
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Florian Weimer f...@deneb.enyo.de, Michael Koch
konque...@gmx.de,
- Varun Hiremath va...@debian.org, Damien Raude-Morvan draz...@debian.org,
Ludovic Claude ludovic.cla...@laposte.net
+Uploaders: Florian Weimer f...@deneb.enyo.de,
+ Varun Hiremath va...@debian.org,
+ Damien Raude-Morvan draz...@debian.org,
+ Ludovic Claude ludovic.cla...@laposte.net
Priority: optional
-Build-Depends: cdbs, debhelper (= 7), ant, default-jdk
-Build-Depends-Indep: libhamcrest-java ( 1.1-6), maven-repo-helper,
maven-ant-helper
[pkg-java] r15831 - in tags/junit4: . 4.10-1/debian
Author: drazzib
Date: 2012-03-07 22:36:31 + (Wed, 07 Mar 2012)
New Revision: 15831
Added:
tags/junit4/4.10-1/
tags/junit4/4.10-1/debian/ant.properties
tags/junit4/4.10-1/debian/changelog
tags/junit4/4.10-1/debian/control
tags/junit4/4.10-1/debian/copyright
tags/junit4/4.10-1/debian/junit4.poms
tags/junit4/4.10-1/debian/patches/
tags/junit4/4.10-1/debian/rules
tags/junit4/4.10-1/debian/watch
Removed:
tags/junit4/4.10-1/debian/build.properties
tags/junit4/4.10-1/debian/build.xml
tags/junit4/4.10-1/debian/changelog
tags/junit4/4.10-1/debian/control
tags/junit4/4.10-1/debian/copyright
tags/junit4/4.10-1/debian/junit4-doc.install
tags/junit4/4.10-1/debian/junit4.poms
tags/junit4/4.10-1/debian/rules
tags/junit4/4.10-1/debian/watch
Log:
[svn-buildpackage] Tagging junit4 4.10-1
Copied: tags/junit4/4.10-1/debian/ant.properties (from rev 15830,
trunk/junit4/debian/ant.properties)
===
--- tags/junit4/4.10-1/debian/ant.properties(rev 0)
+++ tags/junit4/4.10-1/debian/ant.properties2012-03-07 22:36:31 UTC (rev
15831)
@@ -0,0 +1,2 @@
+hamcrestlib=/usr/share/java/hamcrest-core.jar
+manifest=debian/MANIFEST.MF
Deleted: tags/junit4/4.10-1/debian/build.properties
===
--- trunk/junit4/debian/build.properties2012-03-02 05:35:10 UTC (rev
15806)
+++ tags/junit4/4.10-1/debian/build.properties 2012-03-07 22:36:31 UTC (rev
15831)
@@ -1,4 +0,0 @@
-artifactId=junit
-dependency=hamcrest
-build.javaVersion=1.5
-manifest=debian/MANIFEST.MF
Deleted: tags/junit4/4.10-1/debian/build.xml
===
--- trunk/junit4/debian/build.xml 2012-03-02 05:35:10 UTC (rev 15806)
+++ tags/junit4/4.10-1/debian/build.xml 2012-03-07 22:36:31 UTC (rev 15831)
@@ -1,25 +0,0 @@
-project name=junit default=javadoc basedir=..
-
- property name=src value=src/main/java /
- property name=javadocdir location=build/docs/api /
-
- target name=javadoc
- javadoc destdir=${javadocdir}
-author=false
-version=false
-use=false
-windowtitle=JUnit API
-stylesheetfile=stylesheet.css
-
- excludepackage name=junit.* /
- excludepackage name=org.junit.internal.* /
- excludepackage
name=org.junit.experimental.theories.internal.* /
-
- sourcepath location=${src} /
- classpath location=/usr/share/java/hamcrest-core.jar
/
- link href=file:///usr/share/doc/libhamcrest-java/api
/
- link href=file:///usr/share/doc/default-jdk/api /
- /javadoc
- /target
-
-/project
Deleted: tags/junit4/4.10-1/debian/changelog
===
--- trunk/junit4/debian/changelog 2012-03-02 05:35:10 UTC (rev 15806)
+++ tags/junit4/4.10-1/debian/changelog 2012-03-07 22:36:31 UTC (rev 15831)
@@ -1,185 +0,0 @@
-junit4 (4.8.2-2) unstable; urgency=low
-
- * Team upload.
- * Add Class-Path: hamcrest-core.jar to MANIFEST. (Closes: #527308, #587135)
- * Remove debian/libjunit4-java.poms because there is no such package.
- * Remove get-orig-pom target because upstream provides a pom.xml now.
- * Set property bin.package to junit4.
-
- -- Torsten Werner twer...@debian.org Fri, 25 Jun 2010 15:35:10 +0200
-
-junit4 (4.8.2-1) unstable; urgency=low
-
- [Ludovic Claude]
- * Add myself to Uploaders
- * New upstream version
- * Update debian/watch and get the original tarball from GitHub
- * Use the tarball that contains the full project files, including pom.xml
-and documentation
- * Add Build-Depends-Indep on maven-ant-helper
- * Changed the build to use maven-ant-helper. Deleted debian/build.xml
-and reorganized debian/rules, javadoc is now linked to hamcrest docs.
- * Add Build-Depends-Indep and Depends for the junit4-doc package on
-libhamcrest-java-doc and default-jdk-doc
- * Install the site docs in addition to the javadocs.
- * Run unit tests during the build, add Build-Depends-Indep on
-junit and ant-optional
- * Use upstream pom.xml
-
- [Varun Hiremath]
- * Set java source/target in d/ant.properties instead of d/rules
-
- -- Ludovic Claude ludovic.cla...@laposte.net Wed, 26 May 2010 22:10:17
+0200
-
-junit4 (4.8.1-3) unstable; urgency=low
-
- * Install Javadoc inside /usr/share/doc/junit4/ instead of
-/usr/share/java/junit4/.
- * Register Javadoc with doc-base.
-
- -- Damien Raude-Morvan draz...@debian.org Sat, 13 Mar 2010 22:30:55 +0100
-
-junit4 (4.8.1-2) unstable; urgency=low
-
- [ Ludovic Claude ]
- * Update version number of junit in debian/pom.xml
[pkg-java] r15807 - trunk/commons-daemon/debian
Author: drazzib Date: 2012-03-02 18:41:04 + (Fri, 02 Mar 2012) New Revision: 15807 Modified: trunk/commons-daemon/debian/changelog trunk/commons-daemon/debian/control trunk/commons-daemon/debian/copyright trunk/commons-daemon/debian/rules Log: * New upstream release. * d/control: Bump Standards-Version to 3.9.3: no changes needed. * d/rules: Enable hardening build with dpkg-buildflags. * d/rules: Remove old code to workaround bug in debhelper. * Fix Updating the commons-daemon Uploaders list Remove Michael Koch from Uploaders list (Closes: #654006). Thanks Michael! * d/copyright: Use copyright-format 1.0. Modified: trunk/commons-daemon/debian/changelog === --- trunk/commons-daemon/debian/changelog 2012-03-02 05:35:10 UTC (rev 15806) +++ trunk/commons-daemon/debian/changelog 2012-03-02 18:41:04 UTC (rev 15807) @@ -1,3 +1,15 @@ +commons-daemon (1.0.10-1) unstable; urgency=low + + * New upstream release. + * d/control: Bump Standards-Version to 3.9.3: no changes needed. + * d/rules: Enable hardening build with dpkg-buildflags. + * d/rules: Remove old code to workaround bug in debhelper. + * Fix Updating the commons-daemon Uploaders list Remove Michael Koch +from Uploaders list (Closes: #654006). Thanks Michael! + * d/copyright: Use copyright-format 1.0. + + -- Damien Raude-Morvan draz...@debian.org Fri, 02 Mar 2012 19:37:23 +0100 + commons-daemon (1.0.8-1) unstable; urgency=low * New upstream release: Modified: trunk/commons-daemon/debian/control === --- trunk/commons-daemon/debian/control 2012-03-02 05:35:10 UTC (rev 15806) +++ trunk/commons-daemon/debian/control 2012-03-02 18:41:04 UTC (rev 15807) @@ -7,7 +7,7 @@ Build-Depends: debhelper (= 7.0.50~), autoconf, autotools-dev, default-jdk, xsltproc, docbook-xsl, ant, libcap-dev [linux-any], maven-repo-helper Build-Conflicts: autoconf2.13 -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://commons.apache.org/daemon/ Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/commons-daemon/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-daemon/ Modified: trunk/commons-daemon/debian/copyright === --- trunk/commons-daemon/debian/copyright 2012-03-02 05:35:10 UTC (rev 15806) +++ trunk/commons-daemon/debian/copyright 2012-03-02 18:41:04 UTC (rev 15807) @@ -1,4 +1,4 @@ -Format: http://dep.debian.net/deps/dep5/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Commons Daemon Upstream-Contact: http://commons.apache.org/daemon Source: http://www.apache.org/dist/commons/daemon/source/ @@ -6,7 +6,7 @@ Files: * Copyright: Copyright (C) 1999-2011 The Apache Software Foundation. License: Apache-2.0 -Comment: +Comment: Upstream authors: Bill Barker, Jean-Frederic Clere, Mladen Turk, Remy Maucherat, Pier Fumagalli, Yoav Shapira. @@ -19,3 +19,4 @@ License: Apache-2.0 A complete copy of the Apache License, Version 2.0, can be found in /usr/share/common-licenses/Apache-2.0 on Debian Systems. + Modified: trunk/commons-daemon/debian/rules === --- trunk/commons-daemon/debian/rules 2012-03-02 05:35:10 UTC (rev 15806) +++ trunk/commons-daemon/debian/rules 2012-03-02 18:41:04 UTC (rev 15807) @@ -1,12 +1,5 @@ #!/usr/bin/make -f -CFLAGS = -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - JAVA_HOME := /usr/lib/jvm/default-java ANT_ARGS := -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 @@ -19,24 +12,15 @@ NATIVE_SRC := src/native/unix -# Keep that here as dh7 doesn't handle a configure script inside a subdirectory -export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) - confflags += --build $(DEB_HOST_GNU_TYPE) -else - confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -endif - %: dh $@ --sourcedirectory=$(NATIVE_SRC) --buildsystem=autoconf --with autotools_dev override_dh_auto_configure: - (cd $(NATIVE_SRC); autoconf; ./configure $(confflags) CFLAGS=$(CFLAGS) --with-java=$(JAVA_HOME)) + dh_auto_configure -- --with-java=$(JAVA_HOME) $(shell dpkg-buildflags --export=configure) override_dh_auto_build: JAVA_HOME=$(JAVA_HOME) ant $(ANT_ARGS) - dh_auto_build --sourcedirectory=$(NATIVE_SRC) + dh_auto_build $(XSLTPROC) $(MAN_STYLESHEET) $(NATIVE_SRC)/man/jsvc.1.xml override_dh_auto_clean: ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin
[pkg-java] r15808 - in tags/commons-daemon: . 1.0.10-1/debian
Author: drazzib
Date: 2012-03-02 18:43:17 + (Fri, 02 Mar 2012)
New Revision: 15808
Added:
tags/commons-daemon/1.0.10-1/
tags/commons-daemon/1.0.10-1/debian/changelog
tags/commons-daemon/1.0.10-1/debian/control
tags/commons-daemon/1.0.10-1/debian/copyright
tags/commons-daemon/1.0.10-1/debian/rules
Removed:
tags/commons-daemon/1.0.10-1/debian/changelog
tags/commons-daemon/1.0.10-1/debian/control
tags/commons-daemon/1.0.10-1/debian/copyright
tags/commons-daemon/1.0.10-1/debian/rules
Log:
[svn-buildpackage] Tagging commons-daemon 1.0.10-1
Deleted: tags/commons-daemon/1.0.10-1/debian/changelog
===
--- trunk/commons-daemon/debian/changelog 2012-03-02 05:35:10 UTC (rev
15806)
+++ tags/commons-daemon/1.0.10-1/debian/changelog 2012-03-02 18:43:17 UTC
(rev 15808)
@@ -1,278 +0,0 @@
-commons-daemon (1.0.8-1) unstable; urgency=low
-
- * New upstream release:
-- Refresh all patches.
-
- -- Damien Raude-Morvan draz...@debian.org Thu, 24 Nov 2011 19:29:26 +0100
-
-commons-daemon (1.0.7-2) unstable; urgency=low
-
- * Add support for s390x. Closes: #638907.
-
- -- Damien Raude-Morvan draz...@debian.org Mon, 22 Aug 2011 23:07:18 +0200
-
-commons-daemon (1.0.7-1) unstable; urgency=high
-
- * New upstream security release.
- * Fix CVE-2011-2729 (jsvc does not drop
-capabilities allowing the application to access files and directories
-owned by superuser).
-
- -- Damien Raude-Morvan draz...@debian.org Fri, 12 Aug 2011 19:36:58 +0200
-
-commons-daemon (1.0.6-1) unstable; urgency=low
-
- * New upstream release.
- * Refresh patches.
- * d/control: Move Depends default-jre-headless | java2-runtime-headless from
-libcommons-daemon-java to jsvc package Recommends.
- * d/copyright: Use DEP-5 format.
-
- -- Damien Raude-Morvan draz...@debian.org Sun, 10 Jul 2011 22:06:40 +0200
-
-commons-daemon (1.0.5-2) unstable; urgency=low
-
- * Publish commons daemon JAR into /usr/share/maven-repo.
- * d/control: Bump Standards-Version to 3.9.2: no changes needed.
-
- -- Damien Raude-Morvan draz...@debian.org Mon, 13 Jun 2011 19:25:17 +0200
-
-commons-daemon (1.0.5-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Damien Raude-Morvan draz...@debian.org Wed, 05 Jan 2011 22:01:53 +0100
-
-commons-daemon (1.0.4-1) unstable; urgency=low
-
- * New upstream release.
-- d/patches/syslog.diff: merged upstream.
-- d/patches/jsvc_reopen_usr1.diff: merged upstream.
-- d/patches/hurd_support.diff: use gnu instead of hurd.
-
- -- Damien Raude-Morvan draz...@debian.org Sun, 21 Nov 2010 18:05:41 +0100
-
-commons-daemon (1.0.3-2) UNRELEASED; urgency=low
-
- * d/patches/jsvc_reopen_usr1.diff:
-Make jsvc reopen log files on SIGUSR1 (Closes: #460183).
-
- -- Damien Raude-Morvan draz...@debian.org Tue, 31 Aug 2010 00:26:47 +0200
-
-commons-daemon (1.0.3-1) unstable; urgency=low
-
- * New upstream release.
-- debian/patches/old_capabilities.diff: merged upstream.
-- no more prebuilt ELF objects in source tarball.
- * d/pacthes/syslog.diff: Updated to keep timestamp when SYSLOG support
-is not enabled.
- * d/patches/hurd_support.diff: tentative support for GNU/Hurd OS.
- * d/control: B-D on libcap-dev for all Linux OS.
-
- -- Damien Raude-Morvan draz...@debian.org Thu, 05 Aug 2010 18:00:06 +0200
-
-commons-daemon (1.0.2-2) unstable; urgency=low
-
- * Re-add missing patches (lost during merge of new upstream release):
-- debian/patches/syslog.diff: Support for logging to syslog.
-- debian/patches/old_capabilities.diff: Work with older Linux capabilities.
-- debian/patches/libgcj_PR31700.diff: Bug in GCJ handling of -X options.
-- debian/patches/*_support.diff: Support for other Debian architectures.
-
- -- Damien Raude-Morvan draz...@debian.org Wed, 28 Jul 2010 14:59:18 +0200
-
-commons-daemon (1.0.2-1) unstable; urgency=low
-
- [ Thierry Carrez ]
- * debian/control, debian/rules: Build with default-jdk
- * debian/rules: Depend on -headless runtimes
- * debian/rules: Set java source/target to 1.4 to match depends
-
- [ Torsten Werner ]
- * Re-add changes made by Emmanuel Bourg:
-- Update of the URLs
-- Rename Jakarta Commons to Apache Commons
-
- [ Damien Raude-Morvan ]
- * New upstream stable release (Closes: #578661).
-- d/watch: Update URL for new upstream release.
- * d/patches/sh4-support.diff: Add support for sh4 arch (Closes: #564166).
- * d/control: Remove Arnaud and add myself from Uploaders.
- * Updated to Standards-Version 3.9.1:
-- d/control: Add recommended get-orig-source target.
- * d/control: Add ${misc:Depends} to Depends.
- * Switch to 3.0 (quilt) format.
- * Use Debhelper 7:
-- d/rules: Use dh 7 and cleanup our rules file.
-- d/*.dirs: Removed not needed anymore.
- * d/libcommons-daemon-java.doc-base and d/rules: Install API Javadoc to
-/usr/share/doc/libcommons-daemon-java/api.
-
- -- Damien Raude
[pkg-java] r15809 - in trunk/tomcat-native/debian: . patches
Author: drazzib
Date: 2012-03-02 18:55:24 + (Fri, 02 Mar 2012)
New Revision: 15809
Modified:
trunk/tomcat-native/debian/changelog
trunk/tomcat-native/debian/control
trunk/tomcat-native/debian/copyright
trunk/tomcat-native/debian/patches/drop_sslv2_support.diff
trunk/tomcat-native/debian/rules
Log:
* New upstream release.
* d/control: Build-Depends on dpkg-dev (= 1.16.1~) for hardening
flags
* d/rules: Enable hardening build.
* d/copyright: Use copyright-format 1.0.
* d/control: Bump Standards-Version to 3.9.3: no changes needed.
Modified: trunk/tomcat-native/debian/changelog
===
--- trunk/tomcat-native/debian/changelog2012-03-02 18:43:17 UTC (rev
15808)
+++ trunk/tomcat-native/debian/changelog2012-03-02 18:55:24 UTC (rev
15809)
@@ -1,10 +1,19 @@
-tomcat-native (1.1.22-2) UNRELEASED; urgency=low
+tomcat-native (1.1.23-1) unstable; urgency=low
+ [ tony mancill ]
* Team upload.
* Remove Michael Koch from Uploaders (Closes: #654135)
- -- tony mancill tmanc...@debian.org Mon, 09 Jan 2012 09:09:25 -0800
+ [ Damien Raude-Morvan ]
+ * New upstream release.
+ * d/control: Build-Depends on dpkg-dev (= 1.16.1~) for hardening
+flags
+ * d/rules: Enable hardening build.
+ * d/copyright: Use copyright-format 1.0.
+ * d/control: Bump Standards-Version to 3.9.3: no changes needed.
+ -- Damien Raude-Morvan draz...@debian.org Fri, 02 Mar 2012 19:51:58 +0100
+
tomcat-native (1.1.22-1) unstable; urgency=low
* New upstream release:
Modified: trunk/tomcat-native/debian/control
===
--- trunk/tomcat-native/debian/control 2012-03-02 18:43:17 UTC (rev 15808)
+++ trunk/tomcat-native/debian/control 2012-03-02 18:55:24 UTC (rev 15809)
@@ -3,24 +3,29 @@
Priority: extra
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
Uploaders: Damien Raude-Morvan draz...@debian.org
-Build-Depends: cdbs, debhelper (= 7), default-jdk, libapr1-dev, libssl-dev
-Standards-Version: 3.9.2
+Build-Depends: cdbs,
+ debhelper (= 7),
+ default-jdk,
+ dpkg-dev (= 1.16.1~),
+ libapr1-dev,
+ libssl-dev
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tomcat-native/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/tomcat-native/
Homepage: http://tomcat.apache.org/native-doc/
Package: libtcnative-1
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Tomcat native library using the apache portable runtime
Tomcat can use the Apache Portable Runtime to provide superior scalability,
- performance, and better integration with native server technologies.
+ performance, and better integration with native server technologies.
The Apache Portable Runtime is a highly portable library that is at the
heart of Apache HTTP Server 2.x. APR has many uses, including access to
advanced IO functionality (such as sendfile, epoll and OpenSSL), OS level
functionality (random number generation, system status, etc), and native
process handling (shared memory, NT pipes and Unix sockets).
- .
+ .
These features allows making Tomcat a general purpose webserver, will
enable much better integration with other native web technologies, and
overall make Java much more viable as a full fledged webserver platform
Modified: trunk/tomcat-native/debian/copyright
===
--- trunk/tomcat-native/debian/copyright2012-03-02 18:43:17 UTC (rev
15808)
+++ trunk/tomcat-native/debian/copyright2012-03-02 18:55:24 UTC (rev
15809)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Apache Tomcat Native Library
Upstream-Contact: http://tomcat.apache.org/native-doc/
Source: http://www.apache.org/dist/tomcat/tomcat-connectors/native/
@@ -15,4 +15,3 @@
License: Apache-2.0
A complete copy of the Apache License, Version 2.0, can be found in
/usr/share/common-licenses/Apache-2.0 on Debian Systems.
-
Modified: trunk/tomcat-native/debian/patches/drop_sslv2_support.diff
===
--- trunk/tomcat-native/debian/patches/drop_sslv2_support.diff 2012-03-02
18:43:17 UTC (rev 15808)
+++ trunk/tomcat-native/debian/patches/drop_sslv2_support.diff 2012-03-02
18:55:24 UTC (rev 15809)
@@ -4,8 +4,6 @@
Last-Update: 2011-08-12
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622141
Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=51056
-Index: b/jni/examples/org/apache/tomcat/jni/SSL.properties
-===
--- a/jni/examples/org/apache/tomcat/jni/SSL.properties
+++ b/jni
[pkg-java] r15810 - in tags/tomcat-native: . 1.1.23-1/debian 1.1.23-1/debian/patches
Author: drazzib Date: 2012-03-02 18:56:03 + (Fri, 02 Mar 2012) New Revision: 15810 Added: tags/tomcat-native/1.1.23-1/ tags/tomcat-native/1.1.23-1/debian/changelog tags/tomcat-native/1.1.23-1/debian/control tags/tomcat-native/1.1.23-1/debian/copyright tags/tomcat-native/1.1.23-1/debian/patches/drop_sslv2_support.diff tags/tomcat-native/1.1.23-1/debian/rules Removed: tags/tomcat-native/1.1.23-1/debian/changelog tags/tomcat-native/1.1.23-1/debian/control tags/tomcat-native/1.1.23-1/debian/copyright tags/tomcat-native/1.1.23-1/debian/patches/drop_sslv2_support.diff tags/tomcat-native/1.1.23-1/debian/rules Log: [svn-buildpackage] Tagging tomcat-native 1.1.23-1 Deleted: tags/tomcat-native/1.1.23-1/debian/changelog === --- trunk/tomcat-native/debian/changelog2012-03-02 05:35:10 UTC (rev 15806) +++ tags/tomcat-native/1.1.23-1/debian/changelog2012-03-02 18:56:03 UTC (rev 15810) @@ -1,98 +0,0 @@ -tomcat-native (1.1.22-2) UNRELEASED; urgency=low - - * Team upload. - * Remove Michael Koch from Uploaders (Closes: #654135) - - -- tony mancill tmanc...@debian.org Mon, 09 Jan 2012 09:09:25 -0800 - -tomcat-native (1.1.22-1) unstable; urgency=low - - * New upstream release: -- Update d/patches/drop_sslv2_support.diff patch. - - -- Damien Raude-Morvan draz...@debian.org Fri, 12 Aug 2011 20:02:57 +0200 - -tomcat-native (1.1.20-3) unstable; urgency=low - - * Switch to 3.0 quilt source format. - * d/patches/drop_sslv2_support.diff: Drop support for SSLv2 -(Closes: #622141). - * d/copyright: Update to DEP-5 format. - - -- Damien Raude-Morvan draz...@debian.org Sun, 10 Jul 2011 23:42:01 +0200 - -tomcat-native (1.1.20-2) unstable; urgency=low - - * Team upload. - * Remove *.la (Closes: #621279) - * Bump Standards-Version to 3.9.2 (no changes needed) - - -- tony mancill tmanc...@debian.org Sat, 09 Apr 2011 10:57:15 -0700 - -tomcat-native (1.1.20-1) unstable; urgency=low - - * New upstream release: -- Prevent crashing JVM on shutdown. - * Bump Standards-Version to 3.8.4 (no changes needed) - - -- Damien Raude-Morvan draz...@debian.org Sat, 20 Feb 2010 22:50:34 +0100 - -tomcat-native (1.1.19-1) unstable; urgency=low - - * New upstream release. -- minor versioning fix -- allows building against OpenSSL 1.0 - * Add a README.Debian to help users to setup Tomcat 6.x -with Tomcat Native Library - - -- Damien Raude-Morvan draz...@debian.org Sun, 17 Jan 2010 01:27:46 +0100 - -tomcat-native (1.1.18-1) unstable; urgency=high - - * New upstream release. -- Fix CVE-2009-3555 SSL-Man-In-The-Middle attack -- set urgency=high to get security fix in testing - - -- Damien Raude-Morvan draz...@debian.org Tue, 24 Nov 2009 01:46:20 +0100 - -tomcat-native (1.1.17-1) unstable; urgency=low - - * New upstream release. - * debian/control: -- Update my email address -- Bump Standards-Version to 3.8.3 (no changes needed) -- Bump debhelper version to = 7 -- Update upstream Homepage field -- Use default-jdk instead of default-jdk-builddep as there is no - native (-gcj) package build. - * debian/copyright: -- Update upstream copyright years -- Add myself as debian/* copyright holder - * debian/libtcnative-1.lintian-overrides: -- Change to be version agnostic - - -- Damien Raude-Morvan draz...@debian.org Sat, 07 Nov 2009 21:41:36 +0100 - -tomcat-native (1.1.16-1) unstable; urgency=low - - * New upstream release (Closes: #514500) -- Fix IPv6 issues (Closes: #517163, #521306) - * debian/control: -- Move libtcnative-1 to java section -- Add myself to Uploaders -- Bump Standards-Version to 3.8.1 (no changes needed) - * debian/watch: Update to new upstream location - * debian/rules: Provide a get-orig-source target using uscan - * debian/control: Build-Depends on default-jdk-builddep - * debian/rules: use JAVA_HOME=/usr/lib/jvm/default-java - * Remove debian/libtcnative-1.install and use dh_lintian -to install debian/libtcnative-1.lintian-overrides - - -- Damien Raude-Morvan draz...@drazzib.com Sun, 29 Mar 2009 15:40:58 +0200 - -tomcat-native (1.1.13-1) unstable; urgency=low - - * Initial release. Closes: #485037. - - -- Michael Koch konque...@gmx.de Sat, 07 Jun 2008 15:16:14 +0200 - Copied: tags/tomcat-native/1.1.23-1/debian/changelog (from rev 15809, trunk/tomcat-native/debian/changelog) === --- tags/tomcat-native/1.1.23-1/debian/changelog (rev 0) +++ tags/tomcat-native/1.1.23-1/debian/changelog2012-03-02 18:56:03 UTC (rev 15810) @@ -0,0 +1,107 @@ +tomcat-native (1.1.23-1) unstable; urgency=low + + [ tony mancill ] + * Team upload. + * Remove Michael Koch from Uploaders (Closes: #654135) + + [ Damien Raude-Morvan ] + * New upstream release. + * d/control: Build-Depends on dpkg-dev (= 1.16.1~) for hardening
[pkg-java] r15811 - trunk/commons-daemon/debian
Author: drazzib
Date: 2012-03-02 21:09:37 + (Fri, 02 Mar 2012)
New Revision: 15811
Modified:
trunk/commons-daemon/debian/changelog
trunk/commons-daemon/debian/control
trunk/commons-daemon/debian/copyright
trunk/commons-daemon/debian/rules
Log:
* d/control: Really drop Michael from Uploaders list.
* d/rules: Run autoconf before configure (because patches are applied
to apsupport.m4).
* d/control: Wrap-and-sort fields.
Modified: trunk/commons-daemon/debian/changelog
===
--- trunk/commons-daemon/debian/changelog 2012-03-02 18:56:03 UTC (rev
15810)
+++ trunk/commons-daemon/debian/changelog 2012-03-02 21:09:37 UTC (rev
15811)
@@ -1,3 +1,12 @@
+commons-daemon (1.0.10-2) unstable; urgency=low
+
+ * d/control: Really drop Michael from Uploaders list.
+ * d/rules: Run autoconf before configure (because patches are applied
+to apsupport.m4).
+ * d/control: Wrap-and-sort fields.
+
+ -- Damien Raude-Morvan draz...@debian.org Fri, 02 Mar 2012 22:07:21 +0100
+
commons-daemon (1.0.10-1) unstable; urgency=low
* New upstream release.
Modified: trunk/commons-daemon/debian/control
===
--- trunk/commons-daemon/debian/control 2012-03-02 18:56:03 UTC (rev 15810)
+++ trunk/commons-daemon/debian/control 2012-03-02 21:09:37 UTC (rev 15811)
@@ -2,10 +2,17 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Michael Koch konque...@gmx.de, Marcus Better mar...@better.se,
- Damien Raude-Morvan draz...@debian.org
-Build-Depends: debhelper (= 7.0.50~), autoconf, autotools-dev, default-jdk,
- xsltproc, docbook-xsl, ant, libcap-dev [linux-any], maven-repo-helper
+Uploaders: Marcus Better mar...@better.se,
+ Damien Raude-Morvan draz...@debian.org
+Build-Depends: ant,
+ autoconf,
+ autotools-dev,
+ debhelper (= 7.0.50~),
+ default-jdk,
+ docbook-xsl,
+ libcap-dev [linux-any],
+ maven-repo-helper,
+ xsltproc
Build-Conflicts: autoconf2.13
Standards-Version: 3.9.3
Homepage: http://commons.apache.org/daemon/
@@ -30,7 +37,7 @@
Package: jsvc
Section: utils
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libcommons-daemon-java
+Depends: libcommons-daemon-java, ${misc:Depends}, ${shlibs:Depends}
Recommends: default-jre-headless | java2-runtime-headless
Description: wrapper to launch Java applications as daemons
This is the native application for launching Java applications
Modified: trunk/commons-daemon/debian/copyright
===
--- trunk/commons-daemon/debian/copyright 2012-03-02 18:56:03 UTC (rev
15810)
+++ trunk/commons-daemon/debian/copyright 2012-03-02 21:09:37 UTC (rev
15811)
@@ -6,7 +6,7 @@
Files: *
Copyright: Copyright (C) 1999-2011 The Apache Software Foundation.
License: Apache-2.0
-Comment:
+Comment:
Upstream authors: Bill Barker, Jean-Frederic Clere, Mladen Turk,
Remy Maucherat, Pier Fumagalli, Yoav Shapira.
@@ -19,4 +19,3 @@
License: Apache-2.0
A complete copy of the Apache License, Version 2.0, can be found in
/usr/share/common-licenses/Apache-2.0 on Debian Systems.
-
Modified: trunk/commons-daemon/debian/rules
===
--- trunk/commons-daemon/debian/rules 2012-03-02 18:56:03 UTC (rev 15810)
+++ trunk/commons-daemon/debian/rules 2012-03-02 21:09:37 UTC (rev 15811)
@@ -16,6 +16,7 @@
dh $@ --sourcedirectory=$(NATIVE_SRC) --buildsystem=autoconf --with
autotools_dev
override_dh_auto_configure:
+ (cd $(NATIVE_SRC); autoconf)
dh_auto_configure -- --with-java=$(JAVA_HOME) $(shell dpkg-buildflags
--export=configure)
override_dh_auto_build:
___
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] r15812 - in tags/commons-daemon: . 1.0.10-2/debian
Author: drazzib
Date: 2012-03-02 21:13:18 + (Fri, 02 Mar 2012)
New Revision: 15812
Added:
tags/commons-daemon/1.0.10-2/
tags/commons-daemon/1.0.10-2/debian/changelog
tags/commons-daemon/1.0.10-2/debian/control
tags/commons-daemon/1.0.10-2/debian/copyright
tags/commons-daemon/1.0.10-2/debian/rules
Removed:
tags/commons-daemon/1.0.10-2/debian/changelog
tags/commons-daemon/1.0.10-2/debian/control
tags/commons-daemon/1.0.10-2/debian/copyright
tags/commons-daemon/1.0.10-2/debian/rules
Log:
[svn-buildpackage] Tagging commons-daemon 1.0.10-2
Deleted: tags/commons-daemon/1.0.10-2/debian/changelog
===
--- trunk/commons-daemon/debian/changelog 2012-03-02 05:35:10 UTC (rev
15806)
+++ tags/commons-daemon/1.0.10-2/debian/changelog 2012-03-02 21:13:18 UTC
(rev 15812)
@@ -1,278 +0,0 @@
-commons-daemon (1.0.8-1) unstable; urgency=low
-
- * New upstream release:
-- Refresh all patches.
-
- -- Damien Raude-Morvan draz...@debian.org Thu, 24 Nov 2011 19:29:26 +0100
-
-commons-daemon (1.0.7-2) unstable; urgency=low
-
- * Add support for s390x. Closes: #638907.
-
- -- Damien Raude-Morvan draz...@debian.org Mon, 22 Aug 2011 23:07:18 +0200
-
-commons-daemon (1.0.7-1) unstable; urgency=high
-
- * New upstream security release.
- * Fix CVE-2011-2729 (jsvc does not drop
-capabilities allowing the application to access files and directories
-owned by superuser).
-
- -- Damien Raude-Morvan draz...@debian.org Fri, 12 Aug 2011 19:36:58 +0200
-
-commons-daemon (1.0.6-1) unstable; urgency=low
-
- * New upstream release.
- * Refresh patches.
- * d/control: Move Depends default-jre-headless | java2-runtime-headless from
-libcommons-daemon-java to jsvc package Recommends.
- * d/copyright: Use DEP-5 format.
-
- -- Damien Raude-Morvan draz...@debian.org Sun, 10 Jul 2011 22:06:40 +0200
-
-commons-daemon (1.0.5-2) unstable; urgency=low
-
- * Publish commons daemon JAR into /usr/share/maven-repo.
- * d/control: Bump Standards-Version to 3.9.2: no changes needed.
-
- -- Damien Raude-Morvan draz...@debian.org Mon, 13 Jun 2011 19:25:17 +0200
-
-commons-daemon (1.0.5-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Damien Raude-Morvan draz...@debian.org Wed, 05 Jan 2011 22:01:53 +0100
-
-commons-daemon (1.0.4-1) unstable; urgency=low
-
- * New upstream release.
-- d/patches/syslog.diff: merged upstream.
-- d/patches/jsvc_reopen_usr1.diff: merged upstream.
-- d/patches/hurd_support.diff: use gnu instead of hurd.
-
- -- Damien Raude-Morvan draz...@debian.org Sun, 21 Nov 2010 18:05:41 +0100
-
-commons-daemon (1.0.3-2) UNRELEASED; urgency=low
-
- * d/patches/jsvc_reopen_usr1.diff:
-Make jsvc reopen log files on SIGUSR1 (Closes: #460183).
-
- -- Damien Raude-Morvan draz...@debian.org Tue, 31 Aug 2010 00:26:47 +0200
-
-commons-daemon (1.0.3-1) unstable; urgency=low
-
- * New upstream release.
-- debian/patches/old_capabilities.diff: merged upstream.
-- no more prebuilt ELF objects in source tarball.
- * d/pacthes/syslog.diff: Updated to keep timestamp when SYSLOG support
-is not enabled.
- * d/patches/hurd_support.diff: tentative support for GNU/Hurd OS.
- * d/control: B-D on libcap-dev for all Linux OS.
-
- -- Damien Raude-Morvan draz...@debian.org Thu, 05 Aug 2010 18:00:06 +0200
-
-commons-daemon (1.0.2-2) unstable; urgency=low
-
- * Re-add missing patches (lost during merge of new upstream release):
-- debian/patches/syslog.diff: Support for logging to syslog.
-- debian/patches/old_capabilities.diff: Work with older Linux capabilities.
-- debian/patches/libgcj_PR31700.diff: Bug in GCJ handling of -X options.
-- debian/patches/*_support.diff: Support for other Debian architectures.
-
- -- Damien Raude-Morvan draz...@debian.org Wed, 28 Jul 2010 14:59:18 +0200
-
-commons-daemon (1.0.2-1) unstable; urgency=low
-
- [ Thierry Carrez ]
- * debian/control, debian/rules: Build with default-jdk
- * debian/rules: Depend on -headless runtimes
- * debian/rules: Set java source/target to 1.4 to match depends
-
- [ Torsten Werner ]
- * Re-add changes made by Emmanuel Bourg:
-- Update of the URLs
-- Rename Jakarta Commons to Apache Commons
-
- [ Damien Raude-Morvan ]
- * New upstream stable release (Closes: #578661).
-- d/watch: Update URL for new upstream release.
- * d/patches/sh4-support.diff: Add support for sh4 arch (Closes: #564166).
- * d/control: Remove Arnaud and add myself from Uploaders.
- * Updated to Standards-Version 3.9.1:
-- d/control: Add recommended get-orig-source target.
- * d/control: Add ${misc:Depends} to Depends.
- * Switch to 3.0 (quilt) format.
- * Use Debhelper 7:
-- d/rules: Use dh 7 and cleanup our rules file.
-- d/*.dirs: Removed not needed anymore.
- * d/libcommons-daemon-java.doc-base and d/rules: Install API Javadoc to
-/usr/share/doc/libcommons-daemon-java/api.
-
- -- Damien Raude
[pkg-java] r15797 - trunk/ca-certificates-java/debian
Author: drazzib
Date: 2012-02-25 11:45:04 + (Sat, 25 Feb 2012)
New Revision: 15797
Added:
trunk/ca-certificates-java/debian/jks-keystore.hook.in
trunk/ca-certificates-java/debian/postinst.in
trunk/ca-certificates-java/debian/preinst
Removed:
trunk/ca-certificates-java/debian/jks-keystore.hook
trunk/ca-certificates-java/debian/postinst
Modified:
trunk/ca-certificates-java/debian/changelog
trunk/ca-certificates-java/debian/control
trunk/ca-certificates-java/debian/rules
Log:
* debian/jks-keystore.hook: If we *don't* find libnss3 / libnss3-1d,
don't remove files from the filesystem in do_cleanup(),
since this has a nasty tendency of nuking system libraries.
LP: #855171.
* debian/preinst, debian/postinst: when upgrading from version
20110912ubuntu1, disable the buggy hook script early to prevent it from
being run before our new version is configured; and re-enable the script
in the postinst. LP: #855246.
* Mark as Multi-Arch: foreign.
* Adjust the libnss3-1d versioned dependency.
* Add myself to Uploaders.
* Use dh_gencontrol and dpkg-vendor to allow:
- New substvar ${nss:Depends} for libnss3-1d versionning.
- New @NSS_LIB@ parameter for debian/*.in files.
Modified: trunk/ca-certificates-java/debian/changelog
===
--- trunk/ca-certificates-java/debian/changelog 2012-02-24 23:42:13 UTC (rev
15796)
+++ trunk/ca-certificates-java/debian/changelog 2012-02-25 11:45:04 UTC (rev
15797)
@@ -1,3 +1,27 @@
+ca-certificates-java (20120225) UNRELEASED; urgency=low
+
+ [ Steve Langasek ]
+ * debian/jks-keystore.hook: If we *don't* find libnss3 / libnss3-1d,
+don't remove files from the filesystem in do_cleanup(),
+since this has a nasty tendency of nuking system libraries.
+LP: #855171.
+ * debian/preinst, debian/postinst: when upgrading from version
+20110912ubuntu1, disable the buggy hook script early to prevent it from
+being run before our new version is configured; and re-enable the script
+in the postinst. LP: #855246.
+
+ [ Matthias Klose ]
+ * Mark as Multi-Arch: foreign.
+ * Adjust the libnss3-1d versioned dependency.
+
+ [ Damien Raude-Morvan ]
+ * Add myself to Uploaders.
+ * Use dh_gencontrol and dpkg-vendor to allow:
+- New substvar ${nss:Depends} for libnss3-1d versionning.
+- New @NSS_LIB@ parameter for debian/*.in files.
+
+ -- Damien Raude-Morvan draz...@debian.org Sat, 25 Feb 2012 12:40:51 +0100
+
ca-certificates-java (20111223) unstable; urgency=low
* Support new multiarch JRE packages in postinst.
Modified: trunk/ca-certificates-java/debian/control
===
--- trunk/ca-certificates-java/debian/control 2012-02-24 23:42:13 UTC (rev
15796)
+++ trunk/ca-certificates-java/debian/control 2012-02-25 11:45:04 UTC (rev
15797)
@@ -2,7 +2,7 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Matthias Klose d...@ubuntu.com, Torsten Werner
twer...@debian.org
+Uploaders: Matthias Klose d...@ubuntu.com, Torsten Werner
twer...@debian.org, Damien Raude-Morvan draz...@debian.org
Build-Depends: debhelper (= 6), default-jdk
Standards-Version: 3.8.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ca-certificates-java
@@ -10,7 +10,8 @@
Package: ca-certificates-java
Architecture: all
-Depends: ca-certificates (= 20090814), openjdk-6-jre-headless (=
6b16-1.6.1-2) | java6-runtime-headless, ${misc:Depends}, libnss3-1d (=
3.12.10-2~)
+Multi-Arch: foreign
+Depends: ca-certificates (= 20090814), openjdk-6-jre-headless (=
6b16-1.6.1-2) | java6-runtime-headless, ${misc:Depends}, ${nss:Depends}
# We need a versioned Depends due to multiarch changes (bug #635571).
#Recommends: libnss3-1d
Description: Common CA certificates (JKS keystore)
Deleted: trunk/ca-certificates-java/debian/jks-keystore.hook
===
--- trunk/ca-certificates-java/debian/jks-keystore.hook 2012-02-24 23:42:13 UTC
(rev 15796)
+++ trunk/ca-certificates-java/debian/jks-keystore.hook 2012-02-25 11:45:04 UTC
(rev 15797)
@@ -1,75 +0,0 @@
-#! /bin/sh
-
-set -e
-
-# use the locale C.UTF-8
-unset LC_ALL
-LC_CTYPE=C.UTF-8
-export LC_CTYPE
-
-storepass='changeit'
-if [ -f /etc/default/cacerts ]; then
-. /etc/default/cacerts
-fi
-
-echo
-if [ $cacerts_updates != yes ] || [ $CACERT_UPDATES = disabled ]; then
-echo updates of cacerts keystore disabled.
-exit 0
-fi
-
-if ! mountpoint -q /proc; then
-echo 2 the keytool command requires a mounted proc fs (/proc).
-exit 1
-fi
-
-for jdir in /usr/lib/jvm/java-[67]-openjdk* /usr/lib/jvm/java-6-sun; do
-if [ -x $jdir/bin/java ]; then
- break
-fi
-done
-export JAVA_HOME=$jdir
-PATH=$JAVA_HOME/bin:$PATH
-
-temp_jvm_cfg=
-if [ ! -f /etc/$jvm/jvm.cfg ]; then
-# the jre is not yet configured, but jvm.cfg is needed to run
[pkg-java] r15798 - trunk/ca-certificates-java/debian
Author: drazzib
Date: 2012-02-25 14:08:10 + (Sat, 25 Feb 2012)
New Revision: 15798
Modified:
trunk/ca-certificates-java/debian/changelog
trunk/ca-certificates-java/debian/control
trunk/ca-certificates-java/debian/rules
Log:
* Bump Standards-Version to 3.9.3:
- Add recommended build-arch / build-indep targets.
Modified: trunk/ca-certificates-java/debian/changelog
===
--- trunk/ca-certificates-java/debian/changelog 2012-02-25 11:45:04 UTC (rev
15797)
+++ trunk/ca-certificates-java/debian/changelog 2012-02-25 14:08:10 UTC (rev
15798)
@@ -1,4 +1,4 @@
-ca-certificates-java (20120225) UNRELEASED; urgency=low
+ca-certificates-java (20120225) unstable; urgency=low
[ Steve Langasek ]
* debian/jks-keystore.hook: If we *don't* find libnss3 / libnss3-1d,
@@ -19,8 +19,10 @@
* Use dh_gencontrol and dpkg-vendor to allow:
- New substvar ${nss:Depends} for libnss3-1d versionning.
- New @NSS_LIB@ parameter for debian/*.in files.
+ * Bump Standards-Version to 3.9.3:
+- Add recommended build-arch / build-indep targets.
- -- Damien Raude-Morvan draz...@debian.org Sat, 25 Feb 2012 12:40:51 +0100
+ -- Damien Raude-Morvan draz...@debian.org Sat, 25 Feb 2012 15:06:32 +0100
ca-certificates-java (20111223) unstable; urgency=low
Modified: trunk/ca-certificates-java/debian/control
===
--- trunk/ca-certificates-java/debian/control 2012-02-25 11:45:04 UTC (rev
15797)
+++ trunk/ca-certificates-java/debian/control 2012-02-25 14:08:10 UTC (rev
15798)
@@ -4,7 +4,7 @@
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
Uploaders: Matthias Klose d...@ubuntu.com, Torsten Werner
twer...@debian.org, Damien Raude-Morvan draz...@debian.org
Build-Depends: debhelper (= 6), default-jdk
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ca-certificates-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ca-certificates-java/
Modified: trunk/ca-certificates-java/debian/rules
===
--- trunk/ca-certificates-java/debian/rules 2012-02-25 11:45:04 UTC (rev
15797)
+++ trunk/ca-certificates-java/debian/rules 2012-02-25 14:08:10 UTC (rev
15798)
@@ -16,6 +16,8 @@
d = debian/ca-certificates-java
+build-arch: build
+build-indep: build
build: build-stamp
build-stamp:
dh_testdir
___
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] r15799 - in tags/ca-certificates-java: . 20120225/debian
in
- /etc/ca-certificates.conf, but not available on the system.
- Just warn about those. LP: #289091.
-- Need to run keytool, when the jre is unpacked, but not yet configured.
- Create a temporary jvm.cfg for the time in that postinst and the
- jks-keystore.hook are run, and remove it afterwards. LP: #289199.
-
- -- Matthias Klose d...@debian.org Mon, 27 Oct 2008 13:58:14 +0100
-
-ca-certificates-java (20081024) unstable; urgency=low
-
- * Install /etc/default/cacerts with mode 600.
-
- -- Matthias Klose d...@debian.org Fri, 24 Oct 2008 15:10:48 +0200
-
-ca-certificates-java (20081022) unstable; urgency=low
-
- * debian/jks-keystore.hook:
-- Don't stop after first error during the update. LP: #244412.
- Closes: #489748.
-- Call keytool with -noprompt.
- * On initial install, add locally added certificates. LP: #244410.
-Closes: #489748.
- * Install /etc/default/cacerts to set options:
-- storepass, holding the password for the keystore.
-- updates, to enable/disable updates of the keystore.
- * Only use the keytool command from OpenJDK or Sun Java. Closes: #496587.
-
- -- Matthias Klose d...@ubuntu.com Wed, 22 Oct 2008 20:51:24 +0200
-
-ca-certificates-java (20080712) unstable; urgency=low
-
- * Upload to main.
-
- -- Matthias Klose d...@ubuntu.com Sat, 12 Jul 2008 12:19:00 +0200
-
-ca-certificates-java (20080711) unstable; urgency=low
-
- * debian/jks-keystore.hook: Fix typo. Closes: #489747, LP: #244408.
-
- -- Matthias Klose d...@ubuntu.com Fri, 11 Jul 2008 20:38:04 +0200
-
-ca-certificates-java (20080514) unstable; urgency=low
-
- * Initial release.
-
- -- Matthias Klose d...@ubuntu.com Mon, 02 Jun 2008 14:52:46 +
-
Copied: tags/ca-certificates-java/20120225/debian/changelog (from rev 15798,
trunk/ca-certificates-java/debian/changelog)
===
--- tags/ca-certificates-java/20120225/debian/changelog
(rev 0)
+++ tags/ca-certificates-java/20120225/debian/changelog 2012-02-25 14:10:56 UTC
(rev 15799)
@@ -0,0 +1,178 @@
+ca-certificates-java (20120225) unstable; urgency=low
+
+ [ Steve Langasek ]
+ * debian/jks-keystore.hook: If we *don't* find libnss3 / libnss3-1d,
+don't remove files from the filesystem in do_cleanup(),
+since this has a nasty tendency of nuking system libraries.
+LP: #855171.
+ * debian/preinst, debian/postinst: when upgrading from version
+20110912ubuntu1, disable the buggy hook script early to prevent it from
+being run before our new version is configured; and re-enable the script
+in the postinst. LP: #855246.
+
+ [ Matthias Klose ]
+ * Mark as Multi-Arch: foreign.
+ * Adjust the libnss3-1d versioned dependency.
+
+ [ Damien Raude-Morvan ]
+ * Add myself to Uploaders.
+ * Use dh_gencontrol and dpkg-vendor to allow:
+- New substvar ${nss:Depends} for libnss3-1d versionning.
+- New @NSS_LIB@ parameter for debian/*.in files.
+ * Bump Standards-Version to 3.9.3:
+- Add recommended build-arch / build-indep targets.
+
+ -- Damien Raude-Morvan draz...@debian.org Sat, 25 Feb 2012 15:06:32 +0100
+
+ca-certificates-java (20111223) unstable; urgency=low
+
+ * Support new multiarch JRE packages in postinst.
+
+ -- Torsten Werner twer...@debian.org Fri, 23 Dec 2011 13:46:15 +0100
+
+ca-certificates-java (20110912) unstable; urgency=low
+
+ * Support new multiarch JRE packages in jks-keystore. (Closes: #641306)
+ * Support OpenJDK 7. (Closes: #641305)
+
+ -- Torsten Werner twer...@debian.org Mon, 12 Sep 2011 21:23:22 +0200
+
+ca-certificates-java (20110816) unstable; urgency=low
+
+ * Upgrade Recommends: libnss3-1d to a versioned Depends due to multiarch
+changes. (Closes: #635571)
+ * Use the locale C.UTF-8 for the hook script to be more robust.
+
+ -- Torsten Werner twer...@debian.org Tue, 16 Aug 2011 11:00:33 +0200
+
+ca-certificates-java (20110531) unstable; urgency=low
+
+ * Prepare for multiarch libnss3 update.
+
+ -- Matthias Klose d...@ubuntu.com Tue, 31 May 2011 15:20:52 +0200
+
+ca-certificates-java (20110426) unstable; urgency=low
+
+ * Test for existing file in postinst before copying it. (Closes: #624152)
+ * Add Vcs headers to debian/control.
+
+ -- Torsten Werner twer...@debian.org Tue, 26 Apr 2011 09:23:03 +0200
+
+ca-certificates-java (20110425) unstable; urgency=low
+
+ * Add Java code to update the keystore and support UTF-8 encoded filenames.
+(Closes: #607245, #623671)
+ * Change Maintainer to Debian Java Maintainers and add myself to Uploaders.
+ * Update Build-Depends.
+ * Replace old inconsistent keystore aliases. (Closes: #623888)
+ * Add support for openjdk-7 and remove support for old cacao VM.
+ * Add a NEWS file explaining the update.
+ * Update README.Debian.
+
+ -- Torsten Werner twer...@debian.org Mon, 25 Apr 2011 15:28:55 +0200
+
+ca-certificates-java (20100412) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Matthias Klose d
[pkg-java] r15794 - trunk/java-access-bridge/debian
Author: drazzib
Date: 2012-02-24 23:19:20 + (Fri, 24 Feb 2012)
New Revision: 15794
Modified:
trunk/java-access-bridge/debian/changelog
trunk/java-access-bridge/debian/control
trunk/java-access-bridge/debian/copyright
Log:
* Bump Standards-Version to 3.9.3: no changes needed.
* libaccess-bridge-java needs to be marked as Multi-Arch: foreign.
Patch from Benjamin Drung. (Closes: #655931).
Modified: trunk/java-access-bridge/debian/changelog
===
--- trunk/java-access-bridge/debian/changelog 2012-02-24 22:32:43 UTC (rev
15793)
+++ trunk/java-access-bridge/debian/changelog 2012-02-24 23:19:20 UTC (rev
15794)
@@ -1,3 +1,11 @@
+java-access-bridge (1.26.2-9) unstable; urgency=low
+
+ * Bump Standards-Version to 3.9.3: no changes needed.
+ * libaccess-bridge-java needs to be marked as Multi-Arch: foreign.
+Patch from Benjamin Drung. (Closes: #655931).
+
+ -- Damien Raude-Morvan draz...@debian.org Sat, 25 Feb 2012 00:09:35 +0100
+
java-access-bridge (1.26.2-8) unstable; urgency=medium
* d/rules: Handle both multi-arch or single-arch openjdk-{6,7},
Modified: trunk/java-access-bridge/debian/control
===
--- trunk/java-access-bridge/debian/control 2012-02-24 22:32:43 UTC (rev
15793)
+++ trunk/java-access-bridge/debian/control 2012-02-24 23:19:20 UTC (rev
15794)
@@ -17,13 +17,15 @@
pkg-config,
x11-utils
Build-Conflicts: dh-buildinfo
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://live.gnome.org/Java%20Access%20Bridge
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java-access-bridge
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/java-access-bridge/
Package: libaccess-bridge-java
+Multi-Arch: foreign
Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}
Recommends: libaccess-bridge-java-jni
Description: Java Access Bridge for GNOME
Modified: trunk/java-access-bridge/debian/copyright
===
--- trunk/java-access-bridge/debian/copyright 2012-02-24 22:32:43 UTC (rev
15793)
+++ trunk/java-access-bridge/debian/copyright 2012-02-24 23:19:20 UTC (rev
15794)
@@ -3,7 +3,7 @@
It was downloaded from
http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge
-Upstream Authors:
+Upstream Authors:
Bill Haneman bill.hane...@sun.com
Louise Miller
@@ -14,7 +14,7 @@
Padraig O'Briain padraig.obri...@sun.com
Darren Kenny darren.ke...@sun.com
-Copyright:
+Copyright:
Portions Copyright © 2002-2007 Bill Haneman bill.hane...@sun.com
Portions Copyright © 2002-2007 Louise Miller
___
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] r15795 - in tags/java-access-bridge: . 1.26.2-9/debian
Author: drazzib
Date: 2012-02-24 23:19:47 + (Fri, 24 Feb 2012)
New Revision: 15795
Added:
tags/java-access-bridge/1.26.2-9/
tags/java-access-bridge/1.26.2-9/debian/changelog
tags/java-access-bridge/1.26.2-9/debian/control
tags/java-access-bridge/1.26.2-9/debian/copyright
Removed:
tags/java-access-bridge/1.26.2-9/debian/changelog
tags/java-access-bridge/1.26.2-9/debian/control
tags/java-access-bridge/1.26.2-9/debian/copyright
Log:
[svn-buildpackage] Tagging java-access-bridge 1.26.2-9
Deleted: tags/java-access-bridge/1.26.2-9/debian/changelog
===
--- trunk/java-access-bridge/debian/changelog 2012-02-19 18:41:05 UTC (rev
15789)
+++ tags/java-access-bridge/1.26.2-9/debian/changelog 2012-02-24 23:19:47 UTC
(rev 15795)
@@ -1,195 +0,0 @@
-java-access-bridge (1.26.2-8) unstable; urgency=medium
-
- * d/rules: Handle both multi-arch or single-arch openjdk-{6,7},
-it should help to fix FTBFS on ia64.
- * d/control: Force a Depends on openjdk-7 for [hurd-any] even
-it's not, yet, ported. Will set a Dep-Wait state for buildd.
-
- -- Damien Raude-Morvan draz...@debian.org Tue, 06 Sep 2011 23:52:05 +0200
-
-java-access-bridge (1.26.2-7) unstable; urgency=low
-
- [ Niels Thykier ]
- * Bumped debhelper compat to 8.
- * Made the descriptions unique.
- * Used © instead of (C) in the copyright file.
- * Used the public Vcs-Svn link that does not require an alioth
-account.
- * Remove unneeded dependency on JRE packages
-(Closes: #587566, #600664, #639952).
-
- [ Damien Raude-Morvan ]
- * Add myself as Uploaders.
- * Switch to dpkg-source 3.0 (quilt) format:
-- Extract d/patches/use_accesscontroller_for_javaversion.diff
- * Build with openjdk-7 under kfreebsd-any:
-- d/control: B-D depends on openjdk-7 [kfreebsd-any].
-- d/rules: check DEB_HOST_ARCH to choose JAVA_HOME.
- * Handle multi-arch openjdk-{6-7}:
-- d/control: Append DEB_HOST_ARCH to java-1.x.y-openjdk
- (Closes: #639951).
- * Drop the compat symlinks in /usr/lib/jni, so that the package can be
-Multi-Arch: same.
- * For Multi-Arch add versionned B-D on cdbs (= 0.4.93)
-and debhelper (= 8.1.3).
- * Use DEB_CONFIGURE_EXTRA_FLAGS to install to the multi-arch directory
instead
-of moving files around.
-
- -- Damien Raude-Morvan draz...@debian.org Sat, 03 Sep 2011 00:04:13 +0200
-
-java-access-bridge (1.26.2-6) unstable; urgency=low
-
- * Install in a multiarch location, still provide compatibility symlinks.
-
- -- Matthias Klose d...@debian.org Sat, 27 Aug 2011 14:14:34 +0200
-
-java-access-bridge (1.26.2-5) unstable; urgency=low
-
- * Use an AccessController to access java.version property.
-
- -- Matthias Klose d...@debian.org Fri, 16 Jul 2010 13:55:00 +0200
-
-java-access-bridge (1.26.2-4) unstable; urgency=low
-
- * Build-depend on libgtk2.0-dev. Closes: #556804.
-
- -- Matthias Klose d...@debian.org Fri, 08 Jan 2010 01:42:13 +0100
-
-java-access-bridge (1.26.2-3) unstable; urgency=low
-
- * libaccess-bridge-java: Depend on -jre, not -jre-headless.
-
- -- Matthias Klose d...@debian.org Tue, 06 Oct 2009 19:23:22 +0200
-
-java-access-bridge (1.26.2-2) unstable; urgency=low
-
- * libaccess-bridge-java-jni: Depend on libaccess-bridge-java.
-
- -- Matthias Klose d...@debian.org Sun, 04 Oct 2009 22:10:36 +0200
-
-java-access-bridge (1.26.2-1) unstable; urgency=low
-
- * new upstream version
-
- -- Torsten Werner twer...@debian.org Thu, 11 Jun 2009 22:42:13 +0200
-
-java-access-bridge (1.26.0-1) unstable; urgency=low
-
- * Sync with Ubuntu:
-- new upstream version
-- new binary package libaccess-bridge-java-jni
-- remove debian/patches and quilt
-- minor cleanups
- * Remove useless debian/dirs.
- * Change Section: java.
- * Add missing Depends: ${misc:Depends}.
-
- -- Torsten Werner twer...@debian.org Sat, 16 May 2009 18:01:54 +0200
-
-java-access-bridge (1.26.0-0ubuntu5) karmic; urgency=low
-
- * libaccess-bridge-java: Add recommendation on libaccess-bridge-java-jni.
-
- -- Matthias Klose d...@ubuntu.com Wed, 13 May 2009 19:16:18 +0200
-
-java-access-bridge (1.26.0-0ubuntu4) karmic; urgency=low
-
- * libaccess-bridge-java: Drop the dependency on libaccess-bridge-java-jni,
-until the package is built on sparc.
-
- -- Matthias Klose d...@ubuntu.com Wed, 13 May 2009 11:04:28 +0200
-
-java-access-bridge (1.26.0-0ubuntu3) karmic; urgency=low
-
- * Build dependencies are architecture specific now.
-
- -- Matthias Klose d...@ubuntu.com Tue, 12 May 2009 13:47:50 +0200
-
-java-access-bridge (1.26.0-0ubuntu2) karmic; urgency=low
-
- * Split out libaccess-bridge-java-jni. LP: #375347.
-
- -- Matthias Klose d...@ubuntu.com Tue, 12 May 2009 13:07:11 +0200
-
-java-access-bridge (1.26.0-0ubuntu1) karmic; urgency=low
-
- * New upstream release.
-
- -- Matthias Klose d...@ubuntu.com Mon, 23 Mar 2009 20:21:22 +0100
-
-java-access-bridge (1.24.0-2) experimental; urgency=low
[SCM] guava-libraries: suite of Google Common Libraries for Java 5.0 branch, pristine-tar, updated. f82d940973ebbf2503105594ed6542deabc69163
The following commit has been merged in the pristine-tar branch: commit f82d940973ebbf2503105594ed6542deabc69163 Author: Damien Raude-Morvan draz...@debian.org Date: Wed Feb 22 23:03:37 2012 +0100 pristine-tar data for guava-libraries_11.0.2.orig.tar.gz diff --git a/guava-libraries_11.0.2.orig.tar.gz.delta b/guava-libraries_11.0.2.orig.tar.gz.delta new file mode 100644 index 000..e7b9d87 Binary files /dev/null and b/guava-libraries_11.0.2.orig.tar.gz.delta differ diff --git a/guava-libraries_11.0.2.orig.tar.gz.id b/guava-libraries_11.0.2.orig.tar.gz.id new file mode 100644 index 000..2a68859 --- /dev/null +++ b/guava-libraries_11.0.2.orig.tar.gz.id @@ -0,0 +1 @@ +7042d41db72bc6181d78b974c45957314a15d44a -- guava-libraries: suite of Google Common Libraries for Java 5.0 ___ 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] guava-libraries: suite of Google Common Libraries for Java 5.0 branch, master, updated. debian/09-2-5-gb6bf6eb
The following commit has been merged in the master branch: commit 8b32e7e5b421a85c8d7b76e2c6dce6030bd46836 Author: Damien Raude-Morvan draz...@debian.org Date: Wed Feb 22 23:03:10 2012 +0100 New upstream release. diff --git a/debian/changelog b/debian/changelog index 004bde0..ab090d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +guava-libraries (11.0.2-1) unstable; urgency=low + + * New upstream release. + + -- Damien Raude-Morvan draz...@debian.org Wed, 22 Feb 2012 22:54:31 +0100 + guava-libraries (09-2) unstable; urgency=low * Team upload. diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 9455ff5..fe2930c 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -4,9 +4,10 @@ VERSION=$2 TAR=../guava-libraries_$VERSION.orig.tar.gz DIR=guava-r$VERSION -unzip $3 mkdir -p $DIR/src/main/java -unzip $DIR/guava-src-r$VERSION.zip -d $DIR/src/main/java +(cd $DIR/src/main/java + jar xf ../../../../$3 +) GZIP=--best tar -cz --owner root --group root --mode a+rX \ --anchored -X debian/orig-tar.excludes -f $TAR $DIR rm -rf $DIR $3 diff --git a/debian/watch b/debian/watch index a68c14d..5c06ade 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,3 @@ version=3 opts=uversionmangle=s/r// \ - http://code.google.com/p/guava-libraries/downloads/list .*/guava-([[:alnum:].-]+)\.zip \ - debian debian/orig-tar.sh + http://repo1.maven.org/maven2/com/google/guava/guava/([\d][\d\.]+)/guava-([\d\.]+)-sources.jar debian debian/orig-tar.sh -- guava-libraries: suite of Google Common Libraries for Java 5.0 ___ 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] guava-libraries: suite of Google Common Libraries for Java 5.0 branch, master, updated. debian/09-2-5-gb6bf6eb
The following commit has been merged in the master branch: commit 7a95e0a6477a3e541a161cf631e98ae4684730d6 Author: Damien Raude-Morvan draz...@debian.org Date: Wed Feb 22 23:04:51 2012 +0100 Team upload. diff --git a/debian/changelog b/debian/changelog index ab090d8..fb5141e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ guava-libraries (11.0.2-1) unstable; urgency=low + * Team upload. * New upstream release. - -- Damien Raude-Morvan draz...@debian.org Wed, 22 Feb 2012 22:54:31 +0100 + -- Damien Raude-Morvan draz...@debian.org Wed, 22 Feb 2012 23:04:40 +0100 guava-libraries (09-2) unstable; urgency=low -- guava-libraries: suite of Google Common Libraries for Java 5.0 ___ 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] guava-libraries: suite of Google Common Libraries for Java 5.0 branch, master, updated. debian/09-2-5-gb6bf6eb
The following commit has been merged in the master branch:
commit b6bf6eba8baf89cd4040c23592716975e4d30f1f
Author: Damien Raude-Morvan draz...@debian.org
Date: Wed Feb 22 23:10:00 2012 +0100
Update pom.
diff --git a/debian/pom.xml b/debian/pom.xml
index d016fe2..14709e9 100644
--- a/debian/pom.xml
+++ b/debian/pom.xml
@@ -3,68 +3,35 @@
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
parent
-groupIdcom.google/groupId
-artifactIdgoogle/artifactId
-version5/version
+groupIdcom.google.guava/groupId
+artifactIdguava-parent/artifactId
+version11.0.2/version
/parent
- groupIdcom.google.guava/groupId
artifactIdguava/artifactId
- versionr09/version
- packagingjar/packaging
- nameGuava (Google Common Libraries)/name
+ nameGuava: Google Core Libraries for Java/name
description
-Guava is a suite of core and expanded libraries that include
-utility classes, google's collections, io classes, and much
+Guava is a suite of core and expanded libraries that include
+utility classes, google's collections, io classes, and much
much more.
-
+
This project is a complete packaging of all the Guava libraries
into a single jar. Individual portions of Guava can be used
by downloading the appropriate module and its dependencies.
-
+
Guava (complete) has only one code dependency - javax.annotation,
per the JSR-305 spec.
/description
- urlhttp://code.google.com/p/guava-libraries/url
- issueManagement
- systemcode.google.com/system
- urlhttp://code.google.com/p/guava-libraries/issues/url
- /issueManagement
- inceptionYear2010/inceptionYear
- licenses
-license
- nameThe Apache Software License, Version 2.0/name
- urlhttp://www.apache.org/licenses/LICENSE-2.0.txt/url
- distributionrepo/distribution
-/license
- /licenses
- prerequisites
-maven2.0.9/maven
- /prerequisites
- scm
-
connectionscm:svn:http://guava-libraries.googlecode.com/svn/trunk//connection
-
developerConnectionscm:svn:https://guava-libraries.googlecode.com/svn/trunk//developerConnection
-urlhttp://code.google.com/p/guava-libraries/source/browse/url
- /scm
- developers
-developer
- idkevinb9n/id
- nameKevin Bourillion/name
- emailkev...@google.com/email
- organizationGoogle/organization
- organizationUrlhttp://www.google.com/organizationUrl
- roles
-roleowner/role
-roledeveloper/role
- /roles
- timezone-8/timezone
-/developer
- /developers
dependencies
dependency
groupIdcom.google.code.findbugs/groupId
artifactIdjsr305/artifactId
- version1.3.7/version
- optionaltrue/optional
+ version1.3.9/version
+/dependency
+dependency
+ groupId${project.groupId}/groupId
+ artifactIdguava-bootstrap/artifactId
+ version${project.version}/version
+ scopeprovided/scope
/dependency
dependency
groupIdjunit/groupId
@@ -78,14 +45,107 @@
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-compiler-plugin/artifactId
+version2.3.2/version
configuration
source1.5/source
target1.5/target
+ !-- Prepend guava-bootstrap to avoid an API incompatibility between
JDK5 and JDK6 --
+
compilerArgument-Xbootclasspath/p:${project.build.directory}/dependency/guava-bootstrap-${project.version}.jar/compilerArgument
+/configuration
+ /plugin
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-dependency-plugin/artifactId
+version2.3/version
+executions
+ execution
+idprep-guava-bootstrap/id
+phaseprocess-sources/phase
+goalsgoalcopy-dependencies/goal/goals
+configuration
+ includeArtifactIdsguava-bootstrap/includeArtifactIds
+ excludeTransitivetrue/excludeTransitive
+ includeScopeprovided/includeScope
+/configuration
+ /execution
+/executions
+ /plugin
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-source-plugin/artifactId
+version2.1.2/version
+executions
+ execution
+idattach-sources/id
+phaseverify/phase
+goals
+ goaljar-no-fork/goal
+/goals
+ /execution
+/executions
+ /plugin
+ plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIdanimal-sniffer-maven-plugin/artifactId
+version1.7/version
+configuration
+ signature
+groupIdorg.codehaus.mojo.signature/groupId
+artifactIdjava15-sun/artifactId
+version1.0/version
+ /signature
+/configuration
+executions
+ execution
[SCM] guava-libraries: suite of Google Common Libraries for Java 5.0 branch, master, updated. debian/09-2-5-gb6bf6eb
The following commit has been merged in the master branch: commit b85674d9c0d192ca8f9bc72836c1e5ca87d4ee31 Merge: 8b32e7e5b421a85c8d7b76e2c6dce6030bd46836 7042d41db72bc6181d78b974c45957314a15d44a Author: Damien Raude-Morvan draz...@debian.org Date: Wed Feb 22 23:03:37 2012 +0100 Merge tag 'upstream/11.0.2' Upstream version 11.0.2 -- guava-libraries: suite of Google Common Libraries for Java 5.0 ___ 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] guava-libraries: suite of Google Common Libraries for Java 5.0 annotated tag, debian/11.0.2-1, created. debian/11.0.2-1
The annotated tag, debian/11.0.2-1 has been created at 26acd63fa9d93dd8f5e1a5d657ebb1468d1767c7 (tag) tagging b6bf6eba8baf89cd4040c23592716975e4d30f1f (commit) replaces debian/09-2 tagged by Damien Raude-Morvan on Wed Feb 22 23:11:17 2012 +0100 - Shortlog Debian release 11.0.2-1 Damien Raude-Morvan (5): New upstream release. Imported Upstream version 11.0.2 Merge tag 'upstream/11.0.2' Team upload. Update pom. --- -- guava-libraries: suite of Google Common Libraries for Java 5.0 ___ 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] guava-libraries: suite of Google Common Libraries for Java 5.0 annotated tag, upstream/11.0.2, created. upstream/11.0.2
The annotated tag, upstream/11.0.2 has been created at 8b43751655b19b3079f0a622e677025a9e339562 (tag) tagging 7042d41db72bc6181d78b974c45957314a15d44a (commit) replaces upstream/09 tagged by Damien Raude-Morvan on Wed Feb 22 23:03:37 2012 +0100 - Shortlog Upstream version 11.0.2 Damien Raude-Morvan (1): Imported Upstream version 11.0.2 --- -- guava-libraries: suite of Google Common Libraries for Java 5.0 ___ 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] r15790 - in trunk/jajuk/debian: . patches
Author: drazzib Date: 2012-02-22 22:19:44 + (Wed, 22 Feb 2012) New Revision: 15790 Modified: trunk/jajuk/debian/MANIFEST.MF trunk/jajuk/debian/changelog trunk/jajuk/debian/control trunk/jajuk/debian/copyright trunk/jajuk/debian/patches/01_override_manifest.diff trunk/jajuk/debian/patches/02_lastfm_fix_0_1_0.diff trunk/jajuk/debian/rules Log: * New upstream release. * Refresh patches. * Use Guava: - d/control: Build-Depends and Depends on libguava-java r11. - d/rules: Add guava to DEB_JARS. - d/MANIFEST.MF: Add guava to runtime classpath. * d/copyright: Small fixes, thanks to lintian! Modified: trunk/jajuk/debian/MANIFEST.MF === --- trunk/jajuk/debian/MANIFEST.MF 2012-02-19 18:41:05 UTC (rev 15789) +++ trunk/jajuk/debian/MANIFEST.MF 2012-02-22 22:19:44 UTC (rev 15790) @@ -1,5 +1,5 @@ Manifest-Version: 2.0 Main-Class: org.jajuk.Main Created-By: Jajuk team -Class-Path: animation.jar basicplayer.jar cobra.jar commons-codec.jar commons-collections3.jar commons-httpclient.jar commons-logging.jar entagged-tageditor.jar jaudiotagger.jar jcommon.jar jfreechart.jar jl.jar jmactritonusspi.jar jogg.jar jorbis.jar jspeex.jar laf-plugin.jar laf-widget.jar log4j-1.2.jar mp3spi.jar substance.jar swingx.jar tritonus_share.jar vldocking.jar vorbisspi.jar jajuk-help.jar jajuk-help_fr.jar dbus.jar miglayout.jar jhlabs-filters.jar lastfm.jar commons-io.jar commons-lang.jar xstream.jar jna.jar js.jar simple-validation.jar +Class-Path: animation.jar basicplayer.jar cobra.jar commons-codec.jar commons-collections3.jar commons-httpclient.jar commons-logging.jar entagged-tageditor.jar jaudiotagger.jar jcommon.jar jfreechart.jar jl.jar jmactritonusspi.jar jogg.jar jorbis.jar jspeex.jar laf-plugin.jar laf-widget.jar log4j-1.2.jar mp3spi.jar substance.jar swingx.jar tritonus_share.jar vldocking.jar vorbisspi.jar jajuk-help.jar jajuk-help_fr.jar dbus.jar miglayout.jar jhlabs-filters.jar lastfm.jar commons-io.jar commons-lang.jar xstream.jar jna.jar js.jar simple-validation.jar guava.jar Specification-Title: Jajuk Modified: trunk/jajuk/debian/changelog === --- trunk/jajuk/debian/changelog2012-02-19 18:41:05 UTC (rev 15789) +++ trunk/jajuk/debian/changelog2012-02-22 22:19:44 UTC (rev 15790) @@ -1,3 +1,15 @@ +jajuk (1:1.9.6-1) unstable; urgency=low + + * New upstream release. + * Refresh patches. + * Use Guava: +- d/control: Build-Depends and Depends on libguava-java r11. +- d/rules: Add guava to DEB_JARS. +- d/MANIFEST.MF: Add guava to runtime classpath. + * d/copyright: Small fixes, thanks to lintian! + + -- Damien Raude-Morvan draz...@debian.org Wed, 22 Feb 2012 23:15:18 +0100 + jajuk (1:1.9.5-3) unstable; urgency=low * Fix FTBFS: JAVA_HOME not defined correctly., in debian/rules: Modified: trunk/jajuk/debian/control === --- trunk/jajuk/debian/control 2012-02-19 18:41:05 UTC (rev 15789) +++ trunk/jajuk/debian/control 2012-02-22 22:19:44 UTC (rev 15790) @@ -17,6 +17,7 @@ libcommons-lang-java, libcommons-logging-java, libdbus-java, + libguava-java (= 11), libjaudiotagger-java (= 2.0.0), libjcommon-java, libjfreechart-java, @@ -58,6 +59,7 @@ libcommons-lang-java, libcommons-logging-java, libdbus-java, + libguava-java (= 11), libjaudiotagger-java (= 2.0.0), libjcommon-java, libjfreechart-java, Modified: trunk/jajuk/debian/copyright === --- trunk/jajuk/debian/copyright2012-02-19 18:41:05 UTC (rev 15789) +++ trunk/jajuk/debian/copyright2012-02-22 22:19:44 UTC (rev 15790) @@ -23,27 +23,27 @@ Copyright: 2009 Zdenek Pech License: GPL-2+ -Files: src/main/java/ext/JSplashLabel.java, - src/main/java/ext/ProcessLauncher.java, - src/main/java/ext/AutoCompleteDocument.java, - src/main/java/ext/JVM.java, - src/main/java/ext/AutoCompleteDecorator.java, - src/main/java/ext/JXTrayIcon.java, +Files: src/main/java/ext/JSplashLabel.java + src/main/java/ext/ProcessLauncher.java + src/main/java/ext/AutoCompleteDocument.java + src/main/java/ext/JVM.java + src/main/java/ext/AutoCompleteDecorator.java + src/main/java/ext/JXTrayIcon.java src/main/java/ext/JSplash.java Copyright: © 2007 The Jajuk Team Copyright: (c) 2004,2005 Gregory Kotsaftis gregkotsaf...@yahoo.com Copyright: (C) 2006 Fabio MARAZZATO, Yann D'ISANTO Copyright: © 2004, 2006, 2008 Sun Microsystems, Inc. -Licence: LGPL-2.1+ +License: LGPL-2.1+ -Files: src/main/java/ext/services/lastfm/*, - src/main/java/ext/services/network/NetworkUtils.java, +Files: src/main/java/ext/services/lastfm/* + src/main
Bug#657870: Multiple issues in Struts
Hi Moritz, Le jeudi 16 février 2012 19:42:09, Damien Raude-Morvan a écrit : On 09/02/2012 21:16, Moritz Mühlenhoff wrote: There's a new issues, which affects 1.x: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-1007 From [1], it seems there is no actual fix for this issue :( I'll contact Struts Security Team on this matter. Okay, I got some feedback for Struts Security Team. This particular security issue doesn't affect Struts as binary library (ie. /usr/share/java/struts-1.2.jar is unaffected) but concern only samples provided as source is /usr/share/doc/libstruts1.2-java/example* Do you think we should provide an updated package for squeeze (I think we can just drop examples) ? Cheers, -- Damien signature.asc Description: This is a digitally signed message part. __ 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] r15783 - trunk/libsimple-validation-java/debian
Author: drazzib
Date: 2012-02-19 11:53:43 + (Sun, 19 Feb 2012)
New Revision: 15783
Modified:
trunk/libsimple-validation-java/debian/changelog
trunk/libsimple-validation-java/debian/control
trunk/libsimple-validation-java/debian/rules
Log:
* Team upload.
* Use javahelper to add Class-Path variable and install JAR.
Classpath now contains org-openide-util-* JARs which are used by
simple-validation (this should prevent a crash in Jajuk).
Modified: trunk/libsimple-validation-java/debian/changelog
===
--- trunk/libsimple-validation-java/debian/changelog2012-02-16 03:09:54 UTC
(rev 15782)
+++ trunk/libsimple-validation-java/debian/changelog2012-02-19 11:53:43 UTC
(rev 15783)
@@ -1,3 +1,12 @@
+libsimple-validation-java (0.4-3) unstable; urgency=low
+
+ * Team upload.
+ * Use javahelper to add Class-Path variable and install JAR.
+Classpath now contains org-openide-util-* JARs which are used by
+simple-validation (this should prevent a crash in Jajuk).
+
+ -- Damien Raude-Morvan draz...@debian.org Sun, 19 Feb 2012 12:49:56 +0100
+
libsimple-validation-java (0.4-2) unstable; urgency=low
* Team upload.
Modified: trunk/libsimple-validation-java/debian/control
===
--- trunk/libsimple-validation-java/debian/control 2012-02-16 03:09:54 UTC
(rev 15782)
+++ trunk/libsimple-validation-java/debian/control 2012-02-19 11:53:43 UTC
(rev 15783)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
Uploaders: Varun Hiremath va...@debian.org
-Build-Depends: debhelper (= 7), cdbs
+Build-Depends: debhelper (= 7), cdbs, javahelper
Build-Depends-Indep: ant-optional, default-jdk
Standards-Version: 3.9.2
Homepage: http://kenai.com/projects/simplevalidation/pages/Home
@@ -12,7 +12,7 @@
Package: libsimple-validation-java
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ${java:Depends}
Description: library for quickly adding validation code to Swing
user-interfaces
This is a simple library for retrofitting user-interface input
validation to Swing applications. It handles validating user input
Modified: trunk/libsimple-validation-java/debian/rules
===
--- trunk/libsimple-validation-java/debian/rules2012-02-16 03:09:54 UTC
(rev 15782)
+++ trunk/libsimple-validation-java/debian/rules2012-02-19 11:53:43 UTC
(rev 15783)
@@ -8,9 +8,14 @@
DEB_ANT_ARGS:= -Dplatforms.JDK_1.5.home=$(JAVA_HOME)
DEB_JARS := ant-nodeps
-install/libsimple-validation-java::
- install -m644 -D dist/ValidationAPI.jar
$(DEB_DESTDIR)/usr/share/java/simple-validation-$(DEB_UPSTREAM_VERSION).jar
- dh_link -plibsimple-validation-java
/usr/share/java/simple-validation-$(DEB_UPSTREAM_VERSION).jar
/usr/share/java/simple-validation.jar
+clean::
+ jh_build --clean
+install/libsimple-validation-java::
+ mv dist/ValidationAPI.jar dist/simple-validation.jar
+ jh_classpath --classpath=/usr/share/java/org-openide-util-lookup.jar
/usr/share/java/org-openide-util.jar dist/simple-validation.jar
+ jh_installlibs dist/simple-validation.jar
+ jh_depends
+
get-orig-source:
sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)
___
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] r15784 - in tags/libsimple-validation-java: . 0.4-3/debian
Author: drazzib
Date: 2012-02-19 11:55:07 + (Sun, 19 Feb 2012)
New Revision: 15784
Added:
tags/libsimple-validation-java/0.4-3/
tags/libsimple-validation-java/0.4-3/debian/changelog
tags/libsimple-validation-java/0.4-3/debian/control
tags/libsimple-validation-java/0.4-3/debian/rules
Removed:
tags/libsimple-validation-java/0.4-3/debian/changelog
tags/libsimple-validation-java/0.4-3/debian/control
tags/libsimple-validation-java/0.4-3/debian/rules
Log:
[svn-buildpackage] Tagging libsimple-validation-java 0.4-3
Deleted: tags/libsimple-validation-java/0.4-3/debian/changelog
===
--- trunk/libsimple-validation-java/debian/changelog2012-02-11 17:27:40 UTC
(rev 15772)
+++ tags/libsimple-validation-java/0.4-3/debian/changelog 2012-02-19
11:55:07 UTC (rev 15784)
@@ -1,13 +0,0 @@
-libsimple-validation-java (0.4-2) unstable; urgency=low
-
- * Team upload.
- * Remove Java runtime from Depends.
- * Update Standards-Version: 3.9.2.
-
- -- Torsten Werner twer...@debian.org Sun, 11 Sep 2011 21:12:40 +0200
-
-libsimple-validation-java (0.4-1) unstable; urgency=low
-
- * Initial release (Closes: #570322)
-
- -- Varun Hiremath va...@debian.org Wed, 17 Feb 2010 21:31:35 -0500
Copied: tags/libsimple-validation-java/0.4-3/debian/changelog (from rev 15783,
trunk/libsimple-validation-java/debian/changelog)
===
--- tags/libsimple-validation-java/0.4-3/debian/changelog
(rev 0)
+++ tags/libsimple-validation-java/0.4-3/debian/changelog 2012-02-19
11:55:07 UTC (rev 15784)
@@ -0,0 +1,22 @@
+libsimple-validation-java (0.4-3) unstable; urgency=low
+
+ * Team upload.
+ * Use javahelper to add Class-Path variable and install JAR.
+Classpath now contains org-openide-util-* JARs which are used by
+simple-validation (this should prevent a crash in Jajuk).
+
+ -- Damien Raude-Morvan draz...@debian.org Sun, 19 Feb 2012 12:49:56 +0100
+
+libsimple-validation-java (0.4-2) unstable; urgency=low
+
+ * Team upload.
+ * Remove Java runtime from Depends.
+ * Update Standards-Version: 3.9.2.
+
+ -- Torsten Werner twer...@debian.org Sun, 11 Sep 2011 21:12:40 +0200
+
+libsimple-validation-java (0.4-1) unstable; urgency=low
+
+ * Initial release (Closes: #570322)
+
+ -- Varun Hiremath va...@debian.org Wed, 17 Feb 2010 21:31:35 -0500
Deleted: tags/libsimple-validation-java/0.4-3/debian/control
===
--- trunk/libsimple-validation-java/debian/control 2012-02-11 17:27:40 UTC
(rev 15772)
+++ tags/libsimple-validation-java/0.4-3/debian/control 2012-02-19 11:55:07 UTC
(rev 15784)
@@ -1,23 +0,0 @@
-Source: libsimple-validation-java
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Varun Hiremath va...@debian.org
-Build-Depends: debhelper (= 7), cdbs
-Build-Depends-Indep: ant-optional, default-jdk
-Standards-Version: 3.9.2
-Homepage: http://kenai.com/projects/simplevalidation/pages/Home
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libsimple-validation-java
-Vcs-Browser:
http://svn.debian.org/wsvn/pkg-java/trunk/libsimple-validation-java
-
-Package: libsimple-validation-java
-Architecture: all
-Depends: ${misc:Depends}
-Description: library for quickly adding validation code to Swing
user-interfaces
- This is a simple library for retrofitting user-interface input
- validation to Swing applications. It handles validating user input
- when the user changes a component's value, showing error messages and
- decorating components to indicate which component is the source of
- the problem. It contains a large number of built-in validators to
- handle most common situations, such as validating numbers, email
- addresses, urls and so forth.
Copied: tags/libsimple-validation-java/0.4-3/debian/control (from rev 15783,
trunk/libsimple-validation-java/debian/control)
===
--- tags/libsimple-validation-java/0.4-3/debian/control
(rev 0)
+++ tags/libsimple-validation-java/0.4-3/debian/control 2012-02-19 11:55:07 UTC
(rev 15784)
@@ -0,0 +1,23 @@
+Source: libsimple-validation-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
+Uploaders: Varun Hiremath va...@debian.org
+Build-Depends: debhelper (= 7), cdbs, javahelper
+Build-Depends-Indep: ant-optional, default-jdk
+Standards-Version: 3.9.2
+Homepage: http://kenai.com/projects/simplevalidation/pages/Home
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libsimple-validation-java
+Vcs-Browser:
http://svn.debian.org/wsvn/pkg-java/trunk/libsimple-validation-java
+
+Package: libsimple-validation-java
+Architecture: all
+Depends: ${misc:Depends}, ${java:Depends}
+Description: library for quickly
Bug#657870: Multiple issues in Struts
Hi Moritz, On 09/02/2012 21:16, Moritz Mühlenhoff wrote: There's a new issues, which affects 1.x: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-1007 From [1], it seems there is no actual fix for this issue :( I'll contact Struts Security Team on this matter. [1] http://secpod.org/advisories/SecPod_Apache_Struts_Multiple_Parsistant_XSS_Vulns.txt -- Damien - Debian Developper http://wiki.debian.org/DamienRaudeMorvan __ 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] r15773 - in trunk/rhino/debian: . patches
Author: drazzib
Date: 2012-02-13 22:57:35 + (Mon, 13 Feb 2012)
New Revision: 15773
Added:
trunk/rhino/debian/patches/03_public_getSourcePositionFromStack.patch
Modified:
trunk/rhino/debian/changelog
trunk/rhino/debian/control
trunk/rhino/debian/copyright
trunk/rhino/debian/patches/series
Log:
* Making getSourcePositionFromStack public (used by geogebra).
Closes: #659619.
* Upload to unstable.
* Remove Michael Koch from Uploaders (Closes: #654130).
* d/control: Wrap-and-sort
Modified: trunk/rhino/debian/changelog
===
--- trunk/rhino/debian/changelog2012-02-11 17:27:40 UTC (rev 15772)
+++ trunk/rhino/debian/changelog2012-02-13 22:57:35 UTC (rev 15773)
@@ -1,3 +1,16 @@
+rhino (1.7R3-5) unstable; urgency=low
+
+ [ Giovanni Mascellani ]
+ * Making getSourcePositionFromStack public (used by geogebra).
+Closes: #659619.
+
+ [ Damien Raude-Morvan ]
+ * Upload to unstable.
+ * Remove Michael Koch from Uploaders (Closes: #654130).
+ * d/control: Wrap-and-sort
+
+ -- Damien Raude-Morvan draz...@debian.org Mon, 13 Feb 2012 23:52:51 +0100
+
rhino (1.7R3-4) unstable; urgency=low
* Add OSGi metadata to jar manifest
Modified: trunk/rhino/debian/control
===
--- trunk/rhino/debian/control 2012-02-11 17:27:40 UTC (rev 15772)
+++ trunk/rhino/debian/control 2012-02-13 22:57:35 UTC (rev 15773)
@@ -2,10 +2,17 @@
Section: interpreters
Priority: optional
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Paul Cager paul-deb...@home.paulcager.org, Marcus Better
mar...@better.se,
- Michael Koch konque...@gmx.de, Damien Raude-Morvan draz...@debian.org,
- Jakub Adam jakub.a...@ktknet.cz
-Build-Depends: debhelper (= 7), cdbs, ant, default-jdk, maven-repo-helper,
libxmlbeans-java, javahelper
+Uploaders: Paul Cager paul-deb...@home.paulcager.org,
+ Marcus Better mar...@better.se,
+ Damien Raude-Morvan draz...@debian.org,
+ Jakub Adam jakub.a...@ktknet.cz
+Build-Depends: ant,
+ cdbs,
+ debhelper (= 7),
+ default-jdk,
+ javahelper,
+ libxmlbeans-java,
+ maven-repo-helper
Standards-Version: 3.9.2
Homepage: http://www.mozilla.org/rhino/
Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/rhino/
@@ -13,8 +20,10 @@
Package: rhino
Architecture: all
-Depends: ${misc:Depends}, default-jre-headless (= 1.5) |
java5-runtime-headless, libjline-java,
- librhino-java (= ${source:Version})
+Depends: default-jre-headless (= 1.5) | java5-runtime-headless,
+ libjline-java,
+ librhino-java (= ${source:Version}),
+ ${misc:Depends}
Suggests: librhino-java-doc
Description: JavaScript engine written in Java
Rhino is an implementation of the JavaScript language written
Modified: trunk/rhino/debian/copyright
===
--- trunk/rhino/debian/copyright2012-02-11 17:27:40 UTC (rev 15772)
+++ trunk/rhino/debian/copyright2012-02-13 22:57:35 UTC (rev 15773)
@@ -520,4 +520,3 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
Added: trunk/rhino/debian/patches/03_public_getSourcePositionFromStack.patch
===
--- trunk/rhino/debian/patches/03_public_getSourcePositionFromStack.patch
(rev 0)
+++ trunk/rhino/debian/patches/03_public_getSourcePositionFromStack.patch
2012-02-13 22:57:35 UTC (rev 15773)
@@ -0,0 +1,20 @@
+From: Giovanni Mascellani g...@debian.org
+Subject: Make getSourcePositionFromStack() pulic
+Forwarded: no
+Last-Update: 2011-12-08
+
+This is needed by package geogebra.
+
+Index: rhino-1.7R3/src/org/mozilla/javascript/Context.java
+===
+--- rhino-1.7R3.orig/src/org/mozilla/javascript/Context.java 2011-12-18
11:43:21.0 +0100
rhino-1.7R3/src/org/mozilla/javascript/Context.java2011-12-18
11:43:57.0 +0100
+@@ -2481,7 +2481,7 @@
+ return (Evaluator)Kit.newInstanceOrNull(interpreterClass);
+ }
+
+-static String getSourcePositionFromStack(int[] linep)
++public static String getSourcePositionFromStack(int[] linep)
+ {
+ Context cx = getCurrentContext();
+ if (cx == null)
Modified: trunk/rhino/debian/patches/series
===
--- trunk/rhino/debian/patches/series 2012-02-11 17:27:40 UTC (rev 15772)
+++ trunk/rhino/debian/patches/series 2012-02-13 22:57:35 UTC (rev 15773)
@@ -1,2 +1,3 @@
01_rhino-nowarn.patch
02_exclude-jdk15.patch
[pkg-java] r15770 - trunk/libapache-mod-jk/debian/patches
Author: drazzib Date: 2012-02-06 18:41:20 + (Mon, 06 Feb 2012) New Revision: 15770 Modified: trunk/libapache-mod-jk/debian/patches/0004-compiler-hardening.patch Log: Upstream accepted patch. Modified: trunk/libapache-mod-jk/debian/patches/0004-compiler-hardening.patch === --- trunk/libapache-mod-jk/debian/patches/0004-compiler-hardening.patch 2012-02-06 02:26:13 UTC (rev 15769) +++ trunk/libapache-mod-jk/debian/patches/0004-compiler-hardening.patch 2012-02-06 18:41:20 UTC (rev 15770) @@ -1,6 +1,8 @@ Author: tony mancill tmanc...@debian.org Last-Update: 2012-02-03 Description: patch for error: format not a string literal and no format arguments [-Werror=format-security] +Bug-vendor: https://issues.apache.org/bugzilla/show_bug.cgi?id=52564 +Forwarded: yes --- a/native/apache-2.0/mod_jk.c.orig 2012-02-04 05:51:31.0 + +++ b/native/apache-2.0/mod_jk.c 2012-02-04 06:42:01.018105253 + @@ -673,15 +673,15 @@ ___ 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] r15763 - trunk/libapache-mod-jk/debian
Author: drazzib
Date: 2012-02-05 23:36:49 + (Sun, 05 Feb 2012)
New Revision: 15763
Modified:
trunk/libapache-mod-jk/debian/changelog
trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst
trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm
trunk/libapache-mod-jk/debian/rules
Log:
* d/*.{prerm,postint}: Add set -e to scripts.
* d/rules: Just use dh_auto. No need to force using sub-directory as
debhelper is doing it for us.
Modified: trunk/libapache-mod-jk/debian/changelog
===
--- trunk/libapache-mod-jk/debian/changelog 2012-02-05 21:26:55 UTC (rev
15762)
+++ trunk/libapache-mod-jk/debian/changelog 2012-02-05 23:36:49 UTC (rev
15763)
@@ -1,3 +1,11 @@
+libapache-mod-jk (1:1.2.32-3) UNRELEASED; urgency=low
+
+ * d/*.{prerm,postint}: Add set -e to scripts.
+ * d/rules: Just use dh_auto. No need to force using sub-directory as
+debhelper is doing it for us.
+
+ -- Damien Raude-Morvan draz...@debian.org Mon, 06 Feb 2012 00:35:59 +0100
+
libapache-mod-jk (1:1.2.32-2) unstable; urgency=low
* Team upload.
Modified: trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst
===
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst2012-02-05
21:26:55 UTC (rev 15762)
+++ trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst2012-02-05
23:36:49 UTC (rev 15763)
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
#DEBHELPER#
Modified: trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm
===
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm 2012-02-05
21:26:55 UTC (rev 15762)
+++ trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm 2012-02-05
23:36:49 UTC (rev 15763)
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
#DEBHELPER#
Modified: trunk/libapache-mod-jk/debian/rules
===
--- trunk/libapache-mod-jk/debian/rules 2012-02-05 21:26:55 UTC (rev 15762)
+++ trunk/libapache-mod-jk/debian/rules 2012-02-05 23:36:49 UTC (rev 15763)
@@ -7,11 +7,11 @@
dh $@ --with autotools_dev --sourcedirectory=native
override_dh_auto_configure:
- cd native ./configure --with-apxs=/usr/bin/apxs2
+ dh_auto_configure -- --with-apxs=/usr/bin/apxs2
sed -i -e 's/^LIBTOOL = .*$$/LIBTOOL = \/bin\/sh ..\/libtool/'
native/common/Makefile
override_dh_auto_build:
- $(MAKE) -C native
+ dh_auto_build
cp conf/httpd-jk.conf conf/jk.conf
override_dh_auto_clean:
___
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#635503: libapache2-mod-jk: mod-jk corrupts first and second listed worker.list entry
tag 635503 + upstream forwarded 635503 https://issues.apache.org/bugzilla/show_bug.cgi?id=50339 fixed 635503 1:1.2.32-1 thanks Hi Andreas, On 26/07/2011 13:33, Andreas Fierlinger wrote: mod-jk mutates the first two entries in worker.list My worker.list looks like this: worker.list = eservice2, eservice1, eserviceE, eserviceQ but in mod_jk.log the worker.list seems to be altered : [Sun Jul 24 06:25:30.461 2011] [16401:140729642657600] [debug] jk_map_dump::jk_map.c (589): Dump of map: 'worker.list' - 'esevice2, eservvice1, eserviceE, eserviceQ' I am able to reproduce this on another sqeeze machine with a configuration similar to this. It seems that libapache2-mod-jk 1.2.32 doesn't parse correctly properties with white space. As a workaround please use : worker.list=eservice2,eservice1,eserviceE,eserviceQ Cheers, -- Damien - Debian Developper http://wiki.debian.org/DamienRaudeMorvan __ 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] Debian packaging for uimaj branch, master, updated. debian/2.3.1-2-11-gcd7a60b
The following commit has been merged in the master branch: commit 7cfb16c75a9d33fc7023c136dd55f0eac3b79976 Merge: b944baa25edea67dec65caa0c70734ad0050eaba c68612a17ef1fe3dd5be0e199430a3e764deb274 Author: Damien Raude-Morvan draz...@debian.org Date: Tue Jan 17 23:40:08 2012 +0100 Merge commit 'upstream/2.4.0' -- Debian packaging for uimaj ___ 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] Debian packaging for uimaj branch, master, updated. debian/2.3.1-2-11-gcd7a60b
The following commit has been merged in the master branch: commit b944baa25edea67dec65caa0c70734ad0050eaba Author: Damien Raude-Morvan draz...@debian.org Date: Tue Jan 17 23:39:44 2012 +0100 New upstream release. diff --git a/debian/changelog b/debian/changelog index 561a8f4..55e2ac9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +uimaj (2.4.0-1) unstable; urgency=low + + * New upstream release. + + -- Damien Raude-Morvan draz...@debian.org Tue, 17 Jan 2012 23:39:28 +0100 + uimaj (2.3.1-2) unstable; urgency=low * Team upload. diff --git a/debian/watch b/debian/watch index 254f2cf..465b0ce 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://www.apache.org/dist/uima/uimaj-([\d\.]+)-source-release.zip debian debian/orig-tar.sh +http://www.apache.org/dist/uima/uimaj-(?:[\d\.]+)/uimaj-([\d\.]+)-source-release.zip debian debian/orig-tar.sh -- Debian packaging for uimaj ___ 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] Debian packaging for uimaj branch, master, updated. debian/2.3.1-2-11-gcd7a60b
The following commit has been merged in the master branch: commit 9c2100dc93447bc5bb21e873a25a64e31c98d8df Author: Damien Raude-Morvan draz...@debian.org Date: Tue Jan 17 23:54:55 2012 +0100 d/rules: Use DEB_MAVEN_BUILD_TARGET to install before Javadoc. diff --git a/debian/changelog b/debian/changelog index f014ca9..2abdcde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ uimaj (2.4.0-1) unstable; urgency=low * New upstream release. * Refresh all patches. * d/rules: Remove DEB_BUILDDIR as pom.xml is now at root of tarball. + * d/rules: Use DEB_MAVEN_BUILD_TARGET to install before Javadoc. - -- Damien Raude-Morvan draz...@debian.org Tue, 17 Jan 2012 23:49:58 +0100 + -- Damien Raude-Morvan draz...@debian.org Tue, 17 Jan 2012 23:54:35 +0100 uimaj (2.3.1-2) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 330cd69..93080b5 100755 --- a/debian/rules +++ b/debian/rules @@ -11,9 +11,10 @@ JAVA_HOME:= /usr/lib/jvm/default-java JAVA_OPTS+= -Xmx512m # Use new javadoc:aggregate target to generate Javadoc -DEB_MAVEN_DOC_TARGET = javadoc:aggregate +DEB_MAVEN_BUILD_TARGET := install +DEB_MAVEN_DOC_TARGET := javadoc:aggregate # Disable auto-install because we use multiple packages -DEB_MAVEN_INSTALL_TARGET = +DEB_MAVEN_INSTALL_TARGET := # Manpages generation DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl -- Debian packaging for uimaj ___ 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] Debian packaging for uimaj branch, master, updated. debian/2.3.1-2-11-gcd7a60b
The following commit has been merged in the master branch:
commit 9822dcf68fa5d465b07a473f0d8456970546025e
Author: Damien Raude-Morvan draz...@debian.org
Date: Tue Jan 17 23:46:20 2012 +0100
Refresh all patches.
diff --git a/debian/changelog b/debian/changelog
index 55e2ac9..eae1da3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
uimaj (2.4.0-1) unstable; urgency=low
* New upstream release.
+ * Refresh all patches.
- -- Damien Raude-Morvan draz...@debian.org Tue, 17 Jan 2012 23:39:28 +0100
+ -- Damien Raude-Morvan draz...@debian.org Tue, 17 Jan 2012 23:46:14 +0100
uimaj (2.3.1-2) unstable; urgency=low
diff --git a/debian/patches/build-helper-version.diff
b/debian/patches/build-helper-version.diff
index 593e31c..327ece8 100644
--- a/debian/patches/build-helper-version.diff
+++ b/debian/patches/build-helper-version.diff
@@ -1,6 +1,6 @@
--- a/uimaj-core/pom.xml
+++ b/uimaj-core/pom.xml
-@@ -131,6 +131,12 @@
+@@ -156,6 +156,12 @@
version1.5/version
executions
execution
@@ -13,10 +13,3 @@
idaddVersionSrc/id
goalsgoaladd-source/goal/goals
configuration
-@@ -171,4 +177,4 @@
- /plugin
- /plugins
- /build
--/project
-\ No newline at end of file
-+/project
diff --git a/debian/patches/disable_ecore.diff
b/debian/patches/disable_ecore.diff
index 333c7f6..7f9f589 100644
--- a/debian/patches/disable_ecore.diff
+++ b/debian/patches/disable_ecore.diff
@@ -23,24 +23,23 @@ Forwared: not-needed
/dependencies
build
finalNameuima-examples/finalName
-@@ -124,7 +126,17 @@
- /execution
- /executions
- /plugin
--
-+plugin
-+ groupIdorg.apache.maven.plugins/groupId
-+ artifactIdmaven-compiler-plugin/artifactId
-+ configuration
-+ source1.5/source
-+ target1.5/target
-+ excludes
-+
exclude**/org/apache/uima/examples/xmi/**.java/exclude
-+ /excludes
-+ /configuration
-+/plugin
- /plugins
+@@ -124,7 +126,18 @@
+ /configuration
+ /execution
+ /executions
+-/plugin
++/plugin
++plugin
++groupIdorg.apache.maven.plugins/groupId
++artifactIdmaven-compiler-plugin/artifactId
++configuration
++ source1.5/source
++ target1.5/target
++ excludes
++
exclude**/org/apache/uima/examples/xmi/**.java/exclude
++ /excludes
++/configuration
++/plugin
+ /plugins
+ /pluginManagement
/build
--/project
-\ No newline at end of file
-+/project
diff --git a/debian/patches/disable_internal_javadoc.diff
b/debian/patches/disable_internal_javadoc.diff
index 5be8e33..ce9ff62 100644
--- a/debian/patches/disable_internal_javadoc.diff
+++ b/debian/patches/disable_internal_javadoc.diff
@@ -1,6 +1,6 @@
a/uimaj-distr/pom.xml
-+++ b/uimaj-distr/pom.xml
-@@ -178,8 +178,8 @@
+--- a/pom.xml
b/pom.xml
+@@ -169,8 +169,8 @@
executions
execution
idjavadocs-distr/id !-- name should match one in parent-pom
--
diff --git a/debian/patches/modules.diff b/debian/patches/modules.diff
index 745a24a..adce1b2 100644
--- a/debian/patches/modules.diff
+++ b/debian/patches/modules.diff
@@ -4,23 +4,6 @@ Description: Disable some modules:
Author: Damien Raude-Morvan draz...@debian.org
Last-Update: 2010-03-21
Forwarded: not-needed
a/aggregate-uimaj/pom.xml
-+++ b/aggregate-uimaj/pom.xml
-@@ -68,7 +68,6 @@
- module../uimaj-test-util/module
- module../uimaj-component-test-util/module
- module../jVinci/module
--module../aggregate-uimaj-eclipse-plugins/module
- module../aggregate-uimaj-docbooks/module
- !--moduledistr-superPom/module--
- module../uimaj-document-annotation/module
-@@ -79,4 +78,4 @@
- !--module../uimaj-internal-tools/module--
- module../uimaj-bootstrap/module
- /modules
--/project
-\ No newline at end of file
-+/project
--- a/aggregate-uimaj-eclipse-plugins/pom.xml
+++ b/aggregate-uimaj-eclipse-plugins/pom.xml
@@ -60,6 +60,7 @@
@@ -31,35 +14,27 @@ Forwarded: not-needed
module../uimaj-ep-debug/module
module../uimaj-ep-jcasgen/module
module../uimaj-ep-configurator/module
-@@ -69,5 +70,6 @@
+@@ -71,5 +72,6 @@
module../uimaj-eclipse-feature-tools/module
module../uimaj-eclipse-feature-runtime/module
+--
/modules
/project
a/uimaj-distr/pom.xml
-+++ b/uimaj-distr/pom.xml
-@@ -103,6 +103,7 @@
- artifactIduimaj-tools/artifactId
- version${project.version}/version
- /dependency
-+!--
- dependency
- groupIdorg.apache.uima/groupId
- artifactIduimaj-ep
[SCM] Debian packaging for uimaj branch, master, updated. debian/2.3.1-2-11-gcd7a60b
The following commit has been merged in the master branch: commit 9b4f94cb9dba3c154d562551eaa91929eef8b3aa Author: Damien Raude-Morvan draz...@debian.org Date: Tue Jan 17 23:50:26 2012 +0100 d/rules: Remove DEB_BUILDDIR as pom.xml is now at root of tarball. diff --git a/debian/changelog b/debian/changelog index eae1da3..f014ca9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ uimaj (2.4.0-1) unstable; urgency=low * New upstream release. * Refresh all patches. + * d/rules: Remove DEB_BUILDDIR as pom.xml is now at root of tarball. - -- Damien Raude-Morvan draz...@debian.org Tue, 17 Jan 2012 23:46:14 +0100 + -- Damien Raude-Morvan draz...@debian.org Tue, 17 Jan 2012 23:49:58 +0100 uimaj (2.3.1-2) unstable; urgency=low diff --git a/debian/libuima-core-java.poms b/debian/libuima-core-java.poms index ed4f6aa..01512cc 100644 --- a/debian/libuima-core-java.poms +++ b/debian/libuima-core-java.poms @@ -24,7 +24,7 @@ # temporarily for certain artifacts such as Javadoc jars. uimaj-parent/pom.xml --no-parent -uimaj/pom.xml +pom.xml aggregate-uimaj/pom.xml aggregate-uimaj-docbooks/pom.xml diff --git a/debian/rules b/debian/rules index f59af9d..330cd69 100755 --- a/debian/rules +++ b/debian/rules @@ -5,8 +5,6 @@ include /usr/share/cdbs/1/class/maven.mk VERSION := $(DEB_UPSTREAM_VERSION) -# Use uimaj/pom.xml for build -DEB_BUILDDIR := uimaj DEB_COMPRESS_EXCLUDE := .pdf JAVA_HOME:= /usr/lib/jvm/default-java # Enough memory to aggregate Javadoc -- Debian packaging for uimaj ___ 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] Debian packaging for uimaj branch, master, updated. debian/2.3.1-2-11-gcd7a60b
The following commit has been merged in the master branch: commit e39feebe37241438a567ef75fdb9563147d3833a Author: Damien Raude-Morvan draz...@debian.org Date: Wed Jan 18 00:20:08 2012 +0100 Update install location. diff --git a/debian/libuima-core-java.poms b/debian/libuima-core-java.poms index 205e0dc..2f72480 100644 --- a/debian/libuima-core-java.poms +++ b/debian/libuima-core-java.poms @@ -33,21 +33,21 @@ uimaj-core/pom.xml --has-package-version --java-lib --artifact=uimaj-core/target uimaj-test-util/pom.xml --has-package-version --java-lib --artifact=uimaj-test-util/target/uimaj-test-util-*.jar uimaj-component-test-util/pom.xml --has-package-version --java-lib --artifact=uimaj-component-test-util/target/uimaj-component-test-util-*.jar -uimaj-adapter-soap/pom.xml --has-package-version --package libuima-adapter-soap-java --java-lib --artifact=uimaj-adapter-soap/target/uima-adapter-soap.jar +uimaj-adapter-soap/pom.xml --has-package-version --package=libuima-adapter-soap-java --java-lib --artifact=uimaj-adapter-soap/target/uima-adapter-soap.jar -uimaj-adapter-vinci/pom.xml --has-package-version --package libuima-adapter-vinci-java --java-lib --artifact=uimaj-adapter-vinci/target/uima-adapter-vinci.jar +uimaj-adapter-vinci/pom.xml --has-package-version --package=libuima-adapter-vinci-java --java-lib --artifact=uimaj-adapter-vinci/target/uima-adapter-vinci.jar -uimaj-cpe/pom.xml --has-package-version --package libuima-cpe-java --java-lib --artifact=uimaj-cpe/target/uima-cpe.jar +uimaj-cpe/pom.xml --has-package-version --package=libuima-cpe-java --java-lib --artifact=uimaj-cpe/target/uima-cpe.jar -uimaj-document-annotation/pom.xml --has-package-version --package libuima-document-annotation-java --java-lib --artifact=uimaj-document-annotation/target/uima-document-annotation.jar +uimaj-document-annotation/pom.xml --has-package-version --package=libuima-document-annotation-java --java-lib --artifact=uimaj-document-annotation/target/uima-document-annotation.jar -uimaj-tools/pom.xml --has-package-version --package libuima-tools-java --java-lib --artifact=uimaj-tools/target/uima-tools.jar -uimaj-bootstrap/pom.xml --has-package-version --package libuima-tools-java --java-lib --artifact=uimaj-bootstrap/target/uimaj-bootstrap-$(VERSION).jar -PearPackagingMavenPlugin/pom.xml --has-package-version --package libuima-tools-java --java-lib --artifact=PearPackagingMavenPlugin/target/uima-pear-maven-plugin.jar +uimaj-tools/pom.xml --has-package-version --package=libuima-tools-java --java-lib --artifact=uimaj-tools/target/uima-tools.jar +uimaj-bootstrap/pom.xml --has-package-version --package=libuima-tools-java --java-lib --artifact=uimaj-bootstrap/target/uimaj-bootstrap-$(VERSION).jar +PearPackagingMavenPlugin/pom.xml --has-package-version --package=libuima-tools-java --java-lib --artifact=PearPackagingMavenPlugin/target/uima-pear-maven-plugin.jar -jVinci/pom.xml --has-package-version --package libuima-vinci-java --java-lib --artifact=jVinci/target/jVinci.jar +jVinci/pom.xml --has-package-version --package=libuima-vinci-java --java-lib --artifact=jVinci/target/jVinci.jar -uimaj-examples/pom.xml --has-package-version --package uima-examples --java-lib --artifact=uimaj-examples/target/uima-examples.jar +uimaj-examples/pom.xml --has-package-version --package=uima-examples --java-lib --artifact=uimaj-examples/target/uima-examples.jar uima-docbook-overview-and-setup/pom.xml --ignore-pom uima-docbook-references/pom.xml --ignore-pom diff --git a/debian/uima-doc.install b/debian/uima-doc.install index 3662bb8..d6ae6c3 100644 --- a/debian/uima-doc.install +++ b/debian/uima-doc.install @@ -1,5 +1,5 @@ # Install Javadoc HTML -uimaj/target/site/apidocs/*/usr/share/doc/uima/api/ +target/site/apidocs/* /usr/share/doc/uima/api/ # Copy common files #uima-docbook-tool/styles/uima-style/css/ /usr/share/doc/uima/manuals/ #uima-docbooks/target/images /usr/share/doc/uima/manuals/ diff --git a/debian/uima-utils.docs b/debian/uima-utils.docs index 4a4dd76..97248fe 100644 --- a/debian/uima-utils.docs +++ b/debian/uima-utils.docs @@ -1,3 +1,3 @@ NOTICE -uimaj-distr/README -uimaj-distr/RELEASE_NOTES.html +README +RELEASE_NOTES.html diff --git a/debian/uima-utils.install b/debian/uima-utils.install index 413aab9..0a05ee0 100644 --- a/debian/uima-utils.install +++ b/debian/uima-utils.install @@ -1,20 +1,20 @@ # .sh are deleted thereafter in debian/rules -uimaj-distr/src/main/scripts/annotationViewer.sh /usr/bin/ -uimaj-distr/src/main/scripts/cpeGui.sh /usr/bin/ -uimaj-distr/src/main/scripts/documentAnalyzer.sh /usr/bin/ -uimaj-distr/src/main/scripts/jcasgen.sh /usr/bin/ -uimaj-distr/src/main/scripts/runAE.sh /usr/bin/ -#uimaj-distr/src/main/scripts/runCPE.sh /usr/bin/ -uimaj-distr/src/main/scripts/runPearInstaller.sh /usr/bin/ -uimaj-distr/src/main/scripts/runPearMerger.sh /usr/bin/ -uimaj-distr/src/main/scripts
[SCM] Debian packaging for uimaj branch, master, updated. debian/2.3.1-2-11-gcd7a60b
The following commit has been merged in the master branch: commit 7cc9f92b939b88b7b2bd167355d25258f31a79c5 Author: Damien Raude-Morvan draz...@debian.org Date: Wed Jan 18 00:13:15 2012 +0100 d/libuima-core-java.poms: Use this file to install JARs instead of d/rules. diff --git a/debian/changelog b/debian/changelog index 2abdcde..5c7b1e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ uimaj (2.4.0-1) unstable; urgency=low * Refresh all patches. * d/rules: Remove DEB_BUILDDIR as pom.xml is now at root of tarball. * d/rules: Use DEB_MAVEN_BUILD_TARGET to install before Javadoc. + * d/libuima-core-java.poms: Use this file to install JARs instead of d/rules. - -- Damien Raude-Morvan draz...@debian.org Tue, 17 Jan 2012 23:54:35 +0100 + -- Damien Raude-Morvan draz...@debian.org Wed, 18 Jan 2012 00:13:03 +0100 uimaj (2.3.1-2) unstable; urgency=low diff --git a/debian/libuima-core-java.poms b/debian/libuima-core-java.poms index 01512cc..205e0dc 100644 --- a/debian/libuima-core-java.poms +++ b/debian/libuima-core-java.poms @@ -23,31 +23,31 @@ # --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created # temporarily for certain artifacts such as Javadoc jars. -uimaj-parent/pom.xml --no-parent -pom.xml +uimaj-parent/pom.xml --no-parent --has-package-version +pom.xml --has-package-version -aggregate-uimaj/pom.xml -aggregate-uimaj-docbooks/pom.xml +aggregate-uimaj/pom.xml --has-package-version +aggregate-uimaj-docbooks/pom.xml --has-package-version -uimaj-core/pom.xml -uimaj-test-util/pom.xml -uimaj-component-test-util/pom.xml +uimaj-core/pom.xml --has-package-version --java-lib --artifact=uimaj-core/target/uima-core.jar +uimaj-test-util/pom.xml --has-package-version --java-lib --artifact=uimaj-test-util/target/uimaj-test-util-*.jar +uimaj-component-test-util/pom.xml --has-package-version --java-lib --artifact=uimaj-component-test-util/target/uimaj-component-test-util-*.jar -uimaj-adapter-soap/pom.xml --package libuima-adapter-soap-java +uimaj-adapter-soap/pom.xml --has-package-version --package libuima-adapter-soap-java --java-lib --artifact=uimaj-adapter-soap/target/uima-adapter-soap.jar -uimaj-adapter-vinci/pom.xml --package libuima-adapter-vinci-java +uimaj-adapter-vinci/pom.xml --has-package-version --package libuima-adapter-vinci-java --java-lib --artifact=uimaj-adapter-vinci/target/uima-adapter-vinci.jar -uimaj-cpe/pom.xml --package libuima-cpe-java +uimaj-cpe/pom.xml --has-package-version --package libuima-cpe-java --java-lib --artifact=uimaj-cpe/target/uima-cpe.jar -uimaj-document-annotation/pom.xml --package libuima-document-annotation-java +uimaj-document-annotation/pom.xml --has-package-version --package libuima-document-annotation-java --java-lib --artifact=uimaj-document-annotation/target/uima-document-annotation.jar -uimaj-tools/pom.xml --package libuima-tools-java -uimaj-bootstrap/pom.xml --package libuima-tools-java -PearPackagingMavenPlugin/pom.xml --package libuima-tools-java +uimaj-tools/pom.xml --has-package-version --package libuima-tools-java --java-lib --artifact=uimaj-tools/target/uima-tools.jar +uimaj-bootstrap/pom.xml --has-package-version --package libuima-tools-java --java-lib --artifact=uimaj-bootstrap/target/uimaj-bootstrap-$(VERSION).jar +PearPackagingMavenPlugin/pom.xml --has-package-version --package libuima-tools-java --java-lib --artifact=PearPackagingMavenPlugin/target/uima-pear-maven-plugin.jar -jVinci/pom.xml --package libuima-vinci-java +jVinci/pom.xml --has-package-version --package libuima-vinci-java --java-lib --artifact=jVinci/target/jVinci.jar -uimaj-examples/pom.xml --package uima-examples +uimaj-examples/pom.xml --has-package-version --package uima-examples --java-lib --artifact=uimaj-examples/target/uima-examples.jar uima-docbook-overview-and-setup/pom.xml --ignore-pom uima-docbook-references/pom.xml --ignore-pom diff --git a/debian/rules b/debian/rules index 93080b5..51c1bad 100755 --- a/debian/rules +++ b/debian/rules @@ -13,8 +13,6 @@ JAVA_OPTS+= -Xmx512m # Use new javadoc:aggregate target to generate Javadoc DEB_MAVEN_BUILD_TARGET := install DEB_MAVEN_DOC_TARGET := javadoc:aggregate -# Disable auto-install because we use multiple packages -DEB_MAVEN_INSTALL_TARGET := # Manpages generation DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl @@ -33,48 +31,6 @@ clean:: mh_clean -rm $(UIMA_MANPAGES) -binary-install/libuima-vinci-java:: - mh_installpom -plibuima-vinci-java -e$(VERSION) jVinci/pom.xml - mh_installjar -plibuima-vinci-java -e$(VERSION) -l jVinci/pom.xml jVinci/target/jVinci.jar - -binary-install/libuima-adapter-soap-java:: - mh_installpom -plibuima-adapter-soap-java -e$(VERSION) uimaj-adapter-soap/pom.xml - mh_installjar -plibuima-adapter-soap-java -e$(VERSION) -l uimaj-adapter-soap/pom.xml uimaj-adapter-soap/target/uima
[SCM] Debian packaging for uimaj branch, pristine-tar, updated. 9790fbc611907b0b8e0a05be6c11e5075f1bb9a6
The following commit has been merged in the pristine-tar branch: commit 9790fbc611907b0b8e0a05be6c11e5075f1bb9a6 Author: Damien Raude-Morvan draz...@debian.org Date: Tue Jan 17 23:40:08 2012 +0100 pristine-tar data for uimaj_2.4.0.orig.tar.gz diff --git a/uimaj_2.4.0.orig.tar.gz.delta b/uimaj_2.4.0.orig.tar.gz.delta new file mode 100644 index 000..908f511 Binary files /dev/null and b/uimaj_2.4.0.orig.tar.gz.delta differ diff --git a/uimaj_2.4.0.orig.tar.gz.id b/uimaj_2.4.0.orig.tar.gz.id new file mode 100644 index 000..20c3d5d --- /dev/null +++ b/uimaj_2.4.0.orig.tar.gz.id @@ -0,0 +1 @@ +c68612a17ef1fe3dd5be0e199430a3e764deb274 -- Debian packaging for uimaj ___ 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] Debian packaging for uimaj branch, master, updated. debian/2.3.1-2-11-gcd7a60b
The following commit has been merged in the master branch: commit cd7a60b4800c040a722487187911951b22aa070d Author: Damien Raude-Morvan draz...@debian.org Date: Fri Jan 20 00:45:06 2012 +0100 d/rules: Use DEB_MAVEN_BUILD_TARGET to install before Javadoc * d/rules: Use DEB_MAVEN_BUILD_TARGET to install before Javadoc - Add Build-Depends on libmaven-install-plugin-java. diff --git a/debian/changelog b/debian/changelog index 92eff5c..4c0c240 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,11 +3,12 @@ uimaj (2.4.0-1) unstable; urgency=low * New upstream release. * Refresh all patches. * d/rules: Remove DEB_BUILDDIR as pom.xml is now at root of tarball. - * d/rules: Use DEB_MAVEN_BUILD_TARGET to install before Javadoc. + * d/rules: Use DEB_MAVEN_BUILD_TARGET to install before Javadoc +- Add Build-Depends on libmaven-install-plugin-java. * d/libuima-core-java.poms: Use this file to install JARs instead of d/rules. * d/control, d/*.install: Wrap-and-sort - -- Damien Raude-Morvan draz...@debian.org Fri, 20 Jan 2012 00:43:46 +0100 + -- Damien Raude-Morvan draz...@debian.org Fri, 20 Jan 2012 00:44:30 +0100 uimaj (2.3.1-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 850a234..c578a85 100644 --- a/debian/control +++ b/debian/control @@ -24,6 +24,7 @@ Build-Depends-Indep: ant, libgeronimo-activation-1.1-spec-java, libjaxp1.3-java, liblog4j1.2-java, + libmaven-install-plugin-java, libmaven-javadoc-plugin-java, libmaven-plugin-tools-java (= 2.8), libmaven-site-plugin-java, -- Debian packaging for uimaj ___ 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] Debian packaging for uimaj branch, master, updated. debian/2.3.1-2-11-gcd7a60b
The following commit has been merged in the master branch:
commit b08879737cbbeb9b80a63e313c2712a3f59c6d20
Author: Damien Raude-Morvan draz...@debian.org
Date: Tue Jan 17 23:59:45 2012 +0100
Refresh modules.diff
diff --git a/debian/patches/modules.diff b/debian/patches/modules.diff
index adce1b2..333f654 100644
--- a/debian/patches/modules.diff
+++ b/debian/patches/modules.diff
@@ -38,3 +38,21 @@ Forwarded: not-needed
-/project
\ No newline at end of file
+/project
+--- a/pom.xml
b/pom.xml
+@@ -108,6 +108,7 @@
+ artifactIduimaj-tools/artifactId
+ version${project.version}/version
+ /dependency
++!--
+ dependency
+ groupIdorg.apache.uima/groupId
+ artifactIduimaj-ep-cas-editor/artifactId
+@@ -148,6 +149,7 @@
+ artifactIduimaj-ep-launcher/artifactId
+ version${project.version}/version
+ /dependency
++--
+ /dependencies
+
+ modules
--
Debian packaging for uimaj
___
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] Debian packaging for uimaj branch, master, updated. debian/2.3.1-2-11-gcd7a60b
The following commit has been merged in the master branch:
commit 5ff29e291979277b8bd4934f6a0f878be9a82466
Author: Damien Raude-Morvan draz...@debian.org
Date: Fri Jan 20 00:44:11 2012 +0100
d/control, d/*.install: Wrap-and-sort
diff --git a/debian/changelog b/debian/changelog
index 5c7b1e7..92eff5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ uimaj (2.4.0-1) unstable; urgency=low
* d/rules: Remove DEB_BUILDDIR as pom.xml is now at root of tarball.
* d/rules: Use DEB_MAVEN_BUILD_TARGET to install before Javadoc.
* d/libuima-core-java.poms: Use this file to install JARs instead of d/rules.
+ * d/control, d/*.install: Wrap-and-sort
- -- Damien Raude-Morvan draz...@debian.org Wed, 18 Jan 2012 00:13:03 +0100
+ -- Damien Raude-Morvan draz...@debian.org Fri, 20 Jan 2012 00:43:46 +0100
uimaj (2.3.1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d36ba71..850a234 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,35 @@ Source: uimaj
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Fabien Poulard fabien.poul...@univ-nantes.fr, Damien Raude-Morvan
draz...@debian.org
-Build-Depends: debhelper (= 7), cdbs, default-jdk, maven-debian-helper (=
1.1), maven-repo-helper (= 1.5.2),
- libmaven2-core-java ( 2.2.1-1), maven2 ( 2.2.1-2)
-Build-Depends-Indep: junit, ant, ant-contrib, libaxis-java,
libcommons-io-java, liblog4j1.2-java,
- libgeronimo-activation-1.1-spec-java, default-jdk-doc,
libmaven-javadoc-plugin-java, libmaven-site-plugin-java,
- libxml-commons-resolver1.1-java, libxerces2-java, libjaxp1.3-java,
- docbook-xml, docbook-xsl, xsltproc, libsaxon-java, fop,
libbuild-helper-maven-plugin-java,
- libmaven-plugin-tools-java (= 2.8)
+Uploaders: Fabien Poulard fabien.poul...@univ-nantes.fr,
+ Damien Raude-Morvan draz...@debian.org
+Build-Depends: cdbs,
+ debhelper (= 7),
+ default-jdk,
+ libmaven2-core-java ( 2.2.1-1),
+ maven-debian-helper (= 1.1),
+ maven-repo-helper (= 1.5.2),
+ maven2 ( 2.2.1-2)
+Build-Depends-Indep: ant,
+ ant-contrib,
+ default-jdk-doc,
+ docbook-xml,
+ docbook-xsl,
+ fop,
+ junit,
+ libaxis-java,
+ libbuild-helper-maven-plugin-java,
+ libcommons-io-java,
+ libgeronimo-activation-1.1-spec-java,
+ libjaxp1.3-java,
+ liblog4j1.2-java,
+ libmaven-javadoc-plugin-java,
+ libmaven-plugin-tools-java (= 2.8),
+ libmaven-site-plugin-java,
+ libsaxon-java,
+ libxerces2-java,
+ libxml-commons-resolver1.1-java,
+ xsltproc
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/pkg-java/uimaj.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/uimaj.git
@@ -50,12 +71,15 @@ Description: Library to handle Vinci web service protocol
entities, such as persons, places, organizations; or relations,
such as works-for or located-at.
.
- This library is part of the UIMA framework. It implements in Java the code
+ This library is part of the UIMA framework. It implements in Java the code
necessary to handle the Vinci web service protocol.
Package: libuima-adapter-soap-java
Architecture: all
-Depends: ${misc:Depends}, libuima-core-java (= ${source:Version}),
libaxis-java, libgeronimo-activation-1.1-spec-java
+Depends: libaxis-java,
+ libgeronimo-activation-1.1-spec-java,
+ libuima-core-java (= ${source:Version}),
+ ${misc:Depends}
Description: Library to provide SOAP web services within UIMA
Apache UIMA is an implementation of the OASIS-UIMA specifications.
.
@@ -74,7 +98,7 @@ Description: Library to provide SOAP web services within UIMA
Package: libuima-adapter-vinci-java
Architecture: all
-Depends: ${misc:Depends}, libuima-core-java (= ${source:Version})
+Depends: libuima-core-java (= ${source:Version}), ${misc:Depends}
Recommends: libuima-vinci-java (= ${source:Version})
Description: Library to provide Vinci web services within UIMA
Apache UIMA is an implementation of the OASIS-UIMA specifications.
@@ -94,7 +118,7 @@ Description: Library to provide Vinci web services within
UIMA
Package: libuima-cpe-java
Architecture: all
-Depends: ${misc:Depends}, libuima-core-java (= ${source:Version})
+Depends: libuima-core-java (= ${source:Version}), ${misc:Depends}
Suggests: libuima-adapter-vinci-java (= ${source:Version})
Description: Library for the UIMA Collection Processing Engine
Apache UIMA is an implementation of the OASIS-UIMA specifications.
@@ -114,7 +138,7 @@ Description: Library for the UIMA Collection Processing
Engine
[SCM] Debian packaging for uimaj annotated tag, upstream/2.4.0, created. upstream/2.4.0
The annotated tag, upstream/2.4.0 has been created at 9f571770f5bbda18294dbc70f0602604e1497092 (tag) tagging c68612a17ef1fe3dd5be0e199430a3e764deb274 (commit) replaces upstream/2.3.1 tagged by Damien Raude-Morvan on Tue Jan 17 23:40:08 2012 +0100 - Shortlog Upstream version 2.4.0 Damien Raude-Morvan (1): Imported Upstream version 2.4.0 --- -- Debian packaging for uimaj ___ 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] Debian packaging for uimaj annotated tag, debian/2.4.0-1, created. debian/2.4.0-1
The annotated tag, debian/2.4.0-1 has been created at 4d0815f9f578c89c08cecb269086e81143626a1c (tag) tagging cd7a60b4800c040a722487187911951b22aa070d (commit) replaces debian/2.3.1-2 tagged by Damien Raude-Morvan on Fri Jan 20 01:13:11 2012 +0100 - Shortlog Debian release 2.4.0-1 Damien Raude-Morvan (11): New upstream release. Imported Upstream version 2.4.0 Merge commit 'upstream/2.4.0' Refresh all patches. d/rules: Remove DEB_BUILDDIR as pom.xml is now at root of tarball. d/rules: Use DEB_MAVEN_BUILD_TARGET to install before Javadoc. Refresh modules.diff d/libuima-core-java.poms: Use this file to install JARs instead of d/rules. Update install location. d/control, d/*.install: Wrap-and-sort d/rules: Use DEB_MAVEN_BUILD_TARGET to install before Javadoc --- -- Debian packaging for uimaj ___ 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#656136: aether: FTBFS due to plexus-component-metadata
Hi Mathieu, aether appears to fail to build because maven can't parse the version number associated with the plexus-component-metadata plugin. debian/maven.rules specifies it as 1.5.x like others, but this doesn't appear to work. Setting the version number to 1.5.5 specifically for plexus-component-metadata lets the build complete successfully. It seems that something broke your plexus-component-metadata pom for 1.5.x [1] AFAICT, maven-ant-helper seems to corrupt something : I've compared a rebuild of plexus-component-metadata in a sid chroot versus original package actually in sid, and metadata is different. I'll check in maven-ant-helper soon. [1] /usr/share/maven-repo/org/codehaus/plexus/plexus-component- metadata/1.5.x/plexus-component-metadata-1.5.x.pom -- Damien __ 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.
