Bug#758052: Crash upon merging
Package: gnome-split Version: 1.2-1 Severity: important Hello, First time firing up gnome-split to merge xtm files. I choose the merge files option and then select the file, and gnome-split crashes with the following error message: ~ gnome-split # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x, pid=5692, tid=140602862491392 # # JRE version: OpenJDK Runtime Environment (7.0_60-b30) (build 1.7.0_60-b30) # Java VM: OpenJDK 64-Bit Server VM (24.60-b09 mixed mode linux-amd64 compressed oops) # Problematic frame: # C 0x # # Failed to write core dump. Core dumps have been disabled. To enable core dumping, try ulimit -c unlimited before starting Java again # # An error report file with more information is saved as: # /tmp/hs_err_pid5692.log # # If you would like to submit a bug report, please include # instructions on how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # The crash happened outside the Java Virtual Machine in native code. # See problematic frame for where to report the bug. # zsh: abort gnome-split I have no clue, but it can't be the right mode of operation ;-)... Cheers, Vincent -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.14-1-amd64 (SMP w/2 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages gnome-split depends on: ii default-jre 2:1.7-52 ii libjava-gnome-java 4.1.3-1 gnome-split recommends no packages. gnome-split suggests no packages. -- no debconf information __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#725461: batik: FTBFS: Unable to find a javac compiler
Hi, [currently at a congress, hence not very on top of Debian things] On Wed, Oct 16, 2013 at 8:28 PM, Markus Koschany a...@gambaru.de wrote: The current svn revision still recommends default-jre because of the included wrapper scripts squiggle, rasterizer, ttf2svg and svgpp. The recommendation for default-jre is the only thing that bothers me. The current dependencies on jre-headless go against the current java policy but the current package also needs a working JRE to run the aforementioned wrapper scripts. I think recommending default-jre is a kind of compromise here. Excatly... I agree with Emmanuel Bourg's comment from the list that it is more reasonable to split the package in libbatik-java and batik. I have done this locally and all reverse dependencies (except osmosis that FTBFS because of another bug) still build fine. Though I'm not 100% sure if one of those r-deps expects one of the wrapper scripts to be included in libbatik-java, otherwise it would be simple. This is the sensible thing to do, and one I should have done ages ago, but evaluating the impact on rdeps/build-rdeps is far from trivial, so this is not a change to be acted too lightly -- and one of the reasons why I refrained from doing so, mostly because I didn't have the time to look. Hence I think uploading the current changes would be a good idea and I will attach a patch for #566901 soon. I don't have the time to review the patch right now. I can have a look this week-end, if you want more eyes, but if you feel confident about the current state, I don't mind an upload as-is. Cheers, and sorry for the lack of timely feedback. Vincent __ 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#566901: Bug#725461: batik: FTBFS: Unable to find a javac compiler
Hi Markus, On Thu, Oct 17, 2013 at 6:15 PM, Markus Koschany a...@gambaru.de wrote: Control: tags 566901 patch Hi Vincent, On 17.10.2013 15:07, Vincent Fourmond wrote: [...] I don't have the time to review the patch right now. I can have a look this week-end, if you want more eyes, but if you feel confident about the current state, I don't mind an upload as-is. No worries. Tony Mancill has uploaded the bug fixes for #725461 already. Now I'm attaching the debdiff with all the changes to split the package into libbatik-java and batik. I can confirm that these rdeps still build fine with those changes: scilab-full-bin umlet sweethome3d-furniture-editor sweethome3d scilab-full-bin osmosis (FTBFS because of a another bug) libjeuclid-core-java libjcharts-java libjaxe-java libjasperreports3.7-java libjasperreports-java freeplane freemind-plugins-svg libfop-java libflamingo-java ditaa Good job for checking all that ! As you said verifying that everything works as intended is time consuming. Therefore I have targeted the new revision for experimental. I suggest to ask the maintainers/uploaders of these rdeps to confirm that their packages still work fine with the new version as soon as it enters experimental. Hopefully this will speed things up a little. That's definitely the way to go. I can review/sponsor this upload this week-end if you wish. Cheers, Vincent __ 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#709976: java-wrappers: run_jar() handles command line arguments wrong
Hello, On Mon, May 27, 2013 at 10:40 AM, Hilko Bengen ben...@debian.org wrote: The run_jar() function in /usr/lib/java-wrappers/java-wrappers.sh contains the following lines: if locate_jar $1; then shift run_java -jar $@ else java_fail Unable to find jar $1 in $JAVA_JARPATH fi If locate_jar() finds the specified JAR file, it places the path into $found_jar, but its result is not used. I'm wondering how comes I didn't see that before. Will be fixed on Wednesday... (no access to my GPG keys before that). Cheers, Vincent __ 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#678612: libbatik-java change led to uninstallables on kfreebsd
On Sat, Jun 23, 2012 at 10:14 AM, Niels Thykier ni...@thykier.net wrote: On Jun 22, 2012 22:50 Steven Chamberlain ste...@pyro.eu.org wrote: Hi, Hi, libbatik-java's dependencies were changed recently like so: Package: libbatik-java Architecture: all -Depends: openjdk-6-jre-headless | java2-runtime-headless, +Depends: openjdk-6-jre-headless | openjdk-7-jre-headless | java7-runtime-headless, Unfortunately this seems to have made about 120 packages uninstallable in sid on kfreebsd-*. I can see how that is less than optimal. [...] Or was this simply a mistake and should java2-runtime-headless still be in that list? Thanks, Regards, I think the best solution is to split out the binaries from libbatik-java; that should allow use to remove the JRE dependencies per Java Policy. As for the JRE dependencies, I think the java2-runtime-headless might have been a mistake (and should have been java6 + java7). I will check up on that. As far as I can tell, the conversion programs were working fine with java2 runtimes (gij, a few years ago). However, the graphical interface didn't work (I'm not even sure they work properly with openjdk 6 or 7). I'm unsure splitting out is a good idea at this point, since some programs may depend on libbatik-java to provide rasterize: changing that too close from the freeze isn't a good idea... Cheers, Vincent __ 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] r16037 - in trunk/jalview/debian: . patches
Author: fourmond
Date: 2012-05-03 18:11:21 + (Thu, 03 May 2012)
New Revision: 16037
Added:
trunk/jalview/debian/patches/newer-jmol-api.diff
Modified:
trunk/jalview/debian/changelog
trunk/jalview/debian/patches/series
Log:
[jalview] long forgotten commit to SVN...
Modified: trunk/jalview/debian/changelog
===
--- trunk/jalview/debian/changelog 2012-05-02 22:28:55 UTC (rev 16036)
+++ trunk/jalview/debian/changelog 2012-05-03 18:11:21 UTC (rev 16037)
@@ -1,3 +1,11 @@
+jalview (2.7.dfsg-2) unstable; urgency=low
+
+ * Upload to unstable now that jmol is there too
+ * Pull patches/newer-jmol-api.diff from upstream's git repository to
+make jalview work with jmol currently in unstable.
+
+ -- Vincent Fourmond fourm...@debian.org Mon, 07 Nov 2011 20:47:14 +0100
+
jalview (2.7.dfsg-1) experimental; urgency=low
* Initial release (Closes: #507436)
Added: trunk/jalview/debian/patches/newer-jmol-api.diff
===
--- trunk/jalview/debian/patches/newer-jmol-api.diff
(rev 0)
+++ trunk/jalview/debian/patches/newer-jmol-api.diff2012-05-03 18:11:21 UTC
(rev 16037)
@@ -0,0 +1,301 @@
+Author: Java upstream developers
+Description: fix build with newer Jmol API
+ Patch from 12808bb..a60375a of http://source.jalview.org/git/jalview.git
+
+
+Index: jalview-2.7.dfsg/build.xml
+===
+--- jalview-2.7.dfsg.orig/build.xml2011-11-07 20:46:31.0 +0100
jalview-2.7.dfsg/build.xml 2011-11-07 20:46:54.096166723 +0100
+@@ -92,7 +92,7 @@
+ property name=packageDir value=dist /
+ property name=outputJar value=jalview.jar /
+ !-- Jalview Applet JMol Jar Dependency --
+- property name=jmolJar value=JmolApplet-12.1.13.jar /
++ property name=jmolJar value=JmolApplet-12.2.4.jar /
+ property name=jalviewLiteJar value=jalviewApplet.jar /
+ !-- switch to indicate if we should obfuscate jalviewLite --
+ !--property name=donotobfuscate value=true/ --
+Index: jalview-2.7.dfsg/nbproject/project.properties
+===
+--- jalview-2.7.dfsg.orig/nbproject/project.properties 2011-09-27
16:50:21.0 +0200
jalview-2.7.dfsg/nbproject/project.properties 2011-11-07
20:46:54.096166723 +0100
+@@ -59,8 +59,8 @@
+ file.reference.jaxrpc.jar=lib/jaxrpc.jar
+ file.reference.JGoogleAnalytics_0.3.jar=lib/JGoogleAnalytics_0.3.jar
+ file.reference.jhall.jar=lib/jhall.jar
+-file.reference.Jmol-12.1.13.jar=lib/Jmol-12.1.13.jar
+-file.reference.JmolApplet-12.1.13.jar=appletlib/JmolApplet-12.1.13.jar
++file.reference.Jmol-12.2.4.jar=lib/Jmol-12.2.4.jar
++file.reference.JmolApplet-12.2.4.jar=appletlib/JmolApplet-12.2.4.jar
+ file.reference.log4j-1.2.8.jar=lib/log4j-1.2.8.jar
+ file.reference.mail.jar=lib/mail.jar
+ file.reference.min-jaba-client.jar=lib/min-jaba-client.jar
+@@ -91,7 +91,7 @@
+ ${file.reference.jaxrpc.jar}:\
+ ${file.reference.JGoogleAnalytics_0.3.jar}:\
+ ${file.reference.jhall.jar}:\
+-${file.reference.Jmol-12.1.13.jar}:\
++${file.reference.Jmol-12.2.4.jar}:\
+ ${file.reference.miglayout-4.0-swing.jar}:\
+ ${file.reference.log4j-1.2.8.jar}:\
+ ${file.reference.mail.jar}:\
+@@ -100,7 +100,7 @@
+ ${file.reference.xml-apis.jar}:\
+ ${file.reference.xercesImpl.jar}:\
+ ${file.reference.wsdl4j.jar}:\
+-${file.reference.JmolApplet-12.1.13.jar}
++${file.reference.JmolApplet-12.2.4.jar}
+ # Space-separated list of extra javac options
+ javac.compilerargs=
+ javac.deprecation=false
+Index: jalview-2.7.dfsg/src/jalview/appletgui/AppletJmolBinding.java
+===
+--- jalview-2.7.dfsg.orig/src/jalview/appletgui/AppletJmolBinding.java
2011-09-27 16:50:21.0 +0200
jalview-2.7.dfsg/src/jalview/appletgui/AppletJmolBinding.java
2011-11-07 20:46:54.096166723 +0100
+@@ -17,18 +17,16 @@
+ */
+ package jalview.appletgui;
+
+-import java.awt.Container;
+-import java.util.BitSet;
+-
+ import jalview.api.AlignmentViewPanel;
+-import jalview.datamodel.AlignmentI;
+ import jalview.datamodel.PDBEntry;
+ import jalview.datamodel.SequenceI;
+ import jalview.structure.StructureSelectionManager;
+
++import java.awt.Container;
++import java.util.BitSet;
++
+ import org.jmol.api.JmolAppConsoleInterface;
+ import org.jmol.api.JmolViewer;
+-import org.jmol.applet.AppletConsole;
+ import org.jmol.popup.JmolPopup;
+
+ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
+@@ -119,7 +117,8 @@
+ boolean asPopup)
+ {
+
+-jmolpopup = JmolPopup.newJmolPopup(viewer, translateLocale, menuName,
++jmolpopup = new JmolPopup();
++jmolpopup.initialize(viewer, translateLocale, menuName
[pkg-java] r16038 - in tags/jalview: . 2.7.dfsg-2/debian 2.7.dfsg-2/debian/patches
Author: fourmond
Date: 2012-05-03 18:16:15 + (Thu, 03 May 2012)
New Revision: 16038
Added:
tags/jalview/2.7.dfsg-2/
tags/jalview/2.7.dfsg-2/debian/changelog
tags/jalview/2.7.dfsg-2/debian/patches/newer-jmol-api.diff
tags/jalview/2.7.dfsg-2/debian/patches/series
Removed:
tags/jalview/2.7.dfsg-2/debian/changelog
tags/jalview/2.7.dfsg-2/debian/patches/series
Log:
[svn-buildpackage] Tagging jalview 2.7.dfsg-2
Deleted: tags/jalview/2.7.dfsg-2/debian/changelog
===
--- trunk/jalview/debian/changelog 2012-01-24 23:09:55 UTC (rev 15740)
+++ tags/jalview/2.7.dfsg-2/debian/changelog2012-05-03 18:16:15 UTC (rev
16038)
@@ -1,11 +0,0 @@
-jalview (2.7.dfsg-1) experimental; urgency=low
-
- * Initial release (Closes: #507436)
- * Adding a debian/new-upstream script to repackage the original tarball,
-getting rid of the bundled precompiled JAR files (I love JAR files)
- * Using dh 7 and javahelper
- * Using jh_build for building
- * Uploading to experimental as it works only with the version of jmol in
-experimental
-
- -- Vincent Fourmond fourm...@debian.org Wed, 19 Oct 2011 20:19:46 +0200
Copied: tags/jalview/2.7.dfsg-2/debian/changelog (from rev 16037,
trunk/jalview/debian/changelog)
===
--- tags/jalview/2.7.dfsg-2/debian/changelog(rev 0)
+++ tags/jalview/2.7.dfsg-2/debian/changelog2012-05-03 18:16:15 UTC (rev
16038)
@@ -0,0 +1,19 @@
+jalview (2.7.dfsg-2) unstable; urgency=low
+
+ * Upload to unstable now that jmol is there too
+ * Pull patches/newer-jmol-api.diff from upstream's git repository to
+make jalview work with jmol currently in unstable.
+
+ -- Vincent Fourmond fourm...@debian.org Mon, 07 Nov 2011 20:47:14 +0100
+
+jalview (2.7.dfsg-1) experimental; urgency=low
+
+ * Initial release (Closes: #507436)
+ * Adding a debian/new-upstream script to repackage the original tarball,
+getting rid of the bundled precompiled JAR files (I love JAR files)
+ * Using dh 7 and javahelper
+ * Using jh_build for building
+ * Uploading to experimental as it works only with the version of jmol in
+experimental
+
+ -- Vincent Fourmond fourm...@debian.org Wed, 19 Oct 2011 20:19:46 +0200
Copied: tags/jalview/2.7.dfsg-2/debian/patches/newer-jmol-api.diff (from rev
16037, trunk/jalview/debian/patches/newer-jmol-api.diff)
===
--- tags/jalview/2.7.dfsg-2/debian/patches/newer-jmol-api.diff
(rev 0)
+++ tags/jalview/2.7.dfsg-2/debian/patches/newer-jmol-api.diff 2012-05-03
18:16:15 UTC (rev 16038)
@@ -0,0 +1,301 @@
+Author: Java upstream developers
+Description: fix build with newer Jmol API
+ Patch from 12808bb..a60375a of http://source.jalview.org/git/jalview.git
+
+
+Index: jalview-2.7.dfsg/build.xml
+===
+--- jalview-2.7.dfsg.orig/build.xml2011-11-07 20:46:31.0 +0100
jalview-2.7.dfsg/build.xml 2011-11-07 20:46:54.096166723 +0100
+@@ -92,7 +92,7 @@
+ property name=packageDir value=dist /
+ property name=outputJar value=jalview.jar /
+ !-- Jalview Applet JMol Jar Dependency --
+- property name=jmolJar value=JmolApplet-12.1.13.jar /
++ property name=jmolJar value=JmolApplet-12.2.4.jar /
+ property name=jalviewLiteJar value=jalviewApplet.jar /
+ !-- switch to indicate if we should obfuscate jalviewLite --
+ !--property name=donotobfuscate value=true/ --
+Index: jalview-2.7.dfsg/nbproject/project.properties
+===
+--- jalview-2.7.dfsg.orig/nbproject/project.properties 2011-09-27
16:50:21.0 +0200
jalview-2.7.dfsg/nbproject/project.properties 2011-11-07
20:46:54.096166723 +0100
+@@ -59,8 +59,8 @@
+ file.reference.jaxrpc.jar=lib/jaxrpc.jar
+ file.reference.JGoogleAnalytics_0.3.jar=lib/JGoogleAnalytics_0.3.jar
+ file.reference.jhall.jar=lib/jhall.jar
+-file.reference.Jmol-12.1.13.jar=lib/Jmol-12.1.13.jar
+-file.reference.JmolApplet-12.1.13.jar=appletlib/JmolApplet-12.1.13.jar
++file.reference.Jmol-12.2.4.jar=lib/Jmol-12.2.4.jar
++file.reference.JmolApplet-12.2.4.jar=appletlib/JmolApplet-12.2.4.jar
+ file.reference.log4j-1.2.8.jar=lib/log4j-1.2.8.jar
+ file.reference.mail.jar=lib/mail.jar
+ file.reference.min-jaba-client.jar=lib/min-jaba-client.jar
+@@ -91,7 +91,7 @@
+ ${file.reference.jaxrpc.jar}:\
+ ${file.reference.JGoogleAnalytics_0.3.jar}:\
+ ${file.reference.jhall.jar}:\
+-${file.reference.Jmol-12.1.13.jar}:\
++${file.reference.Jmol-12.2.4.jar}:\
+ ${file.reference.miglayout-4.0-swing.jar}:\
+ ${file.reference.log4j-1.2.8.jar}:\
+ ${file.reference.mail.jar}:\
+@@ -100,7 +100,7 @@
+ ${file.reference.xml-apis.jar
Bug#664515: Produces Classpath with extra : in front
Hello, On Sun, Mar 18, 2012 at 3:41 PM, Erich Schubert er...@debian.org wrote: Weka 3.7.5 (but with the Debian launcher script, using java-wrappers) would not start for me, with some NullPointerException after a long startup time. Looking at the command run, it invokes this: [... ] Whereas, when I execute /usr/lib/jvm/java-6-openjdk-i386/bin/java -Xmx256m -classpath /usr/share/java/weka.jar weka.gui.GUIChooser weka would correctly start. The only difference is the extra : in the classpath. Is there a particular reason why java-wrappers adds this, or can it just be removed? Apparently this is interpreted as .: by some part of weka, and it will cause a full scan of my home directory (apparently running into a problem at some point, maybe with a dangling symlink or so). It is there just by laziness, and because it didn't cause any problem so far. Removing it shouldn't be problematic, as far as I can tell. I won't be able to do so before next Thursday, though. Cheers, Vincent __ 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] r15865 - in trunk/java-wrappers: . debian
Author: fourmond Date: 2012-03-18 19:18:25 + (Sun, 18 Mar 2012) New Revision: 15865 Modified: trunk/java-wrappers/debian/changelog trunk/java-wrappers/java-wrappers.sh Log: [java-wrappers] do not implicitly include . in classpath Modified: trunk/java-wrappers/debian/changelog === --- trunk/java-wrappers/debian/changelog2012-03-18 17:33:11 UTC (rev 15864) +++ trunk/java-wrappers/debian/changelog2012-03-18 19:18:25 UTC (rev 15865) @@ -1,3 +1,9 @@ +java-wrappers (0.1.25) unstable; urgency=low + + * Do not implicitly include . in classpaths (closes: #664515) + + -- Vincent Fourmond fourm...@debian.org Sun, 18 Mar 2012 20:12:13 +0100 + java-wrappers (0.1.24) unstable; urgency=low * Drop the use of dpkg-architecture in favor of dpkg (closes: #641499) Modified: trunk/java-wrappers/java-wrappers.sh === --- trunk/java-wrappers/java-wrappers.sh2012-03-18 17:33:11 UTC (rev 15864) +++ trunk/java-wrappers/java-wrappers.sh2012-03-18 19:18:25 UTC (rev 15865) @@ -212,7 +212,11 @@ looked_for_jars=1 for jar in $@ ; do if locate_jar $jar; then - JAVA_CLASSPATH=$JAVA_CLASSPATH:$found_jar +if [ -z $JAVA_CLASSPATH ]; then + JAVA_CLASSPATH=$found_jar +else + JAVA_CLASSPATH=$JAVA_CLASSPATH:$found_jar +fi else java_warning Unable to locate $jar in $JAVA_JARPATH fi ___ 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] r15866 - in tags/java-wrappers: . 0.1.25 0.1.25/debian
Author: fourmond
Date: 2012-03-18 19:22:06 + (Sun, 18 Mar 2012)
New Revision: 15866
Added:
tags/java-wrappers/0.1.25/
tags/java-wrappers/0.1.25/debian/changelog
tags/java-wrappers/0.1.25/java-wrappers.sh
Removed:
tags/java-wrappers/0.1.25/debian/changelog
tags/java-wrappers/0.1.25/java-wrappers.sh
Log:
[svn-buildpackage] Tagging java-wrappers 0.1.25
Deleted: tags/java-wrappers/0.1.25/debian/changelog
===
--- trunk/java-wrappers/debian/changelog2012-03-18 17:33:11 UTC (rev
15864)
+++ tags/java-wrappers/0.1.25/debian/changelog 2012-03-18 19:22:06 UTC (rev
15866)
@@ -1,189 +0,0 @@
-java-wrappers (0.1.24) unstable; urgency=low
-
- * Drop the use of dpkg-architecture in favor of dpkg (closes: #641499)
- * Take into account openjdk-7, patch courtesy of Adrian Bunk
-b...@stusta.de (closes: #641420)
-
- -- Vincent Fourmond fourm...@debian.org Wed, 14 Sep 2011 18:28:00 +0200
-
-java-wrappers (0.1.23) unstable; urgency=medium
-
- * Correctly find the now architecture-dependent openjdk6 flavor (closes:
-#640813)
- * Urgency medium to avoid breaking applications in testing when openjdk6
migrates
-
- -- Vincent Fourmond fourm...@debian.org Fri, 09 Sep 2011 22:56:25 +0200
-
-java-wrappers (0.1.22) unstable; urgency=low
-
- * Now correctly following relative links from classpaths.
- * Fix a final glitch, ready for upload to unstable
-
- -- Vincent Fourmond fourm...@debian.org Wed, 06 Apr 2011 10:33:57 +0200
-
-java-wrappers (0.1.21) experimental; urgency=low
-
- * Final form of the find_jar_classpath function that now only performs
-path expansion for the argument, but not for the elements found in the
-manifests that should be full paths anyway (closes: #563197)
- * Trim down significantly the number of JVMs available, as fortunately
-the dozens-of-jvms dark age is long gone (closes: #612903)
- * Make it sure that mistakes such as find_java_runtime default-jre won't
-go unnoticed.
-
- -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 21:08:31 +0200
-
-java-wrappers (0.1.20) experimental; urgency=low
-
- * Adding unzip as we need it to get the classpath correctly...
- * Switch to dh 7
-
- -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 09:44:15 +0200
-
-java-wrappers (0.1.19) experimental; urgency=low
-
- * First draft of a recursive classpath resolution function.
-
- -- Vincent Fourmond fourm...@debian.org Sun, 03 Apr 2011 01:38:16 +0200
-
-java-wrappers (0.1.18) unstable; urgency=low
-
- * The let's break Java applications in Wheezy ! upload, or, in other
-words, upload to unstable
- * Switching to format 3.0 (native)
-
- -- Vincent Fourmond fourm...@debian.org Fri, 11 Feb 2011 13:35:24 +0100
-
-java-wrappers (0.1.17) experimental; urgency=low
-
- [ Gabriele Giacone ]
- * First step toward java-alternatives integration
-
- [ Vincent Fourmond ]
- * Final step (closes: #609731); thanks Gabriele for the first ;-)...
- * Conforms to standards 3.9.1
-
- -- Vincent Fourmond fourm...@debian.org Thu, 13 Jan 2011 23:01:43 +0100
-
-java-wrappers (0.1.16) unstable; urgency=low
-
- * Adding default as a valid jre choice, and make it the default for
-'all'; patch courtesy of Torsten Werner twer...@debian.org
-(closes: #580180)
- * Slightly arrange the documentation, which addresses to some extent bug
-#578944, but probably not satisfyingly enough.
- * Conforms to 3.8.4
- * Adding ${misc:Depends} for potential dh-induced dependencies
-
- -- Vincent Fourmond fourm...@debian.org Tue, 04 May 2010 23:42:54 +0200
-
-java-wrappers (0.1.15) unstable; urgency=low
-
- * Switch to Section java
-
- -- Vincent Fourmond fourm...@debian.org Wed, 29 Apr 2009 20:04:02 +0200
-
-java-wrappers (0.1.14) unstable; urgency=low
-
- * Fix absolute path in locate_jar (closes: #526087). Thanks to Paul
-Millar paul.mil...@desy.de for spotting and for the patch.
- * Conforms to 3.8.1
-
- -- Vincent Fourmond fourm...@debian.org Wed, 29 Apr 2009 19:13:40 +0200
-
-java-wrappers (0.1.13) unstable; urgency=low
-
- * Now that lenny is out, it's time to an upload to unstable !
-
- -- Vincent Fourmond fourm...@debian.org Sun, 15 Feb 2009 15:41:01 +0100
-
-java-wrappers (0.1.12) experimental; urgency=low
-
- * Now provides java2, java5 and java6 aliases that correspond respectively
-to the java2-runtime, java5-runtime and java6-runtime virtual packages
-(closes: #514339)
-
- -- Vincent Fourmond fourm...@debian.org Sun, 08 Feb 2009 16:38:13 +0100
-
-java-wrappers (0.1.11) experimental; urgency=low
-
- * Adding (back) the sunmin5 alias for jabref
-
- -- Vincent Fourmond fourm...@debian.org Sat, 22 Nov 2008 14:13:19 +0100
-
-java-wrappers (0.1.10) experimental; urgency=low
-
- * Added Vcs-* fields
- * Adding cacaooj6 runtime + adding it to the openjdk alias. (closes: #503819)
-
- -- Vincent Fourmond fourm...@debian.org Sun, 16 Nov 2008 03:17:33 +0100
-
-java
[pkg-java] r15855 - in trunk/batik/debian: . patches
Author: fourmond Date: 2012-03-12 19:57:14 + (Mon, 12 Mar 2012) New Revision: 15855 Added: trunk/batik/debian/patches/remove-js.patch Modified: trunk/batik/debian/changelog trunk/batik/debian/control trunk/batik/debian/copyright trunk/batik/debian/new-upstream trunk/batik/debian/patches/series trunk/batik/debian/rules trunk/batik/debian/watch Log: [batik] remove binary jars in the source package + various cleanups Modified: trunk/batik/debian/changelog === --- trunk/batik/debian/changelog2012-03-12 19:40:56 UTC (rev 15854) +++ trunk/batik/debian/changelog2012-03-12 19:57:14 UTC (rev 15855) @@ -1,3 +1,14 @@ +batik (1.7+dfsg-1) unstable; urgency=low + + * Provide a repackaged tarball stripping all binary jars (closes: #657244) +- updated debian/new-upstream as a consequence + * Disable the installation of batik-js.jar, that wasn't built from sources +(it was a subset of rhino's js.jar) + * Conforms to standards 3.9.3 + * Modernize a bit debian/copyright + + -- Vincent Fourmond fourm...@debian.org Mon, 12 Mar 2012 20:53:43 +0100 + batik (1.7-8) unstable; urgency=low * Fix FTBS with recent openjdk (closes: #643508) Modified: trunk/batik/debian/control === --- trunk/batik/debian/control 2012-03-12 19:40:56 UTC (rev 15854) +++ trunk/batik/debian/control 2012-03-12 19:57:14 UTC (rev 15855) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org Uploaders: Wolfgang Baer wb...@gmx.de, Michael Koch konque...@gmx.de, Vincent Fourmond fourm...@debian.org, Onkar Shinde onkarshi...@ubuntu.com -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Build-Depends: debhelper (= 5.0), cdbs Build-Depends-Indep: openjdk-6-jdk | sun-java5-jdk | sun-java6-jdk, ant, libbsf-java, libxalan2-java, rhino, libavalon-framework-java (= 4.2.0), Modified: trunk/batik/debian/copyright === --- trunk/batik/debian/copyright2012-03-12 19:40:56 UTC (rev 15854) +++ trunk/batik/debian/copyright2012-03-12 19:57:14 UTC (rev 15855) @@ -1,9 +1,10 @@ -Format-Specification: -http://wiki.debian.org/Proposals/CopyrightFormat?action=recallrev=196 -Upstream-Source: http://xml.apache.org/batik +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: batik -Upstream-Maintainer: Apache Software Foundation - +Upstream-Contact: Apache Software Foundation +Source: http://xml.apache.org/batik + The source zip file was repackaged to remove pre-compiled binary JAR files, + using the script found in debian/new-upstream in debian sources. + . This package was debianized by Jeff Bailey jbai...@debian.org on Tue, 11 Jun 2002 10:52:34 -0400. @@ -12,21 +13,22 @@ Copyright: Apache Foundation License: Apache-2.0 +Files: debian/* +Copyright: 2002-2009 Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org +License: Apache-2.0 + +License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the License); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + . http://www.apache.org/licenses/LICENSE-2.0 - + . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + . The full text of the Apache License version 2.0 can be found at /usr/share/common-licenses/Apache-2.0 on debian systems. - -Files: debian/* -Copyright: 2002-2009 Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org -License: Apache-2.0 Modified: trunk/batik/debian/new-upstream === --- trunk/batik/debian/new-upstream 2012-03-12 19:40:56 UTC (rev 15854) +++ trunk/batik/debian/new-upstream 2012-03-12 19:57:14 UTC (rev 15855) @@ -1,7 +1,7 @@ #!/bin/sh # -# new-upstream: copyright 2008 by Vincent Fourmond. -# Repackage a zip into a .tar.gz archive +# new-upstream: copyright 2012 by Vincent Fourmond. +# See debian/copyright file for details. # # Called by uscan; from uscan(1): # @@ -15,18 +15,25 @@ # version=$2 -filename=$3 +filename=`readlink -f $3` dir=`mktemp -d` -# We repackage the upstream source zip file: -unzip $filename -d $dir -origname=batik_$version.orig.tar.gz +curdir=`pwd` -# We repackage excluding the lib/ subdir +origname=batik_$version+dfsg.orig.tar.xz + +echo Repackaging batik version $version from $filename + +# Abort on errors: +set -e + +# We repackage the upstream source file, skipping binary JAR files. cd $dir -tar cvz \ --f $origname bat* +unzip $filename +cd $dir/batik
[pkg-java] r15856 - in tags/batik: . 1.7+dfsg-1/debian 1.7+dfsg-1/debian/patches
Author: fourmond
Date: 2012-03-12 20:03:50 + (Mon, 12 Mar 2012)
New Revision: 15856
Added:
tags/batik/1.7+dfsg-1/
tags/batik/1.7+dfsg-1/debian/changelog
tags/batik/1.7+dfsg-1/debian/control
tags/batik/1.7+dfsg-1/debian/copyright
tags/batik/1.7+dfsg-1/debian/new-upstream
tags/batik/1.7+dfsg-1/debian/patches/remove-js.patch
tags/batik/1.7+dfsg-1/debian/patches/series
tags/batik/1.7+dfsg-1/debian/rules
tags/batik/1.7+dfsg-1/debian/watch
Removed:
tags/batik/1.7+dfsg-1/debian/changelog
tags/batik/1.7+dfsg-1/debian/control
tags/batik/1.7+dfsg-1/debian/copyright
tags/batik/1.7+dfsg-1/debian/new-upstream
tags/batik/1.7+dfsg-1/debian/patches/series
tags/batik/1.7+dfsg-1/debian/rules
tags/batik/1.7+dfsg-1/debian/watch
Log:
[svn-buildpackage] Tagging batik 1.7+dfsg-1
Deleted: tags/batik/1.7+dfsg-1/debian/changelog
===
--- trunk/batik/debian/changelog2012-01-24 23:09:55 UTC (rev 15740)
+++ tags/batik/1.7+dfsg-1/debian/changelog 2012-03-12 20:03:50 UTC (rev
15856)
@@ -1,246 +0,0 @@
-batik (1.7-8) unstable; urgency=low
-
- * Fix FTBS with recent openjdk (closes: #643508)
- * Bump to newer standards version, no changes required
-
- -- Vincent Fourmond fourm...@debian.org Thu, 29 Sep 2011 21:35:31 +0200
-
-batik (1.7-7) unstable; urgency=low
-
- * Re-enable all patches that had mistakenly been disabled by switching to
-source format 3.0 (quilt) (closes: #604871)
- * Already conforms to standards 3.9.1
-
- -- Vincent Fourmond fourm...@debian.org Thu, 25 Nov 2010 16:24:33 +0100
-
-batik (1.7-6) unstable; urgency=low
-
- [ Vincent Fourmond ]
- * Really fix the dependency on java runtime to only pull headless
-runtimes
-
- [ Gabriele Giacone ]
- * Added Maven support
- * Standards-Version to 3.8.4
- * Source format 3.0 (quilt)
-
- -- Gabriele Giacone 1o5g4...@gmail.com Sun, 21 Feb 2010 19:02:10 +0100
-
-batik (1.7-5) unstable; urgency=low
-
- * Dropped the dependency on openjdk-6-jre, in profit for
-openjdk-6-jre-headless, so we won't pull the whole Gtk libraries just
-for using fop (closes: #551545).
- * Already conforms to standards 3.8.3
- * Removing Arnaud Vandyck from Uploaders as he did retire. Many thanks
-for your work on batik !
-
- -- Vincent Fourmond fourm...@debian.org Mon, 25 Jan 2010 21:58:59 +0100
-
-batik (1.7-4) unstable; urgency=low
-
- * Porting fixes from Ubuntu (1.7.dfsg-0ubuntu3) by Onkar Shinde
-onkarshi...@ubuntu.com:
-- add xml-apis-ext and js to classpath for debian/wrappers/squiggle
-- promote rhino to a Recommends, as squiggle depends on it
-- debian/patches/06_fix_paths_in_policy_files.patch to fix the paths
- of the security policy files
- * This finally makes squiggle work for Debian ! (closes: #499852)
-Many thanks again to Onkar...
-
- -- Vincent Fourmond fourm...@debian.org Mon, 20 Apr 2009 21:22:26 +0200
-
-batik (1.7-3) unstable; urgency=low
-
- [ Onkar Shinde ]
- * debian/rules
-- Use DEB_UPSTREAM_VERSION at all places.
-- Add symlinks batik-version.jar and batik.jar pointing to
- batik-all-version.jar. (Closes: #522340)
- * debian/control
-- Add myself to 'Uploaders'.
-
- [ Vincent Fourmond ]
- * Changed section to java, what currently is in the archive
- * Already conforms to standard 3.8.1
- * Bumped debhelper compatibility level to 5, and bumped Build-depends
-accordingly
-
- -- Vincent Fourmond fourm...@debian.org Mon, 13 Apr 2009 20:42:00 +0200
-
-batik (1.7-2) unstable; urgency=low
-
- * Adding xmlgraphics-commons-1.2 and xml-apis-ext to the jars for
-the build + corresponding build-deps
- * Added Vcs-* fields
-
- [ Sylvestre Ledru ]
- * Build class version 49 (instead of 50)
-
- [ Vincent Fourmond ]
- * Minor updates to the debian/copyright file
- * It seems time has come for an upload to unstable...
- * Adding ${misc:Depends} for potential debhelper-induced dependencies
- * Tweaking rasterizer.1 to avoid unbreakable lines
-
- -- Vincent Fourmond fourm...@debian.org Wed, 18 Feb 2009 22:58:36 +0100
-
-batik (1.7-1) experimental; urgency=low
-
- * New upstream release (Closes: #417888, #490556)
- * Switched to using java-wrappers for executables; dropping the
-/usr/lib/java/wrappers.sh script
- * Switched debian/copyright to a machine-readable format
- * Added ANT_OPTS to fix the compiler out of memory problem
- * Removing 02_fix_jar_target, no longer applicable
- * Removing 01_build_xml, as the created target (pdf-transcoder) cannot
-be built anymore
- * Fixed JAVA_HOME_DIRS so it can build with Sun's java 5
- * Strip the full text of the Apache-2.0 license, as it now is
-in the common licenses
- * Switch to openjdk-6-jdk for building (closes: #397562)
- * Several tweaks in debian/rules to build and install all the jars,
-based on a patch by Sylvestre Ledru sylvestre.le...@inria.fr
- * Now depends also on libxml
Bug#657281: This bug are already present in testing...
found 657281 fop/1:1.0.dfsg2-5 thanks __ 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#657244: batik bundles a non free colour profile in pdf-transcoder.jar
clone 657244 -1 reassign -1 fop found -1 fop/1:1.0.dfsg2-6 retitle -1 src/java/org/apache/fop/pdf/ sRGB Color Space Profile.icm is non-free thanks On Tue, Jan 24, 2012 at 11:54 PM, Karl Goetz k...@kgoetz.id.au wrote: From [1], it seems the pdf-transcoder.jar in batik contains a colour profile with a crazy licence. ...permission to use, copy and distribute this file for any purpose is hereby granted without fee, provided that the file is not changed including the HP copyright notice tag, ... The file will need to be removed from the jar, or the jar (and pdf support) removed from batik :/ Actually, it's more annoying than this. As far as I can tell, batik doesn't use this binary jar (and it should have been stripped from the debian source ages ago). Unfortunately, the jar comes from fop, and the incriminated file is present in fop source, which makes it unsuitable for main... Thanks for your report, Vincent __ 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] r15461 - trunk/stylebook/debian
Author: fourmond Date: 2011-11-27 14:10:35 + (Sun, 27 Nov 2011) New Revision: 15461 Modified: trunk/stylebook/debian/changelog Log: [stylebook] Finalize changelog Modified: trunk/stylebook/debian/changelog === --- trunk/stylebook/debian/changelog2011-11-27 12:46:58 UTC (rev 15460) +++ trunk/stylebook/debian/changelog2011-11-27 14:10:35 UTC (rev 15461) @@ -1,4 +1,4 @@ -stylebook (1.0~b3~svn20061109-5) UNRELEASED; urgency=low +stylebook (1.0~b3~svn20061109-5) unstable; urgency=low * Fix wrong jar installation names. * Add Jakub Adam to Uploaders. ___ 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] r15462 - in tags/stylebook: . 1.0~b3~svn20061109-5/debian
Author: fourmond
Date: 2011-11-27 14:15:28 + (Sun, 27 Nov 2011)
New Revision: 15462
Added:
tags/stylebook/1.0~b3~svn20061109-5/
tags/stylebook/1.0~b3~svn20061109-5/debian/changelog
Removed:
tags/stylebook/1.0~b3~svn20061109-5/debian/changelog
Log:
[svn-buildpackage] Tagging stylebook 1.0~b3~svn20061109-5
Deleted: tags/stylebook/1.0~b3~svn20061109-5/debian/changelog
===
--- trunk/stylebook/debian/changelog2011-11-27 12:46:58 UTC (rev 15460)
+++ tags/stylebook/1.0~b3~svn20061109-5/debian/changelog2011-11-27
14:15:28 UTC (rev 15462)
@@ -1,50 +0,0 @@
-stylebook (1.0~b3~svn20061109-5) UNRELEASED; urgency=low
-
- * Fix wrong jar installation names.
- * Add Jakub Adam to Uploaders.
-
- -- Jakub Adam jakub.a...@ktknet.cz Sun, 27 Nov 2011 02:00:34 +0100
-
-stylebook (1.0~b3~svn20061109-4) unstable; urgency=low
-
- * Team upload.
- * Removed Marcus Better from uploaders - Thanks for your
-work on this package.
- * Added build-arch and build-indep targets.
- * Bumped Standards-Versions to 3.9.2 - no changes required.
- * Bumped debhelper compat to 8.
-- replaced dh_clean -k with dh_prep.
-- migrated to dh7 style rules
- * Use javahelper to install the jar file.
- * Set classpath in the xalan jar file.
-
- -- Niels Thykier ni...@thykier.net Sun, 30 Oct 2011 10:37:19 +0100
-
-stylebook (1.0~b3~svn20061109-3) unstable; urgency=low
-
- * Team upload
-
- [ Matthias Klose ]
- * (Build-)depend on default-jre/-jdk.
-
- [ Torsten Werner ]
- * Switch to source format 3.0.
- * Add missing ${misc:Depends}.
- * Change Section: java.
- * Update Standards-Version: 3.8.4.
-
- -- Torsten Werner twer...@debian.org Thu, 06 May 2010 22:40:10 +0200
-
-stylebook (1.0~b3~svn20061109-2) unstable; urgency=low
-
- * Move to unstable.
- * Delete build tree in clean target.
- * Added myself to Uploaders.
-
- -- Michael Koch konque...@gmx.de Mon, 16 Jul 2007 07:01:18 +0200
-
-stylebook (1.0~b3~svn20061109-1) experimental; urgency=low
-
- * Initial release. (Closes: #397764)
-
- -- Marcus Better mar...@better.se Thu, 9 Nov 2006 12:15:23 +0100
Copied: tags/stylebook/1.0~b3~svn20061109-5/debian/changelog (from rev 15461,
trunk/stylebook/debian/changelog)
===
--- tags/stylebook/1.0~b3~svn20061109-5/debian/changelog
(rev 0)
+++ tags/stylebook/1.0~b3~svn20061109-5/debian/changelog2011-11-27
14:15:28 UTC (rev 15462)
@@ -0,0 +1,50 @@
+stylebook (1.0~b3~svn20061109-5) unstable; urgency=low
+
+ * Fix wrong jar installation names.
+ * Add Jakub Adam to Uploaders.
+
+ -- Jakub Adam jakub.a...@ktknet.cz Sun, 27 Nov 2011 02:00:34 +0100
+
+stylebook (1.0~b3~svn20061109-4) unstable; urgency=low
+
+ * Team upload.
+ * Removed Marcus Better from uploaders - Thanks for your
+work on this package.
+ * Added build-arch and build-indep targets.
+ * Bumped Standards-Versions to 3.9.2 - no changes required.
+ * Bumped debhelper compat to 8.
+- replaced dh_clean -k with dh_prep.
+- migrated to dh7 style rules
+ * Use javahelper to install the jar file.
+ * Set classpath in the xalan jar file.
+
+ -- Niels Thykier ni...@thykier.net Sun, 30 Oct 2011 10:37:19 +0100
+
+stylebook (1.0~b3~svn20061109-3) unstable; urgency=low
+
+ * Team upload
+
+ [ Matthias Klose ]
+ * (Build-)depend on default-jre/-jdk.
+
+ [ Torsten Werner ]
+ * Switch to source format 3.0.
+ * Add missing ${misc:Depends}.
+ * Change Section: java.
+ * Update Standards-Version: 3.8.4.
+
+ -- Torsten Werner twer...@debian.org Thu, 06 May 2010 22:40:10 +0200
+
+stylebook (1.0~b3~svn20061109-2) unstable; urgency=low
+
+ * Move to unstable.
+ * Delete build tree in clean target.
+ * Added myself to Uploaders.
+
+ -- Michael Koch konque...@gmx.de Mon, 16 Jul 2007 07:01:18 +0200
+
+stylebook (1.0~b3~svn20061109-1) experimental; urgency=low
+
+ * Initial release. (Closes: #397764)
+
+ -- Marcus Better mar...@better.se Thu, 9 Nov 2006 12:15:23 +0100
___
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] r15223 - in trunk/libjaba-client-java/debian: . patches
Author: fourmond
Date: 2011-10-22 08:34:58 + (Sat, 22 Oct 2011)
New Revision: 15223
Added:
trunk/libjaba-client-java/debian/patches/
trunk/libjaba-client-java/debian/patches/series
trunk/libjaba-client-java/debian/patches/strip-annotations.diff
Modified:
trunk/libjaba-client-java/debian/changelog
trunk/libjaba-client-java/debian/javabuild
trunk/libjaba-client-java/debian/rules
Log:
[libjaba-client-java] Strip the (accidentally) non-free *ThreadSafe files and
their use
Modified: trunk/libjaba-client-java/debian/changelog
===
--- trunk/libjaba-client-java/debian/changelog 2011-10-21 23:08:39 UTC (rev
15222)
+++ trunk/libjaba-client-java/debian/changelog 2011-10-22 08:34:58 UTC (rev
15223)
@@ -1,3 +1,11 @@
+libjaba-client-java (0+dfsg-1) unstable; urgency=low
+
+ * Strip the *ThreadSafe class files from the source code, they are hardly
+used anyway.
+ * strip-annotations.diff: to remove the only use of those
+
+ -- Vincent Fourmond fourm...@debian.org Sat, 22 Oct 2011 09:06:48 +0200
+
libjaba-client-java (0-1) unstable; urgency=low
* Initial release. (Closes: #623030)
Modified: trunk/libjaba-client-java/debian/javabuild
===
--- trunk/libjaba-client-java/debian/javabuild 2011-10-21 23:08:39 UTC (rev
15222)
+++ trunk/libjaba-client-java/debian/javabuild 2011-10-22 08:34:58 UTC (rev
15223)
@@ -1 +1 @@
-min-jaba-client.jar .
+min-jaba-client.jar src
Added: trunk/libjaba-client-java/debian/patches/series
===
--- trunk/libjaba-client-java/debian/patches/series
(rev 0)
+++ trunk/libjaba-client-java/debian/patches/series 2011-10-22 08:34:58 UTC
(rev 15223)
@@ -0,0 +1 @@
+strip-annotations.diff
Added: trunk/libjaba-client-java/debian/patches/strip-annotations.diff
===
--- trunk/libjaba-client-java/debian/patches/strip-annotations.diff
(rev 0)
+++ trunk/libjaba-client-java/debian/patches/strip-annotations.diff
2011-10-22 08:34:58 UTC (rev 15223)
@@ -0,0 +1,20 @@
+Index: libjaba-client-java-0+dfsg/compbio/metadata/RunnerConfig.java
+===
+--- libjaba-client-java-0+dfsg.orig/compbio/metadata/RunnerConfig.java
2010-11-18 15:37:12.0 +0100
libjaba-client-java-0+dfsg/compbio/metadata/RunnerConfig.java
2011-10-22 09:06:15.465134107 +0200
+@@ -28,7 +28,6 @@
+ import javax.xml.bind.annotation.XmlTransient;
+
+ import compbio.util.SysPrefs;
+-import compbio.util.annotation.NotThreadSafe;
+
+ /**
+ * The list of {@link Parameter}s and {@link Option}s supported by executable.
+@@ -41,7 +40,6 @@
+ *type of an Executable
+ */
+ @XmlRootElement
+-@NotThreadSafe
+ public class RunnerConfigT {
+
+ /*
Modified: trunk/libjaba-client-java/debian/rules
===
--- trunk/libjaba-client-java/debian/rules 2011-10-21 23:08:39 UTC (rev
15222)
+++ trunk/libjaba-client-java/debian/rules 2011-10-22 08:34:58 UTC (rev
15223)
@@ -7,5 +7,11 @@
dh $@ --with javahelper
override_dh_auto_clean:
+ rm -Rf src
-override_dh_auto_build:
\ No newline at end of file
+override_dh_auto_build:
+
+override_jh_build:
+ mkdir -p src;
+ cp -af compbio src/
+ jh_build
\ No newline at end of file
___
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] r15224 - in tags/libjaba-client-java: . 0+dfsg-1/debian
Author: fourmond Date: 2011-10-22 08:57:50 + (Sat, 22 Oct 2011) New Revision: 15224 Added: tags/libjaba-client-java/0+dfsg-1/ tags/libjaba-client-java/0+dfsg-1/debian/changelog tags/libjaba-client-java/0+dfsg-1/debian/copyright tags/libjaba-client-java/0+dfsg-1/debian/javabuild tags/libjaba-client-java/0+dfsg-1/debian/patches/ tags/libjaba-client-java/0+dfsg-1/debian/rules Removed: tags/libjaba-client-java/0+dfsg-1/debian/changelog tags/libjaba-client-java/0+dfsg-1/debian/copyright tags/libjaba-client-java/0+dfsg-1/debian/javabuild tags/libjaba-client-java/0+dfsg-1/debian/rules Log: [svn-buildpackage] Tagging libjaba-client-java 0+dfsg-1 Deleted: tags/libjaba-client-java/0+dfsg-1/debian/changelog === --- trunk/libjaba-client-java/debian/changelog 2011-06-06 09:16:58 UTC (rev 13758) +++ tags/libjaba-client-java/0+dfsg-1/debian/changelog 2011-10-22 08:57:50 UTC (rev 15224) @@ -1,5 +0,0 @@ -libjaba-client-java (0-1~java1) unstable; urgency=low - - * Initial release. (Closes: #623030) - - -- Vincent Fourmond fourm...@debian.org Thu, 14 Apr 2011 22:03:33 +0200 Copied: tags/libjaba-client-java/0+dfsg-1/debian/changelog (from rev 15223, trunk/libjaba-client-java/debian/changelog) === --- tags/libjaba-client-java/0+dfsg-1/debian/changelog (rev 0) +++ tags/libjaba-client-java/0+dfsg-1/debian/changelog 2011-10-22 08:57:50 UTC (rev 15224) @@ -0,0 +1,13 @@ +libjaba-client-java (0+dfsg-1) unstable; urgency=low + + * Strip the *ThreadSafe class files from the source code, they are hardly +used anyway. + * strip-annotations.diff: to remove the only use of those + + -- Vincent Fourmond fourm...@debian.org Sat, 22 Oct 2011 09:06:48 +0200 + +libjaba-client-java (0-1) unstable; urgency=low + + * Initial release. (Closes: #623030) + + -- Vincent Fourmond fourm...@debian.org Thu, 14 Apr 2011 22:03:33 +0200 Deleted: tags/libjaba-client-java/0+dfsg-1/debian/copyright === --- trunk/libjaba-client-java/debian/copyright 2011-06-06 09:16:58 UTC (rev 13758) +++ tags/libjaba-client-java/0+dfsg-1/debian/copyright 2011-10-22 08:57:50 UTC (rev 15224) @@ -1,58 +0,0 @@ -Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=filerev=174 -Upstream-Name: JABAWS command-line client -Source: http://www.compbio.dundee.ac.uk/jabaws/download.html - The source jar file actually found on that page is missing a few - bits, which were kindly provided privately by Peter Troshin. This - situation should improve soon enough. - -Files: * -Copyright: 2009, 2010 by Peter Troshin -License: Apache 2.0 - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the License); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - . - http://www.apache.org/licenses/LICENSE-2.0 - . - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an AS IS BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - . - On Debian system, the full text of the license can be found at - /usr/share/common-licenses/Apache-2.0 - -Files: compbio/util/annotation/*ThreadSafe.java -Copyright: 2005 Brian Goetz and Tim Peierls -License: CC-BY - Released under the Creative Commons Attribution License - (http://creativecommons.org/licenses/by/2.5) - . - Any republication or derived work distributed in source code form - must include this copyright and license notice. - -Files: debian/* -Copyright: 2011 by Vincent Fourmond fourm...@debian.org -License: GPL2+ - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA - . - On Debian system, the full text of the license can be found at - /usr/share/common-licenses/GPL-2 - Copied: tags/libjaba-client-java/0+dfsg-1/debian/copyright (from rev 15211, trunk
[pkg-java] r15211 - trunk/libjaba-client-java/debian
Author: fourmond Date: 2011-10-19 19:18:01 + (Wed, 19 Oct 2011) New Revision: 15211 Modified: trunk/libjaba-client-java/debian/changelog trunk/libjaba-client-java/debian/copyright Log: [libjaba-client-java] ready for upload ! Modified: trunk/libjaba-client-java/debian/changelog === --- trunk/libjaba-client-java/debian/changelog 2011-10-18 00:24:37 UTC (rev 15210) +++ trunk/libjaba-client-java/debian/changelog 2011-10-19 19:18:01 UTC (rev 15211) @@ -1,4 +1,4 @@ -libjaba-client-java (0-1~java1) unstable; urgency=low +libjaba-client-java (0-1) unstable; urgency=low * Initial release. (Closes: #623030) Modified: trunk/libjaba-client-java/debian/copyright === --- trunk/libjaba-client-java/debian/copyright 2011-10-18 00:24:37 UTC (rev 15210) +++ trunk/libjaba-client-java/debian/copyright 2011-10-19 19:18:01 UTC (rev 15211) @@ -37,22 +37,7 @@ Files: debian/* Copyright: 2011 by Vincent Fourmond fourm...@debian.org -License: GPL2+ - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA - . - On Debian system, the full text of the license can be found at - /usr/share/common-licenses/GPL-2 +License: Apache 2.0 + The debian packaging is licensed under the Apache 2.0 license, like + most of the original code. ___ 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] r15212 - tags
Author: fourmond Date: 2011-10-19 19:22:44 + (Wed, 19 Oct 2011) New Revision: 15212 Added: tags/libjaba-client-java/ Log: Creating tags directory for libjaba-client-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] r15213 - in tags/libjaba-client-java: . 0-1/debian
Author: fourmond Date: 2011-10-19 19:24:10 + (Wed, 19 Oct 2011) New Revision: 15213 Added: tags/libjaba-client-java/0-1/ tags/libjaba-client-java/0-1/debian/changelog tags/libjaba-client-java/0-1/debian/copyright Removed: tags/libjaba-client-java/0-1/debian/changelog tags/libjaba-client-java/0-1/debian/copyright Log: [svn-buildpackage] Tagging libjaba-client-java 0-1 Deleted: tags/libjaba-client-java/0-1/debian/changelog === --- trunk/libjaba-client-java/debian/changelog 2011-06-06 09:16:58 UTC (rev 13758) +++ tags/libjaba-client-java/0-1/debian/changelog 2011-10-19 19:24:10 UTC (rev 15213) @@ -1,5 +0,0 @@ -libjaba-client-java (0-1~java1) unstable; urgency=low - - * Initial release. (Closes: #623030) - - -- Vincent Fourmond fourm...@debian.org Thu, 14 Apr 2011 22:03:33 +0200 Copied: tags/libjaba-client-java/0-1/debian/changelog (from rev 15211, trunk/libjaba-client-java/debian/changelog) === --- tags/libjaba-client-java/0-1/debian/changelog (rev 0) +++ tags/libjaba-client-java/0-1/debian/changelog 2011-10-19 19:24:10 UTC (rev 15213) @@ -0,0 +1,5 @@ +libjaba-client-java (0-1) unstable; urgency=low + + * Initial release. (Closes: #623030) + + -- Vincent Fourmond fourm...@debian.org Thu, 14 Apr 2011 22:03:33 +0200 Deleted: tags/libjaba-client-java/0-1/debian/copyright === --- trunk/libjaba-client-java/debian/copyright 2011-06-06 09:16:58 UTC (rev 13758) +++ tags/libjaba-client-java/0-1/debian/copyright 2011-10-19 19:24:10 UTC (rev 15213) @@ -1,58 +0,0 @@ -Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=filerev=174 -Upstream-Name: JABAWS command-line client -Source: http://www.compbio.dundee.ac.uk/jabaws/download.html - The source jar file actually found on that page is missing a few - bits, which were kindly provided privately by Peter Troshin. This - situation should improve soon enough. - -Files: * -Copyright: 2009, 2010 by Peter Troshin -License: Apache 2.0 - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the License); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - . - http://www.apache.org/licenses/LICENSE-2.0 - . - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an AS IS BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - . - On Debian system, the full text of the license can be found at - /usr/share/common-licenses/Apache-2.0 - -Files: compbio/util/annotation/*ThreadSafe.java -Copyright: 2005 Brian Goetz and Tim Peierls -License: CC-BY - Released under the Creative Commons Attribution License - (http://creativecommons.org/licenses/by/2.5) - . - Any republication or derived work distributed in source code form - must include this copyright and license notice. - -Files: debian/* -Copyright: 2011 by Vincent Fourmond fourm...@debian.org -License: GPL2+ - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA - . - On Debian system, the full text of the license can be found at - /usr/share/common-licenses/GPL-2 - Copied: tags/libjaba-client-java/0-1/debian/copyright (from rev 15211, trunk/libjaba-client-java/debian/copyright) === --- tags/libjaba-client-java/0-1/debian/copyright (rev 0) +++ tags/libjaba-client-java/0-1/debian/copyright 2011-10-19 19:24:10 UTC (rev 15213) @@ -0,0 +1,43 @@ +Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=filerev=174 +Upstream-Name: JABAWS command-line client +Source: http://www.compbio.dundee.ac.uk/jabaws/download.html + The source jar file actually found on that page is missing a few + bits, which were kindly provided privately
[pkg-java] r15214 - trunk/libjswingreader-java/debian
Author: fourmond Date: 2011-10-19 19:27:08 + (Wed, 19 Oct 2011) New Revision: 15214 Added: trunk/libjswingreader-java/debian/compat Modified: trunk/libjswingreader-java/debian/changelog trunk/libjswingreader-java/debian/copyright Log: [libjswingreader-java] ready for upload Modified: trunk/libjswingreader-java/debian/changelog === --- trunk/libjswingreader-java/debian/changelog 2011-10-19 19:24:10 UTC (rev 15213) +++ trunk/libjswingreader-java/debian/changelog 2011-10-19 19:27:08 UTC (rev 15214) @@ -1,5 +1,5 @@ -libjswingreader-java (0.3-1~java) unstable; urgency=low +libjswingreader-java (0.3-1) unstable; urgency=low * Initial release. (Closes: #644561) - -- Vincent Fourmond fourm...@debian.org Fri, 07 Oct 2011 23:05:15 +0200 + -- Vincent Fourmond fourm...@debian.org Wed, 19 Oct 2011 21:20:01 +0200 Added: trunk/libjswingreader-java/debian/compat === --- trunk/libjswingreader-java/debian/compat(rev 0) +++ trunk/libjswingreader-java/debian/compat2011-10-19 19:27:08 UTC (rev 15214) @@ -0,0 +1 @@ +7 Modified: trunk/libjswingreader-java/debian/copyright === --- trunk/libjswingreader-java/debian/copyright 2011-10-19 19:24:10 UTC (rev 15213) +++ trunk/libjswingreader-java/debian/copyright 2011-10-19 19:27:08 UTC (rev 15214) @@ -10,7 +10,7 @@ Comment: Although the source code lacks copyright and licensing information, I asked confirmation to Rob Clevenger, the only contributor listed - in the CVS repository, that he owns the copyright and the actual + in the SVN repository, that he owns the copyright and the actual license for distribution: . From: Rob Clevenger rclev...@users.sourceforge.net ___ 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] r15215 - tags
Author: fourmond Date: 2011-10-19 19:28:01 + (Wed, 19 Oct 2011) New Revision: 15215 Added: tags/libjswingreader-java/ Log: Creating tags dir for libjswingreader-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] r15216 - in tags/libjswingreader-java: . 0.3-1/debian
Author: fourmond
Date: 2011-10-19 19:28:27 + (Wed, 19 Oct 2011)
New Revision: 15216
Added:
tags/libjswingreader-java/0.3-1/
tags/libjswingreader-java/0.3-1/debian/changelog
tags/libjswingreader-java/0.3-1/debian/compat
tags/libjswingreader-java/0.3-1/debian/control
tags/libjswingreader-java/0.3-1/debian/copyright
Removed:
tags/libjswingreader-java/0.3-1/debian/changelog
tags/libjswingreader-java/0.3-1/debian/control
tags/libjswingreader-java/0.3-1/debian/copyright
Log:
[svn-buildpackage] Tagging libjswingreader-java 0.3-1
Deleted: tags/libjswingreader-java/0.3-1/debian/changelog
===
--- trunk/libjswingreader-java/debian/changelog 2011-10-07 22:02:24 UTC (rev
15165)
+++ tags/libjswingreader-java/0.3-1/debian/changelog2011-10-19 19:28:27 UTC
(rev 15216)
@@ -1,5 +0,0 @@
-libjswingreader-java (0.3-1) unstable; urgency=low
-
- * Initial release. (Closes: #644561)
-
- -- Vincent Fourmond fourm...@debian.org Fri, 07 Oct 2011 23:05:15 +0200
Copied: tags/libjswingreader-java/0.3-1/debian/changelog (from rev 15214,
trunk/libjswingreader-java/debian/changelog)
===
--- tags/libjswingreader-java/0.3-1/debian/changelog
(rev 0)
+++ tags/libjswingreader-java/0.3-1/debian/changelog2011-10-19 19:28:27 UTC
(rev 15216)
@@ -0,0 +1,5 @@
+libjswingreader-java (0.3-1) unstable; urgency=low
+
+ * Initial release. (Closes: #644561)
+
+ -- Vincent Fourmond fourm...@debian.org Wed, 19 Oct 2011 21:20:01 +0200
Copied: tags/libjswingreader-java/0.3-1/debian/compat (from rev 15214,
trunk/libjswingreader-java/debian/compat)
===
--- tags/libjswingreader-java/0.3-1/debian/compat
(rev 0)
+++ tags/libjswingreader-java/0.3-1/debian/compat 2011-10-19 19:28:27 UTC
(rev 15216)
@@ -0,0 +1 @@
+7
Deleted: tags/libjswingreader-java/0.3-1/debian/control
===
--- trunk/libjswingreader-java/debian/control 2011-10-07 22:02:24 UTC (rev
15165)
+++ tags/libjswingreader-java/0.3-1/debian/control 2011-10-19 19:28:27 UTC
(rev 15216)
@@ -1,17 +0,0 @@
-Source: libjswingreader-java
-Section: libs
-Priority: optional
-Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Vincent Fourmond fourm...@debian.org
-Build-Depends: cdbs, debhelper (= 7), ant, default-jdk, javahelper,
- libgnumail-java
-Standards-Version: 3.9.2
-Homepage: http://jswingreader.sourceforge.net
-
-Package: libjswingreader-java
-Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
-Description: RSS NewsFeed reader for Java
- This is a RSS feed reader for java. It can either be used as a
- standalone reader or as a library.
-
Copied: tags/libjswingreader-java/0.3-1/debian/control (from rev 15166,
trunk/libjswingreader-java/debian/control)
===
--- tags/libjswingreader-java/0.3-1/debian/control
(rev 0)
+++ tags/libjswingreader-java/0.3-1/debian/control 2011-10-19 19:28:27 UTC
(rev 15216)
@@ -0,0 +1,17 @@
+Source: libjswingreader-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
+Uploaders: Vincent Fourmond fourm...@debian.org
+Build-Depends: cdbs, debhelper (= 7), ant, default-jdk, javahelper,
+ libgnumail-java
+Standards-Version: 3.9.2
+Homepage: http://jswingreader.sourceforge.net
+
+Package: libjswingreader-java
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Description: RSS NewsFeed reader for Java
+ This is a RSS feed reader for java. It can either be used as a
+ standalone reader or as a library.
+
Deleted: tags/libjswingreader-java/0.3-1/debian/copyright
===
--- trunk/libjswingreader-java/debian/copyright 2011-10-07 22:02:24 UTC (rev
15165)
+++ tags/libjswingreader-java/0.3-1/debian/copyright2011-10-19 19:28:27 UTC
(rev 15216)
@@ -1,53 +0,0 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
-Upstream-Name: swingreader-java
-Upstream-Contact: jalview-disc...@jalview.org
-Source:
- The original tarball was made from sourceforge's SVN repository thus:
- .
- svn export
http://jswingreader.svn.sourceforge.net/svnroot/jswingreader/trunk/jswingreader/JSwingReader
- .
- The debian/get-svn-source does the actual job of packaging this.
-Comment:
- Although the source code lacks copyright and licensing information,
- I asked confirmation to Rob Clevenger, the only contributor listed
- in the CVS repository, that he owns the copyright and the actual
- license for distribution:
- .
- From: Rob Clevenger rclev...@users.sourceforge.net
- Date: Thu, 6 Oct 2011 13:21:35 -0700
- Message
[pkg-java] r15217 - trunk/libvamsas-client-java/debian
Author: fourmond Date: 2011-10-19 19:31:36 + (Wed, 19 Oct 2011) New Revision: 15217 Modified: trunk/libvamsas-client-java/debian/changelog trunk/libvamsas-client-java/debian/copyright Log: [libvamsas-client-java] ready for upload ! Modified: trunk/libvamsas-client-java/debian/changelog === --- trunk/libvamsas-client-java/debian/changelog2011-10-19 19:28:27 UTC (rev 15216) +++ trunk/libvamsas-client-java/debian/changelog2011-10-19 19:31:36 UTC (rev 15217) @@ -1,4 +1,4 @@ -libvamsas-client-java (0.2~git2011.10.17+1b42648-1~java1) unstable; urgency=low +libvamsas-client-java (0.2~git2011.10.17+1b42648-1) unstable; urgency=low * Initial release. (Closes: #622811) Modified: trunk/libvamsas-client-java/debian/copyright === --- trunk/libvamsas-client-java/debian/copyright2011-10-19 19:28:27 UTC (rev 15216) +++ trunk/libvamsas-client-java/debian/copyright2011-10-19 19:31:36 UTC (rev 15217) @@ -49,7 +49,7 @@ /usr/share/common-licenses/GPL-2 Files: src/org/apache/tools/zip/* -Copyright: Apache Software Foundation ? +Copyright: Apache Software Foundation License: Apache 2.0 Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with ___ 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] r15218 - tags
Author: fourmond Date: 2011-10-19 19:32:25 + (Wed, 19 Oct 2011) New Revision: 15218 Added: tags/libvamsas-client-java/ Log: Creating tags directory for libvamsas-client-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] r15220 - trunk/jalview/debian
Author: fourmond
Date: 2011-10-19 19:52:55 + (Wed, 19 Oct 2011)
New Revision: 15220
Modified:
trunk/jalview/debian/changelog
trunk/jalview/debian/control
trunk/jalview/debian/copyright
trunk/jalview/debian/new-upstream
Log:
[jalview] Fix final copyright glitches, ready for upload
Modified: trunk/jalview/debian/changelog
===
--- trunk/jalview/debian/changelog 2011-10-19 19:33:05 UTC (rev 15219)
+++ trunk/jalview/debian/changelog 2011-10-19 19:52:55 UTC (rev 15220)
@@ -5,5 +5,7 @@
getting rid of the bundled precompiled JAR files (I love JAR files)
* Using dh 7 and javahelper
* Using jh_build for building
+ * Uploading to experimental as it works only with the version of jmol in
+experimental
- -- Vincent Fourmond fourm...@debian.org Mon, 17 Oct 2011 23:53:38 +0200
+ -- Vincent Fourmond fourm...@debian.org Wed, 19 Oct 2011 20:19:46 +0200
Modified: trunk/jalview/debian/control
===
--- trunk/jalview/debian/control2011-10-19 19:33:05 UTC (rev 15219)
+++ trunk/jalview/debian/control2011-10-19 19:52:55 UTC (rev 15220)
@@ -23,7 +23,7 @@
Package: jalview
Architecture: all
Depends: ${misc:Depends}, openjdk-6-jre | cacao-oj6-jre | java6-runtime,
-java-wrappers (= 0.1.22), ${java:Depends}
+java-wrappers (= 0.1.22), libjmol-java (= 12.1.42), ${java:Depends}
Suggests: kalign, t-coffee, clustalw
Description: multiple alignment editor
JalView is a Java alignement editor that can work with sequence
Modified: trunk/jalview/debian/copyright
===
--- trunk/jalview/debian/copyright 2011-10-19 19:33:05 UTC (rev 15219)
+++ trunk/jalview/debian/copyright 2011-10-19 19:52:55 UTC (rev 15220)
@@ -14,7 +14,7 @@
License: GPL-3+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
.
This package is distributed in the hope that it will be useful,
@@ -29,7 +29,28 @@
On Debian systems, the complete text of the GNU General Public
License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+Files: src/org/biojava/dasobert/*
+Copyright: 2004-2007 Andreas Prlic
+License: LGPL-2.1
+ This code may be freely distributed and modified under the
+ terms of the GNU Lesser General Public Licence. This should
+ be distributed with the code.
+ .
+ On Debian systems, the complete text of the GNU Lesser Public
+ License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+Files: src/org/jibble/*
+Copyright: 2001-2004 Paul James Mutton
+License: GPL-2
+ This software is dual-licensed, allowing you to choose between the
+ GNU General Public License (GPL) and the www.jibble.org Commercial
+ License. Since the GPL may be too restrictive for use in a
+ proprietary application, a commercial license is also provided. Full
+ license information can be found at http://www.jibble.org/licenses/.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License (version 2) can be found in `/usr/share/common-licenses/GPL-2'.
+
Files: debian/*
Copyright: Copyright (C) 2009-2011 Vincent Fourmond fourm...@debian.org
License: GPL-3+
Modified: trunk/jalview/debian/new-upstream
===
--- trunk/jalview/debian/new-upstream 2011-10-19 19:33:05 UTC (rev 15219)
+++ trunk/jalview/debian/new-upstream 2011-10-19 19:52:55 UTC (rev 15220)
@@ -31,6 +31,11 @@
# Removing all binary jars...
find -name '*.jar' | xargs rm
+# Removing examples/ subdirectory, whose copyright status is unclear
+# to me for the time being
+rm -rf jalview*/examples
+
+
echo Creating archive
tar cvj -f $origname jalview*
cd -
___
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] r15221 - in tags/jalview: . 2.7.dfsg-1/debian 2.7.dfsg-1/debian/patches 2.7.dfsg-1/debian/wrappers
Author: fourmond
Date: 2011-10-19 19:54:39 + (Wed, 19 Oct 2011)
New Revision: 15221
Added:
tags/jalview/2.7.dfsg-1/
tags/jalview/2.7.dfsg-1/debian/changelog
tags/jalview/2.7.dfsg-1/debian/control
tags/jalview/2.7.dfsg-1/debian/copyright
tags/jalview/2.7.dfsg-1/debian/jalview.install
tags/jalview/2.7.dfsg-1/debian/jalview.jlibs
tags/jalview/2.7.dfsg-1/debian/jalview.manpages
tags/jalview/2.7.dfsg-1/debian/jalview.menu
tags/jalview/2.7.dfsg-1/debian/manpages/
tags/jalview/2.7.dfsg-1/debian/new-upstream
tags/jalview/2.7.dfsg-1/debian/patches/mutilate-build-system.diff
tags/jalview/2.7.dfsg-1/debian/patches/series
tags/jalview/2.7.dfsg-1/debian/rules
tags/jalview/2.7.dfsg-1/debian/wrappers/jalview
Removed:
tags/jalview/2.7.dfsg-1/debian/README.Debian
tags/jalview/2.7.dfsg-1/debian/changelog
tags/jalview/2.7.dfsg-1/debian/control
tags/jalview/2.7.dfsg-1/debian/copyright
tags/jalview/2.7.dfsg-1/debian/javabuild
tags/jalview/2.7.dfsg-1/debian/menu.ex
tags/jalview/2.7.dfsg-1/debian/new-upstream
tags/jalview/2.7.dfsg-1/debian/rules
tags/jalview/2.7.dfsg-1/debian/wrappers/jalview
Log:
[svn-buildpackage] Tagging jalview 2.7.dfsg-1
Deleted: tags/jalview/2.7.dfsg-1/debian/README.Debian
===
--- trunk/jalview/debian/README.Debian 2011-06-06 09:16:58 UTC (rev 13758)
+++ tags/jalview/2.7.dfsg-1/debian/README.Debian2011-10-19 19:54:39 UTC
(rev 15221)
@@ -1,6 +0,0 @@
-jalview for Debian
---
-
-possible notes regarding this package - if none, delete this file
-
- -- Vincent Fourmond fourm...@debian.org Thu, 15 Jan 2009 23:12:16 +0100
Deleted: tags/jalview/2.7.dfsg-1/debian/changelog
===
--- trunk/jalview/debian/changelog 2011-06-06 09:16:58 UTC (rev 13758)
+++ tags/jalview/2.7.dfsg-1/debian/changelog2011-10-19 19:54:39 UTC (rev
15221)
@@ -1,9 +0,0 @@
-jalview (2.6.1.dfsg-1) unstable; urgency=low
-
- * Initial release (Closes: #507436)
- * Adding a debian/new-upstream script to repackage the original
-tarball, getting rid of the bundled JAR file (I love JAR files)
- * Using dh 7 and javahelper
- * Using jh_build for building
-
- -- Vincent Fourmond fourm...@debian.org Fri, 15 Apr 2011 00:28:48 +0200
Copied: tags/jalview/2.7.dfsg-1/debian/changelog (from rev 15220,
trunk/jalview/debian/changelog)
===
--- tags/jalview/2.7.dfsg-1/debian/changelog(rev 0)
+++ tags/jalview/2.7.dfsg-1/debian/changelog2011-10-19 19:54:39 UTC (rev
15221)
@@ -0,0 +1,11 @@
+jalview (2.7.dfsg-1) experimental; urgency=low
+
+ * Initial release (Closes: #507436)
+ * Adding a debian/new-upstream script to repackage the original tarball,
+getting rid of the bundled precompiled JAR files (I love JAR files)
+ * Using dh 7 and javahelper
+ * Using jh_build for building
+ * Uploading to experimental as it works only with the version of jmol in
+experimental
+
+ -- Vincent Fourmond fourm...@debian.org Wed, 19 Oct 2011 20:19:46 +0200
Deleted: tags/jalview/2.7.dfsg-1/debian/control
===
--- trunk/jalview/debian/control2011-06-06 09:16:58 UTC (rev 13758)
+++ tags/jalview/2.7.dfsg-1/debian/control 2011-10-19 19:54:39 UTC (rev
15221)
@@ -1,31 +0,0 @@
-Source: jalview
-Section: science
-Priority: optional
-Maintainer: Vincent Fourmond fourm...@debian.org
-Build-Depends: cdbs, debhelper (= 7), default-jdk,
- ant, ant-optional, libxerces2-java, libxalan2-java,
- libaxis-java, libwsdl4j-java, libgnujaf-java,
- libgnumail-java, liblog4j1.2-java, javahelp2,
- libcommons-discovery-java, libcommons-logging-java,
- libstevesoft-regex-java, libjmol-java,
- libcastor-xml-java, libvamsas-client-java,
- libjaba-client-java, libaxis-java, jmol-applet,
- javahelper, javahelp2
-Standards-Version: 3.9.2
-Homepage: http://www.jalview.org/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/jalview
-
-
-Package: jalview
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | cacao-oj6-jre | java6-runtime,
-java-wrappers (= 0.1.22), ${java:Depends}
-Suggests: kalign, t-coffee, clustalw
-Description: multiple alignment editor
- JalView is a Java alignement editor that can work with sequence
- alignement produced by programs implementing alignment algorithms
- such as clustalw, kalign and t-coffee.
- .
- It has lots of features, and can be considered a decent BioEdit
- replacement for Debian systems.
Copied: tags/jalview/2.7.dfsg-1/debian/control (from rev 15220,
trunk/jalview/debian/control)
===
--- tags/jalview
[pkg-java] r15209 - trunk/jalview/debian
Author: fourmond Date: 2011-10-17 22:03:17 + (Mon, 17 Oct 2011) New Revision: 15209 Modified: trunk/jalview/debian/changelog trunk/jalview/debian/control trunk/jalview/debian/copyright trunk/jalview/debian/jalview.install trunk/jalview/debian/new-upstream trunk/jalview/debian/rules Log: [jalview] it seems like we are getting close to a final release... Modified: trunk/jalview/debian/changelog === --- trunk/jalview/debian/changelog 2011-10-17 21:49:05 UTC (rev 15208) +++ trunk/jalview/debian/changelog 2011-10-17 22:03:17 UTC (rev 15209) @@ -1,10 +1,9 @@ -jalview (2.7.dfsg~almost-1) unstable; urgency=low +jalview (2.7.dfsg-1) experimental; urgency=low * Initial release (Closes: #507436) * Adding a debian/new-upstream script to repackage the original tarball, getting rid of the bundled precompiled JAR files (I love JAR files) -(well, almost, which is why this goes in non-free for now) * Using dh 7 and javahelper * Using jh_build for building - -- Vincent Fourmond fourm...@debian.org Sun, 16 Oct 2011 00:23:10 +0200 + -- Vincent Fourmond fourm...@debian.org Mon, 17 Oct 2011 23:53:38 +0200 Modified: trunk/jalview/debian/control === --- trunk/jalview/debian/control2011-10-17 21:49:05 UTC (rev 15208) +++ trunk/jalview/debian/control2011-10-17 22:03:17 UTC (rev 15209) @@ -1,5 +1,5 @@ Source: jalview -Section: non-free/science +Section: science Priority: optional Maintainer: Vincent Fourmond fourm...@debian.org Build-Depends: cdbs, debhelper (= 7), default-jdk, @@ -13,7 +13,8 @@ javahelper, javahelp2, libjswingreader-java, libmiglayout-java, icedtea-netx-common, libhttpmime-java, libhttpcore-java, - libapache-mime4j-java, libhttpclient-java + libapache-mime4j-java, libhttpclient-java, + libvamsas-client-java Standards-Version: 3.9.2 Homepage: http://www.jalview.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview @@ -29,5 +30,5 @@ alignement produced by programs implementing alignment algorithms such as clustalw, kalign and t-coffee. . - It has lots of features, and will compare advantageously to BioEdit, - while being free as in free speech ! + It has lots of features, is actively developed, and will compare + advantageously to BioEdit, while being free as in free speech ! Modified: trunk/jalview/debian/copyright === --- trunk/jalview/debian/copyright 2011-10-17 21:49:05 UTC (rev 15208) +++ trunk/jalview/debian/copyright 2011-10-17 22:03:17 UTC (rev 15209) @@ -3,16 +3,11 @@ Upstream-Contact: jalview-disc...@jalview.org Source: The original tarball was made downloading the jalview-*.tar.gz - tarball on http://www.jalview.org/versions.html, and stripping most - of the binary-only jars excepted lib/vamsas-client.jar. + tarball on http://www.jalview.org/versions.html, and stripping all + binary jars. . - For more details, see the debian/new-upstream script that does precisely - this. -Disclaimer: - The tarball contains a sourceless binary jar, - lib/vamsas-client.jar. Though the distribution and use of this file - is allowed by its copyright holders, the absence of source prevents - it from being integrated into Debian main. + For more details, see the debian/new-upstream script that takes care of + the repackaging. Files: * Copyright: Copyright 2007-2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle @@ -40,10 +35,6 @@ License: GPL-3+ (see above) -Files: lib/vamsas-client.jar -Copyright: -License: ... - Files: src/com/stevesoft/pat/* Copyright: Copyright 2001, Steven R. Brandt License: LGPL3+ Modified: trunk/jalview/debian/jalview.install === --- trunk/jalview/debian/jalview.install2011-10-17 21:49:05 UTC (rev 15208) +++ trunk/jalview/debian/jalview.install2011-10-17 22:03:17 UTC (rev 15209) @@ -1,2 +1 @@ -lib/vamsas-client.jar usr/share/jalview debian/wrappers/jalview usr/bin \ No newline at end of file Modified: trunk/jalview/debian/new-upstream === --- trunk/jalview/debian/new-upstream 2011-10-17 21:49:05 UTC (rev 15208) +++ trunk/jalview/debian/new-upstream 2011-10-17 22:03:17 UTC (rev 15209) @@ -29,7 +29,7 @@ rm -rf jalview*/utils # Removing all binary jars... -find -name '*.jar' | grep -vi vamsas | xargs rm +find -name '*.jar' | xargs rm echo Creating archive tar cvj -f $origname jalview* Modified: trunk/jalview/debian/rules === --- trunk/jalview/debian/rules 2011-10-17 21:49:05 UTC (rev 15208) +++ trunk/jalview/debian/rules 2011-10-17 22:03:17 UTC (rev
[pkg-java] r15206 - in trunk/jalview/debian: . patches
Author: fourmond
Date: 2011-10-15 22:46:49 + (Sat, 15 Oct 2011)
New Revision: 15206
Modified:
trunk/jalview/debian/changelog
trunk/jalview/debian/control
trunk/jalview/debian/patches/mutilate-build-system.diff
trunk/jalview/debian/rules
Log:
[jalview] build version 2.7
Modified: trunk/jalview/debian/changelog
===
--- trunk/jalview/debian/changelog 2011-10-15 20:57:58 UTC (rev 15205)
+++ trunk/jalview/debian/changelog 2011-10-15 22:46:49 UTC (rev 15206)
@@ -1,10 +1,10 @@
-jalview (2.6.1.dfsg~almost-1) unstable; urgency=low
+jalview (2.7.dfsg~almost-1) unstable; urgency=low
* Initial release (Closes: #507436)
- * Adding a debian/new-upstream script to repackage the original
-tarball, getting rid of the bundled JAR file (I love JAR files)
+ * Adding a debian/new-upstream script to repackage the original tarball,
+getting rid of the bundled precompiled JAR files (I love JAR files)
(well, almost, which is why this goes in non-free for now)
* Using dh 7 and javahelper
* Using jh_build for building
- -- Vincent Fourmond fourm...@debian.org Fri, 15 Apr 2011 00:28:48 +0200
+ -- Vincent Fourmond fourm...@debian.org Sun, 16 Oct 2011 00:23:10 +0200
Modified: trunk/jalview/debian/control
===
--- trunk/jalview/debian/control2011-10-15 20:57:58 UTC (rev 15205)
+++ trunk/jalview/debian/control2011-10-15 22:46:49 UTC (rev 15206)
@@ -10,7 +10,10 @@
libjmol-java (= 12.1.42),
jmol-applet (= 12.1.42),
libcastor-xml-java, libjaba-client-java, libaxis-java,
- javahelper, javahelp2
+ javahelper, javahelp2, libjswingreader-java,
+ libmiglayout-java, icedtea-netx-common,
+ libhttpmime-java, libhttpcore-java,
+ libapache-mime4j-java, libhttpclient-java
Standards-Version: 3.9.2
Homepage: http://www.jalview.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview
Modified: trunk/jalview/debian/patches/mutilate-build-system.diff
===
--- trunk/jalview/debian/patches/mutilate-build-system.diff 2011-10-15
20:57:58 UTC (rev 15205)
+++ trunk/jalview/debian/patches/mutilate-build-system.diff 2011-10-15
22:46:49 UTC (rev 15206)
@@ -1,7 +1,7 @@
-Index: jalview-2.6.1.dfsg/build.xml
+Index: jalview-2.7.dfsg~almost/build.xml
===
jalview-2.6.1.dfsg.orig/build.xml 2010-11-12 17:33:17.0 +0100
-+++ jalview-2.6.1.dfsg/build.xml 2011-09-29 22:47:54.117759830 +0200
+--- jalview-2.7.dfsg~almost.orig/build.xml 2011-09-27 16:50:20.0
+0200
jalview-2.7.dfsg~almost/build.xml 2011-10-16 00:25:56.823058139 +0200
@@ -18,13 +18,6 @@
--
project name=jalviewX default=usage basedir=.
@@ -27,7 +27,7 @@
fileset dir=${libDir}
include name=*.jar /
include name=**/*.jar /
-@@ -397,7 +386,7 @@
+@@ -407,7 +396,7 @@
/axis-wsdl2java
/target
Modified: trunk/jalview/debian/rules
===
--- trunk/jalview/debian/rules 2011-10-15 20:57:58 UTC (rev 15205)
+++ trunk/jalview/debian/rules 2011-10-15 22:46:49 UTC (rev 15206)
@@ -19,7 +19,9 @@
DEB_ANT_BUILD_TARGET := makedist
DEB_JARS := castor-xml commons-logging log4j-1.2 \
castor-core Jmol min-jaba-client axis-jaxrpc commons-discovery \
- axis jh lib/vamsas-client.jar /usr/share/jmol-applet/JmolApplet.jar
+ axis jh lib/vamsas-client.jar /usr/share/jmol-applet/JmolApplet.jar \
+ jswingreader miglayout /usr/share/icedtea-web/plugin.jar \
+ httpmime httpcore apache-mime4j httpclient
ANT_OPTS := -Dbuild.sysclasspath=last \
@@ -28,3 +30,6 @@
FINAL_CLASSPATH = $(subst lib/vamsas-client.jar,
/usr/share/jalview/vamsas-client.jar, $(DEB_CLASSPATH))
JH_CLASSPATH_ARGS := -c$(shell echo $(FINAL_CLASSPATH) | sed 's/:/ /g')
debian/jalview/usr/share/java/jalview.jar
+
+cp:
+ @echo $(DEB_CLASSPATH)
\ No newline at end of file
___
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] r15165 - in trunk: . libjswingreader-java libjswingreader-java/debian libjswingreader-java/debian/source
Author: fourmond
Date: 2011-10-07 22:02:24 + (Fri, 07 Oct 2011)
New Revision: 15165
Added:
trunk/libjswingreader-java/
trunk/libjswingreader-java/debian/
trunk/libjswingreader-java/debian/changelog
trunk/libjswingreader-java/debian/control
trunk/libjswingreader-java/debian/copyright
trunk/libjswingreader-java/debian/get-svn-source
trunk/libjswingreader-java/debian/libjswingreader-java.jlibs
trunk/libjswingreader-java/debian/rules
trunk/libjswingreader-java/debian/source/
trunk/libjswingreader-java/debian/source/format
Log:
[libjswingreader-java] Package jswingreader, a dependency for jalview 2.7
Property changes on: trunk/libjswingreader-java/debian
___
Added: mergeWithUpstream
+ 1
Added: trunk/libjswingreader-java/debian/changelog
===
--- trunk/libjswingreader-java/debian/changelog (rev 0)
+++ trunk/libjswingreader-java/debian/changelog 2011-10-07 22:02:24 UTC (rev
15165)
@@ -0,0 +1,5 @@
+libjswingreader-java (0.3-1) unstable; urgency=low
+
+ * Initial release. (Closes: #644561)
+
+ -- Vincent Fourmond fourm...@debian.org Fri, 07 Oct 2011 23:05:15 +0200
Added: trunk/libjswingreader-java/debian/control
===
--- trunk/libjswingreader-java/debian/control (rev 0)
+++ trunk/libjswingreader-java/debian/control 2011-10-07 22:02:24 UTC (rev
15165)
@@ -0,0 +1,17 @@
+Source: libjswingreader-java
+Section: libs
+Priority: optional
+Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
+Uploaders: Vincent Fourmond fourm...@debian.org
+Build-Depends: cdbs, debhelper (= 7), ant, default-jdk, javahelper,
+ libgnumail-java
+Standards-Version: 3.9.2
+Homepage: http://jswingreader.sourceforge.net
+
+Package: libjswingreader-java
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Description: RSS NewsFeed reader for Java
+ This is a RSS feed reader for java. It can either be used as a
+ standalone reader or as a library.
+
Added: trunk/libjswingreader-java/debian/copyright
===
--- trunk/libjswingreader-java/debian/copyright (rev 0)
+++ trunk/libjswingreader-java/debian/copyright 2011-10-07 22:02:24 UTC (rev
15165)
@@ -0,0 +1,53 @@
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Upstream-Name: swingreader-java
+Upstream-Contact: jalview-disc...@jalview.org
+Source:
+ The original tarball was made from sourceforge's SVN repository thus:
+ .
+ svn export
http://jswingreader.svn.sourceforge.net/svnroot/jswingreader/trunk/jswingreader/JSwingReader
+ .
+ The debian/get-svn-source does the actual job of packaging this.
+Comment:
+ Although the source code lacks copyright and licensing information,
+ I asked confirmation to Rob Clevenger, the only contributor listed
+ in the CVS repository, that he owns the copyright and the actual
+ license for distribution:
+ .
+ From: Rob Clevenger rclev...@users.sourceforge.net
+ Date: Thu, 6 Oct 2011 13:21:35 -0700
+ Message-ID:
cal62qso9uka1m7fsfywv4bbs_tgad2of3z2akg2-mbsqgjl...@mail.gmail.com
+ Subject: Re: Copyright and license of JSwingReader
+ To: Vincent Fourmond fourm...@users.sourceforge.net
+ .
+ Yes, I wrote the code myself and therefore own the copyright to
+ it. I license everything under Apache 2.0 license.
+ .
+ I hope that works, if not let me know, I'd be willing to license it
+ under something different if required, but I personally prefer
+ Apache 2.0.
+
+
+Files: *
+Copyright: Copyright 2004 Rob Clevenger rclev...@users.sourceforge.net
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the License); you
+ may not use this file except in compliance with the License. You
+ may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an AS IS BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ permissions and limitations under the License.
+ .
+ The full text of the Apache license can be found in
+ `/usr/share/common-licenses/Apache-2.0'.
+
+
+Files: debian/*
+Copyright: Copyright (C) 2011 Vincent Fourmond fourm...@debian.org
+License: Apache-2.0
+ Debian packaging is subject to the same terms as swingreader-java
+ itself.
\ No newline at end of file
Added: trunk/libjswingreader-java/debian/get-svn-source
===
--- trunk/libjswingreader-java/debian/get-svn-source
(rev 0)
+++ trunk/libjswingreader-java/debian/get-svn-source2011-10-07 22:02:24
[pkg-java] r15166 - trunk/libjswingreader-java/debian
Author: fourmond Date: 2011-10-07 22:14:37 + (Fri, 07 Oct 2011) New Revision: 15166 Modified: trunk/libjswingreader-java/debian/changelog trunk/libjswingreader-java/debian/control Log: [libjswingreader-java] Got the wrong section, thanks lintiant + upload to pkg-java Modified: trunk/libjswingreader-java/debian/changelog === --- trunk/libjswingreader-java/debian/changelog 2011-10-07 22:02:24 UTC (rev 15165) +++ trunk/libjswingreader-java/debian/changelog 2011-10-07 22:14:37 UTC (rev 15166) @@ -1,4 +1,4 @@ -libjswingreader-java (0.3-1) unstable; urgency=low +libjswingreader-java (0.3-1~java) unstable; urgency=low * Initial release. (Closes: #644561) Modified: trunk/libjswingreader-java/debian/control === --- trunk/libjswingreader-java/debian/control 2011-10-07 22:02:24 UTC (rev 15165) +++ trunk/libjswingreader-java/debian/control 2011-10-07 22:14:37 UTC (rev 15166) @@ -1,5 +1,5 @@ Source: libjswingreader-java -Section: libs +Section: java Priority: optional Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org Uploaders: Vincent Fourmond fourm...@debian.org ___ 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] r15167 - trunk/jalview/debian
Author: fourmond Date: 2011-10-08 00:20:39 + (Sat, 08 Oct 2011) New Revision: 15167 Modified: trunk/jalview/debian/control trunk/jalview/debian/copyright trunk/jalview/debian/rules Log: [jalview] few small fixes Modified: trunk/jalview/debian/control === --- trunk/jalview/debian/control2011-10-07 22:14:37 UTC (rev 15166) +++ trunk/jalview/debian/control2011-10-08 00:20:39 UTC (rev 15167) @@ -8,9 +8,8 @@ libgnumail-java, liblog4j1.2-java, javahelp2, libcommons-discovery-java, libcommons-logging-java, libjmol-java (= 12.1.42), - libcastor-xml-java, - libjaba-client-java, libaxis-java, jmol-applet (= 12.1.42), + libcastor-xml-java, libjaba-client-java, libaxis-java, javahelper, javahelp2 Standards-Version: 3.9.2 Homepage: http://www.jalview.org/ Modified: trunk/jalview/debian/copyright === --- trunk/jalview/debian/copyright 2011-10-07 22:14:37 UTC (rev 15166) +++ trunk/jalview/debian/copyright 2011-10-08 00:20:39 UTC (rev 15167) @@ -1,5 +1,5 @@ Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174 -Upstream-Name: freecol +Upstream-Name: jalview Upstream-Contact: jalview-disc...@jalview.org Source: The original tarball was made downloading the jalview-*.tar.gz Modified: trunk/jalview/debian/rules === --- trunk/jalview/debian/rules 2011-10-07 22:14:37 UTC (rev 15166) +++ trunk/jalview/debian/rules 2011-10-08 00:20:39 UTC (rev 15167) @@ -18,12 +18,12 @@ DEB_ANT_CLEAN_TARGET := clean DEB_ANT_BUILD_TARGET := makedist DEB_JARS := castor-xml commons-logging log4j-1.2 \ - castor-core Jmol min-jaba-client axis-jaxrpc \ + castor-core Jmol min-jaba-client axis-jaxrpc commons-discovery \ axis jh lib/vamsas-client.jar /usr/share/jmol-applet/JmolApplet.jar ANT_OPTS := -Dbuild.sysclasspath=last \ - -DJALVIW_VERSION=$(VERSION) + -DJALVIEW_VERSION=$(VERSION) FINAL_CLASSPATH = $(subst lib/vamsas-client.jar, /usr/share/jalview/vamsas-client.jar, $(DEB_CLASSPATH)) ___ 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] r15128 - trunk/batik/debian
Author: fourmond Date: 2011-09-29 19:43:19 + (Thu, 29 Sep 2011) New Revision: 15128 Modified: trunk/batik/debian/changelog trunk/batik/debian/control trunk/batik/debian/rules Log: [batik] Fix FTBS with recent openjdk Modified: trunk/batik/debian/changelog === --- trunk/batik/debian/changelog2011-09-29 19:42:48 UTC (rev 15127) +++ trunk/batik/debian/changelog2011-09-29 19:43:19 UTC (rev 15128) @@ -1,3 +1,10 @@ +batik (1.7-8) unstable; urgency=low + + * Fix FTBS with recent openjdk (closes: #643508) + * Bump to newer standards version, no changes required + + -- Vincent Fourmond fourm...@debian.org Thu, 29 Sep 2011 21:35:31 +0200 + batik (1.7-7) unstable; urgency=low * Re-enable all patches that had mistakenly been disabled by switching to Modified: trunk/batik/debian/control === --- trunk/batik/debian/control 2011-09-29 19:42:48 UTC (rev 15127) +++ trunk/batik/debian/control 2011-09-29 19:43:19 UTC (rev 15128) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org Uploaders: Wolfgang Baer wb...@gmx.de, Michael Koch konque...@gmx.de, Vincent Fourmond fourm...@debian.org, Onkar Shinde onkarshi...@ubuntu.com -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Build-Depends: debhelper (= 5.0), cdbs Build-Depends-Indep: openjdk-6-jdk | sun-java5-jdk | sun-java6-jdk, ant, libbsf-java, libxalan2-java, rhino, libavalon-framework-java (= 4.2.0), Modified: trunk/batik/debian/rules === --- trunk/batik/debian/rules2011-09-29 19:42:48 UTC (rev 15127) +++ trunk/batik/debian/rules2011-09-29 19:43:19 UTC (rev 15128) @@ -9,7 +9,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk \ +arch = $(shell dpkg-architecture -qDEB_HOST_ARCH) + +JAVA_HOME_DIRS := /usr/lib/jvm/java-7-openjdk-$(arch) \ + /usr/lib/jvm/java-6-openjdk-$(arch) /usr/lib/jvm/java-6-openjdk \ /usr/lib/jvm/java-1.5.0-sun /usr/lib/jvm/java-6-sun ANT_HOME := /usr/share/ant DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar bfs \ ___ 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] r15129 - in tags/batik: . 1.7-8/debian
Author: fourmond
Date: 2011-09-29 19:44:03 + (Thu, 29 Sep 2011)
New Revision: 15129
Added:
tags/batik/1.7-8/
tags/batik/1.7-8/debian/changelog
tags/batik/1.7-8/debian/control
tags/batik/1.7-8/debian/rules
Removed:
tags/batik/1.7-8/debian/changelog
tags/batik/1.7-8/debian/control
tags/batik/1.7-8/debian/rules
Log:
[svn-buildpackage] Tagging batik 1.7-8
Deleted: tags/batik/1.7-8/debian/changelog
===
--- trunk/batik/debian/changelog2011-06-06 09:16:58 UTC (rev 13758)
+++ tags/batik/1.7-8/debian/changelog 2011-09-29 19:44:03 UTC (rev 15129)
@@ -1,239 +0,0 @@
-batik (1.7-7) unstable; urgency=low
-
- * Re-enable all patches that had mistakenly been disabled by switching to
-source format 3.0 (quilt) (closes: #604871)
- * Already conforms to standards 3.9.1
-
- -- Vincent Fourmond fourm...@debian.org Thu, 25 Nov 2010 16:24:33 +0100
-
-batik (1.7-6) unstable; urgency=low
-
- [ Vincent Fourmond ]
- * Really fix the dependency on java runtime to only pull headless
-runtimes
-
- [ Gabriele Giacone ]
- * Added Maven support
- * Standards-Version to 3.8.4
- * Source format 3.0 (quilt)
-
- -- Gabriele Giacone 1o5g4...@gmail.com Sun, 21 Feb 2010 19:02:10 +0100
-
-batik (1.7-5) unstable; urgency=low
-
- * Dropped the dependency on openjdk-6-jre, in profit for
-openjdk-6-jre-headless, so we won't pull the whole Gtk libraries just
-for using fop (closes: #551545).
- * Already conforms to standards 3.8.3
- * Removing Arnaud Vandyck from Uploaders as he did retire. Many thanks
-for your work on batik !
-
- -- Vincent Fourmond fourm...@debian.org Mon, 25 Jan 2010 21:58:59 +0100
-
-batik (1.7-4) unstable; urgency=low
-
- * Porting fixes from Ubuntu (1.7.dfsg-0ubuntu3) by Onkar Shinde
-onkarshi...@ubuntu.com:
-- add xml-apis-ext and js to classpath for debian/wrappers/squiggle
-- promote rhino to a Recommends, as squiggle depends on it
-- debian/patches/06_fix_paths_in_policy_files.patch to fix the paths
- of the security policy files
- * This finally makes squiggle work for Debian ! (closes: #499852)
-Many thanks again to Onkar...
-
- -- Vincent Fourmond fourm...@debian.org Mon, 20 Apr 2009 21:22:26 +0200
-
-batik (1.7-3) unstable; urgency=low
-
- [ Onkar Shinde ]
- * debian/rules
-- Use DEB_UPSTREAM_VERSION at all places.
-- Add symlinks batik-version.jar and batik.jar pointing to
- batik-all-version.jar. (Closes: #522340)
- * debian/control
-- Add myself to 'Uploaders'.
-
- [ Vincent Fourmond ]
- * Changed section to java, what currently is in the archive
- * Already conforms to standard 3.8.1
- * Bumped debhelper compatibility level to 5, and bumped Build-depends
-accordingly
-
- -- Vincent Fourmond fourm...@debian.org Mon, 13 Apr 2009 20:42:00 +0200
-
-batik (1.7-2) unstable; urgency=low
-
- * Adding xmlgraphics-commons-1.2 and xml-apis-ext to the jars for
-the build + corresponding build-deps
- * Added Vcs-* fields
-
- [ Sylvestre Ledru ]
- * Build class version 49 (instead of 50)
-
- [ Vincent Fourmond ]
- * Minor updates to the debian/copyright file
- * It seems time has come for an upload to unstable...
- * Adding ${misc:Depends} for potential debhelper-induced dependencies
- * Tweaking rasterizer.1 to avoid unbreakable lines
-
- -- Vincent Fourmond fourm...@debian.org Wed, 18 Feb 2009 22:58:36 +0100
-
-batik (1.7-1) experimental; urgency=low
-
- * New upstream release (Closes: #417888, #490556)
- * Switched to using java-wrappers for executables; dropping the
-/usr/lib/java/wrappers.sh script
- * Switched debian/copyright to a machine-readable format
- * Added ANT_OPTS to fix the compiler out of memory problem
- * Removing 02_fix_jar_target, no longer applicable
- * Removing 01_build_xml, as the created target (pdf-transcoder) cannot
-be built anymore
- * Fixed JAVA_HOME_DIRS so it can build with Sun's java 5
- * Strip the full text of the Apache-2.0 license, as it now is
-in the common licenses
- * Switch to openjdk-6-jdk for building (closes: #397562)
- * Several tweaks in debian/rules to build and install all the jars,
-based on a patch by Sylvestre Ledru sylvestre.le...@inria.fr
- * Now depends also on libxml-commons-external-java for SVG parsing
- * Conforms to standards 3.8.0
- * Updated rasterizer.sh to work with libxml-commons-external-java
-and openjdk (closes: #490621)
- * Move wrapper scripts to debian/wrappers, updating debian/rules
-accordingly
- * Recommend fop for PDF output of rasterizer
- * Removed README.Debian-source: we don't add the fop sources anymore
-as those are already packaged in the fop debian package
- * Uploading to experimental, as there are potentially much too many
-disruptive changes to this package.
-
- -- Vincent Fourmond fourm...@debian.org Wed, 17 Sep 2008 20:14:33 +0200
-
-batik (1.6-4) unstable; urgency=low
-
- [ Mark
[pkg-java] r15130 - in tags/jsymphonic: . 0.3.0.Ode.To.Freedom+svn387-7/debian
Author: fourmond
Date: 2011-09-29 19:44:44 + (Thu, 29 Sep 2011)
New Revision: 15130
Added:
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-7/
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-7/debian/changelog
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-7/debian/rules
Removed:
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-7/debian/changelog
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-7/debian/rules
Log:
[svn-buildpackage] Tagging jsymphonic 0.3.0.Ode.To.Freedom+svn387-7
Deleted: tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-7/debian/changelog
===
--- trunk/jsymphonic/debian/changelog 2011-06-06 09:16:58 UTC (rev 13758)
+++ tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-7/debian/changelog
2011-09-29 19:44:44 UTC (rev 15130)
@@ -1,118 +0,0 @@
-jsymphonic (0.3.0.Ode.To.Freedom+svn387-6) unstable; urgency=low
-
- * Rebuild with newer javahelper to avoid /usr/share/java/jsymphonic.jar
-not being a symlink anymore.
-
- -- Vincent Fourmond fourm...@debian.org Sat, 04 Jun 2011 20:27:52 +0200
-
-jsymphonic (0.3.0.Ode.To.Freedom+svn387-5) unstable; urgency=low
-
- * Fix classpath tweaking due to change in javahelper behavior
-
- -- Vincent Fourmond fourm...@debian.org Wed, 11 May 2011 00:28:03 +0200
-
-jsymphonic (0.3.0.Ode.To.Freedom+svn387-4) unstable; urgency=low
-
- * Upload to unstable
- * Conforms to standards 3.9.2
-
- -- Vincent Fourmond fourm...@debian.org Wed, 11 May 2011 00:09:47 +0200
-
-jsymphonic (0.3.0.Ode.To.Freedom+svn387-3) experimental; urgency=low
-
- * Switching to javahelper
- * Using real classpath
- * Using automatic classpath expansion for the wrapper.
- * Already conforms to standards 3.9.1
-
- -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 21:48:59 +0200
-
-jsymphonic (0.3.0.Ode.To.Freedom+svn387-2) unstable; urgency=low
-
- * Upload to unstable
-
- -- Vincent Fourmond fourm...@debian.org Fri, 25 Jun 2010 00:30:30 +0200
-
-jsymphonic (0.3.0.Ode.To.Freedom+svn387-1) experimental; urgency=low
-
- * SVN snapshot based on the new upstream release
- * Update debian/build.xml to also ship included PNG files
- * Rewrote debian/patches/10-config-file.diff to take care of the new
-location for the configuration file.
-
- -- Vincent Fourmond fourm...@debian.org Thu, 11 Mar 2010 23:59:08 +0100
-
-jsymphonic (0.3.0beta+svn321-1) unstable; urgency=medium
-
- * New SVN snapshot (though not the most recent one), now getting rid of
-precompiled classes (closes: #572949)
- * Switching to source format 3.0 (quilt)
- * Updated watchfile to correctly detect newer versions (note that the
-newer version hasn't been packaged yet)
- * Urgency medium to fix RC bug in testing
- * Updated the debian/get-orig-svn to be more verbose about what it
-removes and to remove precompiled .class files
- * Conforms to standards 3.8.4
- * Dropping build-depends on dpatch, now useless
- * Dropping debian/README.source, now useless too
-
- -- Vincent Fourmond fourm...@debian.org Mon, 08 Mar 2010 21:44:53 +0100
-
-jsymphonic (0.3.0beta+svn320-1) unstable; urgency=low
-
- * New upstream SVN snapshot
- * Refresh 10-config-file
- * Add 20-fix-isocountry to fix a compilation problem
- * Now depends on libswing-layout-java:
-- updated debian/{control,rules} and debian/wrappers/jsymphonic
- * Wrote a desktop file (I guess it addresses LP: #386783)
- * Added a debian/README.source file
- * Now conforms to standards 3.8.3
- * Forcing the build to proceed with encoding UTF-8
-
- -- Vincent Fourmond fourm...@debian.org Sun, 11 Oct 2009 02:37:25 +0200
-
-jsymphonic (0.3.0alpha1+svn268-1) unstable; urgency=low
-
- * Pulling in new upstream SVN revision
- * Uploading to unstable now that lenny is out.
- * Suggests pmount, as this could come in quite handy to mount the
-player.
- * Recommends ffmpeg, as it can be used by jsymphonic to recode on the
-fly songs that are not in the right format. (although admittedly,
-you're probably more interested in the package by Christian Marillat,
-for MP3 support).
- * Added an icon, based on vignette.png from the archive.
-
- -- Vincent Fourmond fourm...@debian.org Sat, 07 Mar 2009 23:19:54 +0100
-
-jsymphonic (0.3.0alpha1+svn252-1) experimental; urgency=low
-
- * Adapted debian/get-svn-source to the newer SVN structure
- * Switching to a SVN export, as the -sources.zip file is not complete.
- * Updated debian/build.xml to copy resources.
- * debian/patches/10-config-file.dpatch to put config and log files as
-hidden files in $HOME
-
- -- Vincent Fourmond fourm...@debian.org Thu, 29 Jan 2009 20:21:02 +0100
-
-jsymphonic (0.3.0alpha1-1) experimental; urgency=low
-
- * New upstream release
- * Wrote a decent watchfile, and a small new-upstream script to repackage
-and rearrange the zip file.
- * Wrote from scratch a debian/build.xml, as the build system is not
-provided in the source zip file
- * Wrote a (rather
[pkg-java] r15137 - in trunk/jalview/debian: . patches wrappers
Author: fourmond
Date: 2011-09-29 21:31:49 + (Thu, 29 Sep 2011)
New Revision: 15137
Added:
trunk/jalview/debian/jalview.install
trunk/jalview/debian/jalview.jlibs
trunk/jalview/debian/patches/mutilate-build-system.diff
trunk/jalview/debian/patches/series
Removed:
trunk/jalview/debian/javabuild
Modified:
trunk/jalview/debian/control
trunk/jalview/debian/rules
trunk/jalview/debian/wrappers/jalview
Log:
[jalview] Switch to the original build system - now building and working fine
(but still with a binary-only jar, vamsas-client)
Modified: trunk/jalview/debian/control
===
--- trunk/jalview/debian/control2011-09-29 20:39:05 UTC (rev 15136)
+++ trunk/jalview/debian/control2011-09-29 21:31:49 UTC (rev 15137)
@@ -7,7 +7,7 @@
libaxis-java, libwsdl4j-java, libgnujaf-java,
libgnumail-java, liblog4j1.2-java, javahelp2,
libcommons-discovery-java, libcommons-logging-java,
- libstevesoft-regex-java, libjmol-java (= 12.1.42),
+ libjmol-java (= 12.1.42),
libcastor-xml-java,
libjaba-client-java, libaxis-java,
jmol-applet (= 12.1.42),
@@ -17,7 +17,6 @@
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/jalview
-
Package: jalview
Architecture: all
Depends: ${misc:Depends}, openjdk-6-jre | cacao-oj6-jre | java6-runtime,
Added: trunk/jalview/debian/jalview.install
===
--- trunk/jalview/debian/jalview.install(rev 0)
+++ trunk/jalview/debian/jalview.install2011-09-29 21:31:49 UTC (rev
15137)
@@ -0,0 +1,2 @@
+lib/vamsas-client.jar usr/share/jalview
+debian/wrappers/jalview usr/bin
\ No newline at end of file
Added: trunk/jalview/debian/jalview.jlibs
===
--- trunk/jalview/debian/jalview.jlibs (rev 0)
+++ trunk/jalview/debian/jalview.jlibs 2011-09-29 21:31:49 UTC (rev 15137)
@@ -0,0 +1 @@
+dist/jalview.jar
Deleted: trunk/jalview/debian/javabuild
===
--- trunk/jalview/debian/javabuild 2011-09-29 20:39:05 UTC (rev 15136)
+++ trunk/jalview/debian/javabuild 2011-09-29 21:31:49 UTC (rev 15137)
@@ -1 +0,0 @@
-jalview.jar src
Added: trunk/jalview/debian/patches/mutilate-build-system.diff
===
--- trunk/jalview/debian/patches/mutilate-build-system.diff
(rev 0)
+++ trunk/jalview/debian/patches/mutilate-build-system.diff 2011-09-29
21:31:49 UTC (rev 15137)
@@ -0,0 +1,38 @@
+Index: jalview-2.6.1.dfsg/build.xml
+===
+--- jalview-2.6.1.dfsg.orig/build.xml 2010-11-12 17:33:17.0 +0100
jalview-2.6.1.dfsg/build.xml 2011-09-29 22:47:54.117759830 +0200
+@@ -18,13 +18,6 @@
+ --
+ project name=jalviewX default=usage basedir=.
+ !-- we use jalopy to format our sources --
+- taskdef name=jalopy
classname=de.hunsicker.jalopy.plugin.ant.AntPlugin
+- classpath
+- fileset dir=utils/jalopy/lib
+- include name=*.jar /
+- /fileset
+- /classpath
+- /taskdef
+
+ target name=help depends=usage /
+ target name=usage
+@@ -114,10 +107,6 @@
+ property name=wsdl.ClientNS value=ext.vamsas /
+ !-- the class path for building the application --
+ path id=build.classpath
+- fileset dir=utils
+- include name=*.jar /
+- include name=**/*.jar /
+- /fileset
+ fileset dir=${libDir}
+ include name=*.jar /
+ include name=**/*.jar /
+@@ -397,7 +386,7 @@
+ /axis-wsdl2java
+ /target
+
+- target name=makedist depends=build, buildPropertiesFile,
buildindices
++ target name=makedist depends=build, buildindices
+ !-- make the package jar if not already existing --
+ mkdir dir=${packageDir} /
+ !-- clean dir if it already existed --
Added: trunk/jalview/debian/patches/series
===
--- trunk/jalview/debian/patches/series (rev 0)
+++ trunk/jalview/debian/patches/series 2011-09-29 21:31:49 UTC (rev 15137)
@@ -0,0 +1 @@
+mutilate-build-system.diff
Modified: trunk/jalview/debian/rules
===
--- trunk/jalview/debian/rules 2011-09-29 20:39:05 UTC (rev 15136)
+++ trunk/jalview/debian/rules
[pkg-java] r15138 - in trunk/jalview/debian: . manpages wrappers
Author: fourmond Date: 2011-09-29 23:07:55 + (Thu, 29 Sep 2011) New Revision: 15138 Added: trunk/jalview/debian/jalview.manpages trunk/jalview/debian/jalview.menu trunk/jalview/debian/manpages/ trunk/jalview/debian/manpages/jalview.1 Removed: trunk/jalview/debian/README.Debian trunk/jalview/debian/menu.ex Modified: trunk/jalview/debian/changelog trunk/jalview/debian/control trunk/jalview/debian/copyright trunk/jalview/debian/rules trunk/jalview/debian/wrappers/jalview Log: [jalview] Make the package presentable -- and almost ready for upload ! Deleted: trunk/jalview/debian/README.Debian === --- trunk/jalview/debian/README.Debian 2011-09-29 21:31:49 UTC (rev 15137) +++ trunk/jalview/debian/README.Debian 2011-09-29 23:07:55 UTC (rev 15138) @@ -1,6 +0,0 @@ -jalview for Debian --- - -possible notes regarding this package - if none, delete this file - - -- Vincent Fourmond fourm...@debian.org Thu, 15 Jan 2009 23:12:16 +0100 Modified: trunk/jalview/debian/changelog === --- trunk/jalview/debian/changelog 2011-09-29 21:31:49 UTC (rev 15137) +++ trunk/jalview/debian/changelog 2011-09-29 23:07:55 UTC (rev 15138) @@ -1,8 +1,9 @@ -jalview (2.6.1.dfsg-1) unstable; urgency=low +jalview (2.6.1.dfsg~almost-1) unstable; urgency=low * Initial release (Closes: #507436) * Adding a debian/new-upstream script to repackage the original tarball, getting rid of the bundled JAR file (I love JAR files) +(well, almost, which is why this goes in non-free for now) * Using dh 7 and javahelper * Using jh_build for building Modified: trunk/jalview/debian/control === --- trunk/jalview/debian/control2011-09-29 21:31:49 UTC (rev 15137) +++ trunk/jalview/debian/control2011-09-29 23:07:55 UTC (rev 15138) @@ -1,5 +1,5 @@ Source: jalview -Section: science +Section: non-free/science Priority: optional Maintainer: Vincent Fourmond fourm...@debian.org Build-Depends: cdbs, debhelper (= 7), default-jdk, @@ -27,5 +27,5 @@ alignement produced by programs implementing alignment algorithms such as clustalw, kalign and t-coffee. . - It has lots of features, and can be considered a decent BioEdit - replacement for Debian systems. + It has lots of features, and will compare advantageously to BioEdit, + while being free as in free speech ! Modified: trunk/jalview/debian/copyright === --- trunk/jalview/debian/copyright 2011-09-29 21:31:49 UTC (rev 15137) +++ trunk/jalview/debian/copyright 2011-09-29 23:07:55 UTC (rev 15138) @@ -1,52 +1,66 @@ -This package was debianized by: +Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174 +Upstream-Name: freecol +Upstream-Contact: jalview-disc...@jalview.org +Source: + The original tarball was made downloading the jalview-*.tar.gz + tarball on http://www.jalview.org/versions.html, and stripping most + of the binary-only jars excepted lib/vamsas-client.jar. + . + For more details, see the debian/new-upstream script that does precisely + this. +Disclaimer: + The tarball contains a sourceless binary jar, + lib/vamsas-client.jar. Though the distribution and use of this file + is allowed by its copyright holders, the absence of source prevents + it from being integrated into Debian main. -Vincent Fourmond fourm...@debian.org on Thu, 15 Jan 2009 23:12:16 +0100 +Files: * +Copyright: Copyright 2007-2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle +License: GPL-3+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of the GNU General Public + License version 3 can be found in `/usr/share/common-licenses/GPL-3'. -It was downloaded from: -url://example.com +Files: debian/* +Copyright: Copyright (C) 2009-2011 Vincent Fourmond fourm...@debian.org +License: GPL-3+ + (see above) -Upstream Author(s): +Files: lib/vamsas-client.jar +Copyright: +License: ... -put author's name and email here -likewise for another author - -Copyright: - -Copyright (C) Firtname Lastname
[pkg-java] r14900 - in trunk/java-wrappers: . debian
Author: fourmond Date: 2011-09-14 16:24:29 + (Wed, 14 Sep 2011) New Revision: 14900 Modified: trunk/java-wrappers/debian/changelog trunk/java-wrappers/jvm-list.sh Log: [java-wrappers] (almost) fix the new arch-dependent dirs for openjdk Modified: trunk/java-wrappers/debian/changelog === --- trunk/java-wrappers/debian/changelog2011-09-13 23:03:54 UTC (rev 14899) +++ trunk/java-wrappers/debian/changelog2011-09-14 16:24:29 UTC (rev 14900) @@ -1,3 +1,11 @@ +java-wrappers (0.1.23) unstable; urgency=medium + + * Correctly find the now architecture-dependent openjdk6 flavor (closes: +#640813) + * Urgency medium to avoid breaking applications in testing when openjdk6 migrates + + -- Vincent Fourmond fourm...@debian.org Fri, 09 Sep 2011 22:56:25 +0200 + java-wrappers (0.1.22) unstable; urgency=low * Now correctly following relative links from classpaths. Modified: trunk/java-wrappers/jvm-list.sh === --- trunk/java-wrappers/jvm-list.sh 2011-09-13 23:03:54 UTC (rev 14899) +++ trunk/java-wrappers/jvm-list.sh 2011-09-14 16:24:29 UTC (rev 14900) @@ -22,6 +22,8 @@ # They can also be used for the JAVA_FLAVOR environment variable, see # java-wrappers(7). +__arch=$(dpkg-architecture -qDEB_HOST_ARCH) + # default runtime __jvm_default=/usr/lib/jvm/default-java @@ -36,8 +38,9 @@ # Now, free runtimes: __jvm_gcj2=/usr/lib/jvm/java-*-gcj-4.* __jvm_gcj5=/usr/lib/jvm/java-1.5*-gcj-4.* -__jvm_openjdk6=/usr/lib/jvm/java-6-openjdk +__jvm_openjdk6=/usr/lib/jvm/java-6-openjdk-$__arch /usr/lib/jvm/java-6-openjdk + # And a few aliases __jvm_gcj=$__jvm_gcj2 __jvm_openjdk=$__jvm_openjdk6 ___ 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] r14901 - in trunk/java-wrappers: . debian
Author: fourmond Date: 2011-09-14 16:31:55 + (Wed, 14 Sep 2011) New Revision: 14901 Modified: trunk/java-wrappers/debian/changelog trunk/java-wrappers/jvm-list.sh Log: [java-wrappers] Really fix the architecture dependence of openjdk-6 + take openjdk7 into account as well Modified: trunk/java-wrappers/debian/changelog === --- trunk/java-wrappers/debian/changelog2011-09-14 16:24:29 UTC (rev 14900) +++ trunk/java-wrappers/debian/changelog2011-09-14 16:31:55 UTC (rev 14901) @@ -1,3 +1,11 @@ +java-wrappers (0.1.24) unstable; urgency=low + + * Drop the use of dpkg-architecture in favor of dpkg (closes: #641499) + * Take into account openjdk-7, patch courtesy of Adrian Bunk +b...@stusta.de (closes: #641420) + + -- Vincent Fourmond fourm...@debian.org Wed, 14 Sep 2011 18:28:00 +0200 + java-wrappers (0.1.23) unstable; urgency=medium * Correctly find the now architecture-dependent openjdk6 flavor (closes: Modified: trunk/java-wrappers/jvm-list.sh === --- trunk/java-wrappers/jvm-list.sh 2011-09-14 16:24:29 UTC (rev 14900) +++ trunk/java-wrappers/jvm-list.sh 2011-09-14 16:31:55 UTC (rev 14901) @@ -22,7 +22,7 @@ # They can also be used for the JAVA_FLAVOR environment variable, see # java-wrappers(7). -__arch=$(dpkg-architecture -qDEB_HOST_ARCH) +__arch=$(dpkg --print-architecture) # default runtime __jvm_default=/usr/lib/jvm/default-java @@ -39,15 +39,17 @@ __jvm_gcj2=/usr/lib/jvm/java-*-gcj-4.* __jvm_gcj5=/usr/lib/jvm/java-1.5*-gcj-4.* __jvm_openjdk6=/usr/lib/jvm/java-6-openjdk-$__arch /usr/lib/jvm/java-6-openjdk +__jvm_openjdk7=/usr/lib/jvm/java-7-openjdk-$__arch /usr/lib/jvm/java-7-openjdk # And a few aliases __jvm_gcj=$__jvm_gcj2 -__jvm_openjdk=$__jvm_openjdk6 +__jvm_openjdk=$__jvm_openjdk7 $__jvm_openjdk6 # The java* runtimes: +__jvm_java7=$__jvm_openjdk7 # - corresponds to Provides: java6-runtime -__jvm_java6=$__jvm_openjdk6 $__jvm_sun6 +__jvm_java6=$__jvm_openjdk6 $__jvm_sun6 $__jvm_java7 # - corresponds to Provides: java5-runtime __jvm_java5=$__jvm_gcj5 $__jvm_java6 # - corresponds to Provides: java2-runtime ___ 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] r14902 - in tags/java-wrappers: . 0.1.24 0.1.24/debian
Author: fourmond
Date: 2011-09-14 16:32:42 + (Wed, 14 Sep 2011)
New Revision: 14902
Added:
tags/java-wrappers/0.1.24/
tags/java-wrappers/0.1.24/debian/changelog
tags/java-wrappers/0.1.24/jvm-list.sh
Removed:
tags/java-wrappers/0.1.24/debian/changelog
tags/java-wrappers/0.1.24/jvm-list.sh
Log:
[svn-buildpackage] Tagging java-wrappers 0.1.24
Deleted: tags/java-wrappers/0.1.24/debian/changelog
===
--- trunk/java-wrappers/debian/changelog2011-06-06 09:16:58 UTC (rev
13758)
+++ tags/java-wrappers/0.1.24/debian/changelog 2011-09-14 16:32:42 UTC (rev
14902)
@@ -1,173 +0,0 @@
-java-wrappers (0.1.22) unstable; urgency=low
-
- * Now correctly following relative links from classpaths.
- * Fix a final glitch, ready for upload to unstable
-
- -- Vincent Fourmond fourm...@debian.org Wed, 06 Apr 2011 10:33:57 +0200
-
-java-wrappers (0.1.21) experimental; urgency=low
-
- * Final form of the find_jar_classpath function that now only performs
-path expansion for the argument, but not for the elements found in the
-manifests that should be full paths anyway (closes: #563197)
- * Trim down significantly the number of JVMs available, as fortunately
-the dozens-of-jvms dark age is long gone (closes: #612903)
- * Make it sure that mistakes such as find_java_runtime default-jre won't
-go unnoticed.
-
- -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 21:08:31 +0200
-
-java-wrappers (0.1.20) experimental; urgency=low
-
- * Adding unzip as we need it to get the classpath correctly...
- * Switch to dh 7
-
- -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 09:44:15 +0200
-
-java-wrappers (0.1.19) experimental; urgency=low
-
- * First draft of a recursive classpath resolution function.
-
- -- Vincent Fourmond fourm...@debian.org Sun, 03 Apr 2011 01:38:16 +0200
-
-java-wrappers (0.1.18) unstable; urgency=low
-
- * The let's break Java applications in Wheezy ! upload, or, in other
-words, upload to unstable
- * Switching to format 3.0 (native)
-
- -- Vincent Fourmond fourm...@debian.org Fri, 11 Feb 2011 13:35:24 +0100
-
-java-wrappers (0.1.17) experimental; urgency=low
-
- [ Gabriele Giacone ]
- * First step toward java-alternatives integration
-
- [ Vincent Fourmond ]
- * Final step (closes: #609731); thanks Gabriele for the first ;-)...
- * Conforms to standards 3.9.1
-
- -- Vincent Fourmond fourm...@debian.org Thu, 13 Jan 2011 23:01:43 +0100
-
-java-wrappers (0.1.16) unstable; urgency=low
-
- * Adding default as a valid jre choice, and make it the default for
-'all'; patch courtesy of Torsten Werner twer...@debian.org
-(closes: #580180)
- * Slightly arrange the documentation, which addresses to some extent bug
-#578944, but probably not satisfyingly enough.
- * Conforms to 3.8.4
- * Adding ${misc:Depends} for potential dh-induced dependencies
-
- -- Vincent Fourmond fourm...@debian.org Tue, 04 May 2010 23:42:54 +0200
-
-java-wrappers (0.1.15) unstable; urgency=low
-
- * Switch to Section java
-
- -- Vincent Fourmond fourm...@debian.org Wed, 29 Apr 2009 20:04:02 +0200
-
-java-wrappers (0.1.14) unstable; urgency=low
-
- * Fix absolute path in locate_jar (closes: #526087). Thanks to Paul
-Millar paul.mil...@desy.de for spotting and for the patch.
- * Conforms to 3.8.1
-
- -- Vincent Fourmond fourm...@debian.org Wed, 29 Apr 2009 19:13:40 +0200
-
-java-wrappers (0.1.13) unstable; urgency=low
-
- * Now that lenny is out, it's time to an upload to unstable !
-
- -- Vincent Fourmond fourm...@debian.org Sun, 15 Feb 2009 15:41:01 +0100
-
-java-wrappers (0.1.12) experimental; urgency=low
-
- * Now provides java2, java5 and java6 aliases that correspond respectively
-to the java2-runtime, java5-runtime and java6-runtime virtual packages
-(closes: #514339)
-
- -- Vincent Fourmond fourm...@debian.org Sun, 08 Feb 2009 16:38:13 +0100
-
-java-wrappers (0.1.11) experimental; urgency=low
-
- * Adding (back) the sunmin5 alias for jabref
-
- -- Vincent Fourmond fourm...@debian.org Sat, 22 Nov 2008 14:13:19 +0100
-
-java-wrappers (0.1.10) experimental; urgency=low
-
- * Added Vcs-* fields
- * Adding cacaooj6 runtime + adding it to the openjdk alias. (closes: #503819)
-
- -- Vincent Fourmond fourm...@debian.org Sun, 16 Nov 2008 03:17:33 +0100
-
-java-wrappers (0.1.9) experimental; urgency=low
-
- * Added a 'all' alias, and make find_java_runtime take no arguments
-as all
-
- -- Vincent Fourmond fourm...@debian.org Mon, 22 Sep 2008 23:57:26 +0200
-
-java-wrappers (0.1.8) experimental; urgency=low
-
- * The 'oops, I missed a syntax error release' - fix a missing
-fi in java-wrappers.sh
- * Fixed a few other syntax errors
-
- -- Vincent Fourmond fourm...@debian.org Tue, 16 Sep 2008 00:04:37 +0200
-
-java-wrappers (0.1.7) experimental; urgency=low
-
- * Rewrite of find_java_runtime in a much more flexible fashion...
-(closes: #494744
Bug#640813: java-wrappers: find_java_runtime function is broken for openjdk
severity 640813 serious thanks On Wed, Sep 7, 2011 at 5:16 PM, Miguel Landaeta mig...@miguel.cc wrote: ii openjdk-6-jre 6b23~pre9-1 OpenJDK Java runtime, using Hotspot JIT miguel@alice:~$ java -version java version 1.6.0_23 OpenJDK Runtime Environment (IcedTea6 1.11pre) (6b23~pre9-1) OpenJDK 64-Bit Server VM (build 20.0-b11, mixed mode) miguel@alice:~$ . /usr/lib/java-wrappers/java-wrappers.sh miguel@alice:~$ find_java_runtime openjdk [warning] -bash: No java runtime was found miguel@alice:~$ Hmmm. Recent openjdk ships files in an arch-based directory now (/usr/lib/jvm/java-6-openjdk-amd64), which is the cause of this problem. I'll fix that tomorrow, I don't have my development environment for now. Cheers, Vincent __ 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] r13757 - trunk/jmagick/debian
Author: fourmond
Date: 2011-06-06 09:16:22 + (Mon, 06 Jun 2011)
New Revision: 13757
Modified:
trunk/jmagick/debian/changelog
trunk/jmagick/debian/control
Log:
[jmagick] Adapt BD to newer imagemagick package layout + fix various details
Modified: trunk/jmagick/debian/changelog
===
--- trunk/jmagick/debian/changelog 2011-06-05 13:15:20 UTC (rev 13756)
+++ trunk/jmagick/debian/changelog 2011-06-06 09:16:22 UTC (rev 13757)
@@ -1,4 +1,4 @@
-jmagick (6.2.6-0-8) UNRELEASED; urgency=low
+jmagick (6.2.6-0-8) unstable; urgency=low
[ Niels Thykier ]
* Team upload.
@@ -9,11 +9,15 @@
[ Kumar Appaiah ]
* Remove myself from Uploaders.
- -- Kumar Appaiah aku...@debian.org Fri, 01 Apr 2011 00:20:30 -0500
+ [ Vincent Fourmond ]
+ * Adapt build-depends to newer imagemagick (closes: #625595)
+ * Packages now also conforms to standards 3.9.2
+ * Remove articles at the beginning of the short description
+ -- Vincent Fourmond fourm...@debian.org Mon, 06 Jun 2011 11:12:36 +0200
+
jmagick (6.2.6-0-7) unstable; urgency=low
- UNRELEASED
* Change maintainers into Maintainers.
-- Torsten Werner twer...@debian.org Sun, 11 Apr 2010 21:46:53 +0200
Modified: trunk/jmagick/debian/control
===
--- trunk/jmagick/debian/control2011-06-05 13:15:20 UTC (rev 13756)
+++ trunk/jmagick/debian/control2011-06-06 09:16:22 UTC (rev 13757)
@@ -1,10 +1,11 @@
Source: jmagick
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Varun Hiremath va...@debian.org Michael Koch konque...@gmx.de
+Uploaders: Varun Hiremath va...@debian.org, Michael Koch konque...@gmx.de
Section: graphics
Priority: optional
-Standards-Version: 3.9.1
-Build-Depends: debhelper (= 7), cdbs, default-jdk, libmagick9-dev,
autotools-dev, chrpath
+Standards-Version: 3.9.2
+Build-Depends: debhelper (= 7), cdbs, default-jdk,
+ libmagickcore-dev, autotools-dev, chrpath
Homepage: http://www.yeo.id.au/jmagick/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jmagick
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jmagick
@@ -14,7 +15,7 @@
Section: java
Depends: ${misc:Depends}, libjmagick6-jni (= ${source:Version})
Provides: jmagick
-Description: A java interface to ImageMagick - java classes
+Description: java interface to ImageMagick - java classes
JMagick is an open source Java interface of ImageMagick. It is
implemented in the form of Java Native Interface (JNI) into the
ImageMagick API.
@@ -32,7 +33,7 @@
Architecture: all
Provides: jmagick-docs
Depends: ${misc:Depends}
-Description: A java interface to ImageMagick - api documentation
+Description: java interface to ImageMagick - api documentation
JMagick is an open source Java interface of ImageMagick. It is
implemented in the form of Java Native Interface (JNI) into the
ImageMagick API.
@@ -50,7 +51,7 @@
Package: libjmagick6-jni
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A java interface to ImageMagick - native library
+Description: java interface to ImageMagick - native library
JMagick is an open source Java interface of ImageMagick. It is
implemented in the form of Java Native Interface (JNI) into the
ImageMagick API.
___
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] r13758 - in tags/jmagick: . 6.2.6-0-8/debian
to 3.9.1 - no changes required.
+
+ [ Kumar Appaiah ]
+ * Remove myself from Uploaders.
+
+ [ Vincent Fourmond ]
+ * Adapt build-depends to newer imagemagick (closes: #625595)
+ * Packages now also conforms to standards 3.9.2
+ * Remove articles at the beginning of the short description
+
+ -- Vincent Fourmond fourm...@debian.org Mon, 06 Jun 2011 11:12:36 +0200
+
+jmagick (6.2.6-0-7) unstable; urgency=low
+
+ * Change maintainers into Maintainers.
+
+ -- Torsten Werner twer...@debian.org Sun, 11 Apr 2010 21:46:53 +0200
+
+jmagick (6.2.6-0-6) unstable; urgency=low
+
+ * Bump Standards-Version to 3.8.4
+ * Depend on default-jre-headless | java2-runtime-headless (Closes: #573381)
+
+ -- Varun Hiremath va...@debian.org Sat, 10 Apr 2010 17:29:09 -0400
+
+jmagick (6.2.6-0-5) unstable; urgency=low
+
+ [ Michael Koch ]
+ * Fixed watch file to point to correct download location
+(Closes: #551207).
+ * Adjusted debian/orig-tar.sh for new upstream layout.
+ * Build-Depends on debhelper = 7.
+ * Added myself to Uploaders.
+ * Updated Standards-Version to 3.8.3.
+
+ [ Varun Hiremath ]
+ * Switch to source format 3.0
+
+ -- Varun Hiremath va...@debian.org Sun, 24 Jan 2010 17:45:10 -0500
+
+jmagick (6.2.6-0-4) unstable; urgency=medium
+
+ * debian/control:
++ Use default-java-jdk in place of java-gcj-compat-dev.
+ * debian/rules:
++ Switch JAVA_HOME location to /usr/lib/jvm/default-java.
+
+ -- Kumar Appaiah aku...@debian.org Sun, 27 Apr 2008 17:53:03 +0530
+
+jmagick (6.2.6-0-2) unstable; urgency=medium
+
+ * debian/control:
++ Add Vcs-Browser and Vcs-Svn fields.
++ Use debian.org e-mail address for maintainers.
++ Use quilt for patches.
++ Standards Version is now 3.7.3 (no changes needed).
+ * debian/rules:
++ Explicitly call gcc in order for the build system
+ to find the C compiler and build libJMagick.so.
+ (Closes: #477015)
+
+ -- Kumar Appaiah aku...@debian.org Mon, 21 Apr 2008 06:46:12 +0530
+
+jmagick (6.2.6-0-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control:
++ Now binNMU safe (Closes: #437486).
++ The Debian Java maintainers adopt the package,
+ taken over from Adam Heath (Closes: #429794).
++ Add Varun Hiremath and Kumar Appaiah as uploaders.
++ Add Homepage field.
++ Updated to use GCJ to build (Closes: #329104, #349564).
++ Move jmagick6-docs to doc section.
+ * debian/rules:
++ Fully refactor to make it use cdbs.
+ * debian/patches/01_fix_load_jnilib.patch
++ Ensure that the JNI interface is loaded.
+ * debian/watch: Added.
+ * debian/orig-tar.sh, debian/orig-tar.exclude:
++ Repackage scripts to remove unclean upstream tarball.
+ * debian/README.Debian-source:
++ Explain why and how we are repackaging.
+ * debian/copyright: Total rewrite.
+ * debian/libjmagick6-java.examples:
++ Provide two test cases as examples.
+ * debian/examples/Makefile:
++ To build and run the examples.
+ * debian/README.Debian:
++ Directions on how to run the examples.
+
+ -- Kumar Appaiah aku...@ee.iitm.ac.in Tue, 16 Oct 2007 00:24:14 +0530
+
+jmagick (6.2.4-1-1) unstable; urgency=low
+
+ * New upstream version.
+ * Add kaffe-dev to Build-Depends. Closes: #329104.
+ * No longer use find to clean the dirs. Closes: #325411
+
+ -- Adam Heath doo...@brainfood.com Sun, 15 Jan 2006 23:30:17 -0600
+
+jmagick (6.0.4-0-2) unstable; urgency=low
+
+ * Fix problem when JMagick is not loaded thru the system classloader.
+
+ -- Adam Heath doo...@brainfood.com Wed, 17 Aug 2005 14:53:00 -0500
+
+jmagick (6.0.4-0-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Adam Heath doo...@brainfood.com Wed, 17 Aug 2005 14:27:52 -0500
+
Deleted: tags/jmagick/6.2.6-0-8/debian/control
===
--- trunk/jmagick/debian/control2011-06-05 13:15:20 UTC (rev 13756)
+++ tags/jmagick/6.2.6-0-8/debian/control 2011-06-06 09:16:58 UTC (rev
13758)
@@ -1,67 +0,0 @@
-Source: jmagick
-Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Varun Hiremath va...@debian.org Michael Koch konque...@gmx.de
-Section: graphics
-Priority: optional
-Standards-Version: 3.9.1
-Build-Depends: debhelper (= 7), cdbs, default-jdk, libmagick9-dev,
autotools-dev, chrpath
-Homepage: http://www.yeo.id.au/jmagick/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jmagick
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jmagick
-
-Package: libjmagick6-java
-Architecture: all
-Section: java
-Depends: ${misc:Depends}, libjmagick6-jni (= ${source:Version})
-Provides: jmagick
-Description: A java interface to ImageMagick - java classes
- JMagick is an open source Java interface of ImageMagick. It is
- implemented in the form of Java Native Interface (JNI) into the
- ImageMagick API.
- .
- JMagick does not attempt to make the ImageMagick API
- object-oriented. It is merely a thin interface layer
[pkg-java] r13759 - trunk/fop/debian
Author: fourmond Date: 2011-06-06 10:57:02 + (Mon, 06 Jun 2011) New Revision: 13759 Modified: trunk/fop/debian/changelog trunk/fop/debian/control trunk/fop/debian/rules Log: [fop] Small progresses, but it looks like we hit an incompatibility in the behaviour of libqdox-java Modified: trunk/fop/debian/changelog === --- trunk/fop/debian/changelog 2011-06-06 09:16:58 UTC (rev 13758) +++ trunk/fop/debian/changelog 2011-06-06 10:57:02 UTC (rev 13759) @@ -1,13 +1,19 @@ -fop (1:1.0.dfsg-1) unstable; urgency=low +fop (1:1.0.dfsg+cleaned-1) unstable; urgency=low - * Vincent Fourmond removed from uploaders. + [ Sylvestre Ledru ] * Upload to unstable * Dependency on libxp removed (Closes: #623639) * Standards-Version updated to version 3.9.2 * Description updated. Thanks to Ivan Shmakov (Closes: #604008) - -- Sylvestre Ledru sylves...@debian.org Sun, 08 May 2011 15:59:22 +0200 + [ Vincent Fourmond ] + * NativeTextHandler is now properly redefined (closes: #626069) + * Reupload with a tarball cleaned of upstream JAR files (closes: #625869) +- add a lib/build directory as dirty workaround for a missing dir +- add libqdox-java as build dependency + -- Vincent Fourmond fourm...@debian.org Mon, 06 Jun 2011 12:49:28 +0200 + fop (1:1.0.dfsg-3) experimental; urgency=low * Upload with the explicit dependency against xmlgraphics-commons on the fop Modified: trunk/fop/debian/control === --- trunk/fop/debian/control2011-06-06 09:16:58 UTC (rev 13758) +++ trunk/fop/debian/control2011-06-06 10:57:02 UTC (rev 13759) @@ -3,14 +3,18 @@ Priority: optional Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org DM-Upload-Allowed: yes -Uploaders: Michael Koch konque...@gmx.de, Sylvestre Ledru sylves...@debian.org, - Torsten Werner twer...@debian.org, Mathieu Malaterre mathieu.malate...@gmail.com +Uploaders: Michael Koch konque...@gmx.de, + Sylvestre Ledru sylves...@debian.org, + Torsten Werner twer...@debian.org, + Mathieu Malaterre mathieu.malate...@gmail.com, + Vincent Fourmond fourm...@debian.org Build-Depends: debhelper (= 5), cdbs (= 0.4.27) Build-Depends-Indep: ant-optional, libbatik-java (= 1.7), libavalon-framework-java (=4.1.2-2), libxalan2-java, libxerces2-java, default-jdk, libcommons-io-java, libcommons-logging-java, junit, libxmlgraphics-commons-java (= 1.4), - libservlet2.4-java, libxml-commons-external-java, maven-repo-helper + libservlet2.4-java, libxml-commons-external-java, maven-repo-helper, + libqdox-java Standards-Version: 3.9.2 Homepage: http://xmlgraphics.apache.org/fop/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/fop Modified: trunk/fop/debian/rules === --- trunk/fop/debian/rules 2011-06-06 09:16:58 UTC (rev 13758) +++ trunk/fop/debian/rules 2011-06-06 10:57:02 UTC (rev 13759) @@ -6,7 +6,7 @@ include /usr/share/cdbs/1/class/ant.mk JAVA_HOME:= /usr/lib/jvm/java-6-openjdk -DEB_JARS := $(ANT_HOME)/lib/ant-trax.jar batik-all xml-apis-ext batik-libs xml-apis avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-2.4 +DEB_JARS := $(ANT_HOME)/lib/ant-trax.jar batik-all xml-apis-ext batik-libs xml-apis avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-2.4 qdox DEB_ANT_BUILD_TARGET := package javadocs #docs DEB_ANT_CLEAN_TARGET := distclean DEB_ANT_ARGS := -verbose @@ -39,6 +39,7 @@ clean:: -rm -Rf build + mkdir -p lib/build get-orig-source: uscan --force-download --rename ___ 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#625869: Problems with repackaged fop
Hello all, I've attempted to rebuild fop with a stripped archive, and I managed to get a bit further, provided we add libqdox-java in the build depends and in the used jars. Unfortunately, bad luck strikes us here, since fop doesn't seem to work with qdox 1.12, and the build fails just after compilation. Can someone have a look ? Cheers, Vincent __ 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] r13743 - trunk/jsymphonic/debian
Author: fourmond Date: 2011-06-04 18:31:56 + (Sat, 04 Jun 2011) New Revision: 13743 Modified: trunk/jsymphonic/debian/changelog trunk/jsymphonic/debian/control Log: [jsymphonic] rebuild with newer javahelper Modified: trunk/jsymphonic/debian/changelog === --- trunk/jsymphonic/debian/changelog 2011-06-04 06:10:57 UTC (rev 13742) +++ trunk/jsymphonic/debian/changelog 2011-06-04 18:31:56 UTC (rev 13743) @@ -1,3 +1,10 @@ +jsymphonic (0.3.0.Ode.To.Freedom+svn387-6) unstable; urgency=low + + * Rebuild with newer javahelper to avoid /usr/share/java/jsymphonic.jar +not being a symlink anymore. + + -- Vincent Fourmond fourm...@debian.org Sat, 04 Jun 2011 20:27:52 +0200 + jsymphonic (0.3.0.Ode.To.Freedom+svn387-5) unstable; urgency=low * Fix classpath tweaking due to change in javahelper behavior Modified: trunk/jsymphonic/debian/control === --- trunk/jsymphonic/debian/control 2011-06-04 06:10:57 UTC (rev 13742) +++ trunk/jsymphonic/debian/control 2011-06-04 18:31:56 UTC (rev 13743) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org Uploaders: Vincent Fourmond fourm...@debian.org -Build-Depends: cdbs, debhelper (= 7), ant, javahelper (= 0.34) +Build-Depends: cdbs, debhelper (= 7), ant, javahelper (= 0.36) Build-Depends-Indep: openjdk-6-jdk, libswing-layout-java Standards-Version: 3.9.2 Homepage: http://sourceforge.net/projects/symphonic/ ___ 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] r13744 - in tags/jsymphonic: . 0.3.0.Ode.To.Freedom+svn387-6/debian
Author: fourmond
Date: 2011-06-04 18:41:24 + (Sat, 04 Jun 2011)
New Revision: 13744
Added:
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-6/
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-6/debian/changelog
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-6/debian/control
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-6/debian/jsymphonic.classpath
Removed:
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-6/debian/changelog
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-6/debian/control
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-6/debian/jsymphonic.classpath
Log:
[svn-buildpackage] Tagging jsymphonic 0.3.0.Ode.To.Freedom+svn387-6
Deleted: tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-6/debian/changelog
===
--- trunk/jsymphonic/debian/changelog 2011-05-10 22:02:23 UTC (rev 13676)
+++ tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-6/debian/changelog
2011-06-04 18:41:24 UTC (rev 13744)
@@ -1,98 +0,0 @@
-jsymphonic (0.3.0.Ode.To.Freedom+svn387-3) experimental; urgency=low
-
- * Switching to javahelper
- * Using real classpath
- * Using automatic classpath expansion for the wrapper.
- * Already conforms to standards 3.9.1
-
- -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 21:48:59 +0200
-
-jsymphonic (0.3.0.Ode.To.Freedom+svn387-2) unstable; urgency=low
-
- * Upload to unstable
-
- -- Vincent Fourmond fourm...@debian.org Fri, 25 Jun 2010 00:30:30 +0200
-
-jsymphonic (0.3.0.Ode.To.Freedom+svn387-1) experimental; urgency=low
-
- * SVN snapshot based on the new upstream release
- * Update debian/build.xml to also ship included PNG files
- * Rewrote debian/patches/10-config-file.diff to take care of the new
-location for the configuration file.
-
- -- Vincent Fourmond fourm...@debian.org Thu, 11 Mar 2010 23:59:08 +0100
-
-jsymphonic (0.3.0beta+svn321-1) unstable; urgency=medium
-
- * New SVN snapshot (though not the most recent one), now getting rid of
-precompiled classes (closes: #572949)
- * Switching to source format 3.0 (quilt)
- * Updated watchfile to correctly detect newer versions (note that the
-newer version hasn't been packaged yet)
- * Urgency medium to fix RC bug in testing
- * Updated the debian/get-orig-svn to be more verbose about what it
-removes and to remove precompiled .class files
- * Conforms to standards 3.8.4
- * Dropping build-depends on dpatch, now useless
- * Dropping debian/README.source, now useless too
-
- -- Vincent Fourmond fourm...@debian.org Mon, 08 Mar 2010 21:44:53 +0100
-
-jsymphonic (0.3.0beta+svn320-1) unstable; urgency=low
-
- * New upstream SVN snapshot
- * Refresh 10-config-file
- * Add 20-fix-isocountry to fix a compilation problem
- * Now depends on libswing-layout-java:
-- updated debian/{control,rules} and debian/wrappers/jsymphonic
- * Wrote a desktop file (I guess it addresses LP: #386783)
- * Added a debian/README.source file
- * Now conforms to standards 3.8.3
- * Forcing the build to proceed with encoding UTF-8
-
- -- Vincent Fourmond fourm...@debian.org Sun, 11 Oct 2009 02:37:25 +0200
-
-jsymphonic (0.3.0alpha1+svn268-1) unstable; urgency=low
-
- * Pulling in new upstream SVN revision
- * Uploading to unstable now that lenny is out.
- * Suggests pmount, as this could come in quite handy to mount the
-player.
- * Recommends ffmpeg, as it can be used by jsymphonic to recode on the
-fly songs that are not in the right format. (although admittedly,
-you're probably more interested in the package by Christian Marillat,
-for MP3 support).
- * Added an icon, based on vignette.png from the archive.
-
- -- Vincent Fourmond fourm...@debian.org Sat, 07 Mar 2009 23:19:54 +0100
-
-jsymphonic (0.3.0alpha1+svn252-1) experimental; urgency=low
-
- * Adapted debian/get-svn-source to the newer SVN structure
- * Switching to a SVN export, as the -sources.zip file is not complete.
- * Updated debian/build.xml to copy resources.
- * debian/patches/10-config-file.dpatch to put config and log files as
-hidden files in $HOME
-
- -- Vincent Fourmond fourm...@debian.org Thu, 29 Jan 2009 20:21:02 +0100
-
-jsymphonic (0.3.0alpha1-1) experimental; urgency=low
-
- * New upstream release
- * Wrote a decent watchfile, and a small new-upstream script to repackage
-and rearrange the zip file.
- * Wrote from scratch a debian/build.xml, as the build system is not
-provided in the source zip file
- * Wrote a (rather rudimentary) manual page
- * Added ${misc:Depends} for debhelper
-
- -- Vincent Fourmond fourm...@debian.org Mon, 26 Jan 2009 22:52:48 +0100
-
-jsymphonic (0.2.1alpha+svn196-1) never released; urgency=low
-
- * Initial release (Closes: #493971)
- * Machine-readable copyright file
- * Adding alternative on cacao-oj6-jre
- * Depends on java-wrappers for the executable script
-
- -- Vincent Fourmond fourm...@debian.org Mon, 01 Dec 2008 20:11:27 +0100
Copied: tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-6/debian
[pkg-java] r13745 - trunk/statcvs/debian
Author: fourmond Date: 2011-06-04 18:44:27 + (Sat, 04 Jun 2011) New Revision: 13745 Modified: trunk/statcvs/debian/changelog trunk/statcvs/debian/control Log: [statcvs] Rebuild with newer javahelper Modified: trunk/statcvs/debian/changelog === --- trunk/statcvs/debian/changelog 2011-06-04 18:41:24 UTC (rev 13744) +++ trunk/statcvs/debian/changelog 2011-06-04 18:44:27 UTC (rev 13745) @@ -1,3 +1,10 @@ +statcvs (1:0.7.0.dfsg-5) unstable; urgency=low + + * Rebuild with javahelper = 0.36 to avoid the statcvs.jar not being a +symlink anymore + + -- Vincent Fourmond fourm...@debian.org Sat, 04 Jun 2011 20:41:58 +0200 + statcvs (1:0.7.0.dfsg-4) unstable; urgency=low * Upload to unstable Modified: trunk/statcvs/debian/control === --- trunk/statcvs/debian/control2011-06-04 18:41:24 UTC (rev 13744) +++ trunk/statcvs/debian/control2011-06-04 18:44:27 UTC (rev 13745) @@ -5,7 +5,7 @@ Uploaders: Vincent Fourmond fourm...@debian.org, Christian Bayle ba...@debian.org Build-Depends: cdbs, debhelper (= 5), ant, junit, libjcommon-java, libjfreechart-java (= 1.0.13), libjdom1-java, - default-jdk, javahelper (= 0.34) + default-jdk, javahelper (= 0.36) Standards-Version: 3.9.2 Homepage: http://statcvs.sourceforge.net/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/statcvs ___ 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] r13746 - in tags/statcvs: . 1:0.7.0.dfsg-5/debian
Author: fourmond
Date: 2011-06-04 18:48:58 + (Sat, 04 Jun 2011)
New Revision: 13746
Added:
tags/statcvs/1:0.7.0.dfsg-5/
tags/statcvs/1:0.7.0.dfsg-5/debian/changelog
tags/statcvs/1:0.7.0.dfsg-5/debian/control
tags/statcvs/1:0.7.0.dfsg-5/debian/statcvs.classpath
Removed:
tags/statcvs/1:0.7.0.dfsg-5/debian/changelog
tags/statcvs/1:0.7.0.dfsg-5/debian/control
tags/statcvs/1:0.7.0.dfsg-5/debian/statcvs.classpath
Log:
[svn-buildpackage] Tagging statcvs 1:0.7.0.dfsg-5
Deleted: tags/statcvs/1:0.7.0.dfsg-5/debian/changelog
===
--- trunk/statcvs/debian/changelog 2011-05-10 22:02:23 UTC (rev 13676)
+++ tags/statcvs/1:0.7.0.dfsg-5/debian/changelog2011-06-04 18:48:58 UTC
(rev 13746)
@@ -1,192 +0,0 @@
-statcvs (1:0.7.0.dfsg-3) experimental; urgency=low
-
- * Now fully using javahelper, thanks mjj29 !
- * Profit from it to set a real classpath
- * Now conforms to standards 3.9.1
- * Fix spelling mistakes in the package description
- * Changed the wrapper to automatically get the classpath from the jar
-file (needs recent java-wrappers)
- * Dropped and from the final classpath, as it is only needed for the
-statcvs ant class
-
- -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 10:16:50 +0200
-
-statcvs (1:0.7.0.dfsg-2) unstable; urgency=low
-
- * Does not actually break statsvn 0.5.0, so upload to unstable is pretty
-fine.
-
- -- Vincent Fourmond fourm...@debian.org Tue, 09 Mar 2010 21:17:00 +0100
-
-statcvs (1:0.7.0.dfsg-1) experimental; urgency=low
-
- * Newer upstream release
- * Switch to format 3.0 (quilt), and convert patches to the quilt format,
-drop dependency on dpatch
- * Refresh/update patches
- * Breaks and conflict with statsvn 0.7.0
- * Conforms to newer standards
- * Uploading to experimental to allow for some time to prepare statsvn
- * Getting rid of debian/README.source, obsoleted by the use of 3.0 (quilt)
- * debian/new-upstream now compresses using bzip2: no need to use more
-space than necessary...
-
- -- Vincent Fourmond fourm...@debian.org Sat, 06 Mar 2010 23:11:15 +0100
-
-statcvs (1:0.5.0.dfsg-2) unstable; urgency=low
-
- * Moved to Section: vcs
- * Breaks statsvn 0.4
- * Works fine with statsvn 0.5, upload to unstable
-
- -- Vincent Fourmond fourm...@debian.org Mon, 22 Jun 2009 20:56:58 +0200
-
-statcvs (1:0.5.0.dfsg-1) experimental; urgency=low
-
- * New upstream release.
- * Already conforms to standards 3.8.2
- * Add a ${misc:Depends} for potential debhelper-induced dependencies
- * Bump debhelper compatibility level to 5
- * Add ant clean in debian/new-upstream to avoid adding temporary files
-in the orig tarball
- * Refreshed debian/patches/01-disable-unjar
- * Upload to experimental to allow for tests with statsvn
- * I have finally learned how to use DEB_UPSTREAM_VERSION...
- * This version requires libjfreechart-java version 1.0.13
- * Disable tests from the build system, as their source isn't provided.
-
- -- Vincent Fourmond fourm...@debian.org Sun, 21 Jun 2009 16:17:45 +0200
-
-statcvs (1:0.4.0.dfsg-3) unstable; urgency=low
-
- * Document patches, to make lintian a fair deal happier
- * Add a debian/README.source file to comply with standards 3.8.0
- * Replace the dependency on libjdom-java by libjdom1-java and update
-debian/wrappers/statcvs and debian/rules accordingly (closes: #502037)
-
- -- Vincent Fourmond fourm...@debian.org Mon, 13 Oct 2008 21:02:42 +0200
-
-statcvs (1:0.4.0.dfsg-2) unstable; urgency=low
-
- * Conflicts with older statsvn, as statsvn crashes with the newer
-statcvs
-
- -- Vincent Fourmond fourm...@debian.org Sat, 28 Jun 2008 15:28:09 +0200
-
-statcvs (1:0.4.0.dfsg-1) unstable; urgency=low
-
- * New upstream release (closes: #481798):
-- updated debian/new-upstream to cope for the new test
- files in the archive
-- Updated 01-disable-unjar, to remove various tests and to
- have jar as the default build target.
-- Disabling 10-fix-null-exception, not needed anymore
- * Now depends on libjdom-java as well
- * Fix the old-fsf-address-in-copyright-file lintian warning
- * Improved manual page
- * Updated debian/new-upstream to strip the sourceless jtreemap jar
-from upstream's archive
- * 10-disable-jtreemap to disable the generation of the page with
-jtreemap-based map display
- * Updated REAME.Debian
-
- -- Vincent Fourmond fourm...@debian.org Sat, 28 Jun 2008 13:14:09 +0200
-
-statcvs (1:0.3.dfsg+1-1) unstable; urgency=low
-
- * Re-uploading with a new source, so the package isn't sourceless
-in debian (work-around for a dak bug, Closes: #477381)
-
- -- Vincent Fourmond fourm...@debian.org Fri, 11 Apr 2008 00:10:05 +0200
-
-statcvs (1:0.3.dfsg-4) unstable; urgency=low
-
- * The 'oops, I should not forget again to upload the source when
-I move from contrib to main' release
-
- -- Vincent Fourmond fourm...@debian.org Fri, 11
[pkg-java] r13747 - trunk/statsvn/debian
Author: fourmond Date: 2011-06-04 18:49:56 + (Sat, 04 Jun 2011) New Revision: 13747 Modified: trunk/statsvn/debian/changelog trunk/statsvn/debian/control Log: [statsvn] Rebuild with newer javahelper Modified: trunk/statsvn/debian/changelog === --- trunk/statsvn/debian/changelog 2011-06-04 18:48:58 UTC (rev 13746) +++ trunk/statsvn/debian/changelog 2011-06-04 18:49:56 UTC (rev 13747) @@ -1,3 +1,10 @@ +statsvn (0.7.0.dfsg-6) unstable; urgency=low + + * Rebuild with javahelper = 0.36 to avoid the statsvn.jar not being a +symlink anymore + + -- Vincent Fourmond fourm...@debian.org Sat, 04 Jun 2011 20:49:11 +0200 + statsvn (0.7.0.dfsg-5) unstable; urgency=low * Fix jar path for the call to jh_classpath Modified: trunk/statsvn/debian/control === --- trunk/statsvn/debian/control2011-06-04 18:48:58 UTC (rev 13746) +++ trunk/statsvn/debian/control2011-06-04 18:49:56 UTC (rev 13747) @@ -5,7 +5,7 @@ Uploaders: Vincent Fourmond fourm...@debian.org Build-Depends: cdbs, debhelper (= 5), ant, libbackport-util-concurrent-java, libjcommon-java, libjfreechart-java, statcvs (= 1:0.5.0), default-jdk, - libsvnkit-java, libjdom1-java, javahelper (= 0.34) + libsvnkit-java, libjdom1-java, javahelper (= 0.36) Standards-Version: 3.9.2 Homepage: http://www.statsvn.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/statsvn ___ 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#626329: jh_classpath still breaks symlinks
reopen 626329
found 626329 0.35
thanks
Hello !
Unless I'm very much mistaken, jh_classpath still breaks symlinks, see:
20:38 vincent@tanyaivinco
~/tmp/js/jsymphonic-0.3.0.Ode.To.Freedom+svn387 ls -l
debian/jsymphonic/usr/share/java/*
-rw-r--r-- 1 vincent vincent 1932895 May 15 20:38
debian/jsymphonic/usr/share/java/jsymphonic-0.3.0.Ode.To.Freedom+svn387.jar
lrwxrwxrwx 1 vincent vincent 42 May 15 20:38
debian/jsymphonic/usr/share/java/jsymphonic.jar -
jsymphonic-0.3.0.Ode.To.Freedom+svn387.jar
20:39 vincent@tanyaivinco
~/tmp/js/jsymphonic-0.3.0.Ode.To.Freedom+svn387 jh_classpath
-pjsymphonic
20:39 vincent@tanyaivinco
~/tmp/js/jsymphonic-0.3.0.Ode.To.Freedom+svn387 ls -l
debian/jsymphonic/usr/share/java/*
-rw-r--r-- 1 vincent vincent 1932895 May 15 20:38
debian/jsymphonic/usr/share/java/jsymphonic-0.3.0.Ode.To.Freedom+svn387.jar
-rw-r--r-- 1 vincent vincent 1932930 May 15 20:39
debian/jsymphonic/usr/share/java/jsymphonic.jar
20:39 vincent@tanyaivinco
~/tmp/js/jsymphonic-0.3.0.Ode.To.Freedom+svn387 jh_classpath -V
Javahelper Version 0.35
Looking at the code, it makes sense:
if ( -l $target ){
# Follow links
my $dest = Cwd::abs_path($target);
error(Cannot resolve link $target: $!) unless $dest;
$target = $dest;
$link = 1;
}
# no-act implies others tools are in no-act mode as well
error(Cannot update $jar: it does not exist.) unless -f $jar
or !$dh{NO_ACT};
if ($link){
verbose_print(Updating symlinked $target (via $orig));
} else {
verbose_print(Updating $target);
}
update_jar($jar, undef) unless $dh{NO_ACT};
You modify $target to point to the target of the link, but you keep
on modifying $jar, which still points to the symlink.
Cheers,
Vincent
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please
use
debian-j...@lists.debian.org for discussions and questions.
Bug#626329: Patch attached
tag 626329 +patch
thanks
Here's a patch that does the trick. I'm wondering however if the code
should not be moved to jh_classpath rather ?
Cheers,
Vincent
--
Vincent Fourmond, Debian Developer
http://vince-debian.blogspot.com/
Some pirates achieved immortality by great deeds of cruelty
and derring-do. Some achieved immortality by amassing great
wealth. But the captain had long ago decided that he would,
on the whole, prefer to achieve immortality by not dying.
-- Terry Pratchet, the Colour of Magic
Vincent, listening to My Own Private Vietnam (Poni Hoax)
From b5e10edd22390704cfd935a866a70707f9818980 Mon Sep 17 00:00:00 2001
From: Vincent Fourmond vincent.fourm...@9online.fr
Date: Fri, 13 May 2011 00:46:59 +0200
Subject: [PATCH] Force symlink resolution in jh_manifest (to fix 626329)
---
jh_manifest |4
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/jh_manifest b/jh_manifest
index b9c0ad2..3a835fc 100755
--- a/jh_manifest
+++ b/jh_manifest
@@ -256,6 +256,10 @@ sub update_jar{
my $dirty = 0;
my $main;
my $new_manifest = 0;
+
+# Work on the target file if it is a symlink:
+$jar = `readlink -f $jar`;
+
# stringify or $zip will make a call back that fails.
$zip-read( $jar ) == AZ_OK or error(Could not read $jar: $!);
($con, $stat) = $zip-contents( 'META-INF/MANIFEST.MF' );
--
1.7.5.1
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please
use
debian-j...@lists.debian.org for discussions and questions.
[pkg-java] r13677 - trunk/jsymphonic/debian
Author: fourmond
Date: 2011-05-10 22:18:35 + (Tue, 10 May 2011)
New Revision: 13677
Modified:
trunk/jsymphonic/debian/changelog
trunk/jsymphonic/debian/control
Log:
[jsymphonic] upload to unstable
Modified: trunk/jsymphonic/debian/changelog
===
--- trunk/jsymphonic/debian/changelog 2011-05-10 22:02:23 UTC (rev 13676)
+++ trunk/jsymphonic/debian/changelog 2011-05-10 22:18:35 UTC (rev 13677)
@@ -1,3 +1,10 @@
+jsymphonic (0.3.0.Ode.To.Freedom+svn387-4) unstable; urgency=low
+
+ * Upload to unstable
+ * Conforms to standards 3.9.2
+
+ -- Vincent Fourmond fourm...@debian.org Wed, 11 May 2011 00:09:47 +0200
+
jsymphonic (0.3.0.Ode.To.Freedom+svn387-3) experimental; urgency=low
* Switching to javahelper
Modified: trunk/jsymphonic/debian/control
===
--- trunk/jsymphonic/debian/control 2011-05-10 22:02:23 UTC (rev 13676)
+++ trunk/jsymphonic/debian/control 2011-05-10 22:18:35 UTC (rev 13677)
@@ -5,7 +5,7 @@
Uploaders: Vincent Fourmond fourm...@debian.org
Build-Depends: cdbs, debhelper (= 7), ant, javahelper
Build-Depends-Indep: openjdk-6-jdk, libswing-layout-java
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://sourceforge.net/projects/symphonic/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jsymphonic
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/jsymphonic
@@ -13,7 +13,7 @@
Package: jsymphonic
Architecture: all
-Depends: openjdk-6-jre | java6-runtime, java-wrappers (= 0.1.21),
+Depends: openjdk-6-jre | java6-runtime, java-wrappers (= 0.1.22),
${misc:Depends}, ${java:Depends}
Recommends: ffmpeg
Suggests: pmount
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r13678 - in tags/jsymphonic: . 0.3.0.Ode.To.Freedom+svn387-4/debian
Author: fourmond
Date: 2011-05-10 22:18:47 + (Tue, 10 May 2011)
New Revision: 13678
Added:
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-4/
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-4/debian/changelog
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-4/debian/control
Removed:
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-4/debian/changelog
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-4/debian/control
Log:
[svn-buildpackage] Tagging jsymphonic 0.3.0.Ode.To.Freedom+svn387-4
Deleted: tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-4/debian/changelog
===
--- trunk/jsymphonic/debian/changelog 2011-05-10 22:02:23 UTC (rev 13676)
+++ tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-4/debian/changelog
2011-05-10 22:18:47 UTC (rev 13678)
@@ -1,98 +0,0 @@
-jsymphonic (0.3.0.Ode.To.Freedom+svn387-3) experimental; urgency=low
-
- * Switching to javahelper
- * Using real classpath
- * Using automatic classpath expansion for the wrapper.
- * Already conforms to standards 3.9.1
-
- -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 21:48:59 +0200
-
-jsymphonic (0.3.0.Ode.To.Freedom+svn387-2) unstable; urgency=low
-
- * Upload to unstable
-
- -- Vincent Fourmond fourm...@debian.org Fri, 25 Jun 2010 00:30:30 +0200
-
-jsymphonic (0.3.0.Ode.To.Freedom+svn387-1) experimental; urgency=low
-
- * SVN snapshot based on the new upstream release
- * Update debian/build.xml to also ship included PNG files
- * Rewrote debian/patches/10-config-file.diff to take care of the new
-location for the configuration file.
-
- -- Vincent Fourmond fourm...@debian.org Thu, 11 Mar 2010 23:59:08 +0100
-
-jsymphonic (0.3.0beta+svn321-1) unstable; urgency=medium
-
- * New SVN snapshot (though not the most recent one), now getting rid of
-precompiled classes (closes: #572949)
- * Switching to source format 3.0 (quilt)
- * Updated watchfile to correctly detect newer versions (note that the
-newer version hasn't been packaged yet)
- * Urgency medium to fix RC bug in testing
- * Updated the debian/get-orig-svn to be more verbose about what it
-removes and to remove precompiled .class files
- * Conforms to standards 3.8.4
- * Dropping build-depends on dpatch, now useless
- * Dropping debian/README.source, now useless too
-
- -- Vincent Fourmond fourm...@debian.org Mon, 08 Mar 2010 21:44:53 +0100
-
-jsymphonic (0.3.0beta+svn320-1) unstable; urgency=low
-
- * New upstream SVN snapshot
- * Refresh 10-config-file
- * Add 20-fix-isocountry to fix a compilation problem
- * Now depends on libswing-layout-java:
-- updated debian/{control,rules} and debian/wrappers/jsymphonic
- * Wrote a desktop file (I guess it addresses LP: #386783)
- * Added a debian/README.source file
- * Now conforms to standards 3.8.3
- * Forcing the build to proceed with encoding UTF-8
-
- -- Vincent Fourmond fourm...@debian.org Sun, 11 Oct 2009 02:37:25 +0200
-
-jsymphonic (0.3.0alpha1+svn268-1) unstable; urgency=low
-
- * Pulling in new upstream SVN revision
- * Uploading to unstable now that lenny is out.
- * Suggests pmount, as this could come in quite handy to mount the
-player.
- * Recommends ffmpeg, as it can be used by jsymphonic to recode on the
-fly songs that are not in the right format. (although admittedly,
-you're probably more interested in the package by Christian Marillat,
-for MP3 support).
- * Added an icon, based on vignette.png from the archive.
-
- -- Vincent Fourmond fourm...@debian.org Sat, 07 Mar 2009 23:19:54 +0100
-
-jsymphonic (0.3.0alpha1+svn252-1) experimental; urgency=low
-
- * Adapted debian/get-svn-source to the newer SVN structure
- * Switching to a SVN export, as the -sources.zip file is not complete.
- * Updated debian/build.xml to copy resources.
- * debian/patches/10-config-file.dpatch to put config and log files as
-hidden files in $HOME
-
- -- Vincent Fourmond fourm...@debian.org Thu, 29 Jan 2009 20:21:02 +0100
-
-jsymphonic (0.3.0alpha1-1) experimental; urgency=low
-
- * New upstream release
- * Wrote a decent watchfile, and a small new-upstream script to repackage
-and rearrange the zip file.
- * Wrote from scratch a debian/build.xml, as the build system is not
-provided in the source zip file
- * Wrote a (rather rudimentary) manual page
- * Added ${misc:Depends} for debhelper
-
- -- Vincent Fourmond fourm...@debian.org Mon, 26 Jan 2009 22:52:48 +0100
-
-jsymphonic (0.2.1alpha+svn196-1) never released; urgency=low
-
- * Initial release (Closes: #493971)
- * Machine-readable copyright file
- * Adding alternative on cacao-oj6-jre
- * Depends on java-wrappers for the executable script
-
- -- Vincent Fourmond fourm...@debian.org Mon, 01 Dec 2008 20:11:27 +0100
Copied: tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-4/debian/changelog (from
rev 13677, trunk/jsymphonic/debian/changelog)
===
--- tags/jsymphonic
[pkg-java] r13679 - trunk/jsymphonic/debian
Author: fourmond Date: 2011-05-10 22:31:42 + (Tue, 10 May 2011) New Revision: 13679 Modified: trunk/jsymphonic/debian/changelog trunk/jsymphonic/debian/control trunk/jsymphonic/debian/jsymphonic.classpath Log: [jsymphonic] fix sneaky missing classpath due to changes in javahelper Modified: trunk/jsymphonic/debian/changelog === --- trunk/jsymphonic/debian/changelog 2011-05-10 22:18:47 UTC (rev 13678) +++ trunk/jsymphonic/debian/changelog 2011-05-10 22:31:42 UTC (rev 13679) @@ -1,3 +1,9 @@ +jsymphonic (0.3.0.Ode.To.Freedom+svn387-5) unstable; urgency=low + + * Fix classpath tweaking due to change in javahelper behavior + + -- Vincent Fourmond fourm...@debian.org Wed, 11 May 2011 00:28:03 +0200 + jsymphonic (0.3.0.Ode.To.Freedom+svn387-4) unstable; urgency=low * Upload to unstable Modified: trunk/jsymphonic/debian/control === --- trunk/jsymphonic/debian/control 2011-05-10 22:18:47 UTC (rev 13678) +++ trunk/jsymphonic/debian/control 2011-05-10 22:31:42 UTC (rev 13679) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org Uploaders: Vincent Fourmond fourm...@debian.org -Build-Depends: cdbs, debhelper (= 7), ant, javahelper +Build-Depends: cdbs, debhelper (= 7), ant, javahelper (= 0.34) Build-Depends-Indep: openjdk-6-jdk, libswing-layout-java Standards-Version: 3.9.2 Homepage: http://sourceforge.net/projects/symphonic/ Modified: trunk/jsymphonic/debian/jsymphonic.classpath === --- trunk/jsymphonic/debian/jsymphonic.classpath2011-05-10 22:18:47 UTC (rev 13678) +++ trunk/jsymphonic/debian/jsymphonic.classpath2011-05-10 22:31:42 UTC (rev 13679) @@ -1 +1 @@ -dist/jsymphonic.jar /usr/share/java/swing-layout.jar +usr/share/java/jsymphonic.jar /usr/share/java/swing-layout.jar ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r13680 - in tags/jsymphonic: . 0.3.0.Ode.To.Freedom+svn387-5/debian
Author: fourmond
Date: 2011-05-10 22:31:57 + (Tue, 10 May 2011)
New Revision: 13680
Added:
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-5/
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-5/debian/changelog
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-5/debian/control
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-5/debian/jsymphonic.classpath
Removed:
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-5/debian/changelog
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-5/debian/control
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-5/debian/jsymphonic.classpath
Log:
[svn-buildpackage] Tagging jsymphonic 0.3.0.Ode.To.Freedom+svn387-5
Deleted: tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-5/debian/changelog
===
--- trunk/jsymphonic/debian/changelog 2011-05-10 22:02:23 UTC (rev 13676)
+++ tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-5/debian/changelog
2011-05-10 22:31:57 UTC (rev 13680)
@@ -1,98 +0,0 @@
-jsymphonic (0.3.0.Ode.To.Freedom+svn387-3) experimental; urgency=low
-
- * Switching to javahelper
- * Using real classpath
- * Using automatic classpath expansion for the wrapper.
- * Already conforms to standards 3.9.1
-
- -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 21:48:59 +0200
-
-jsymphonic (0.3.0.Ode.To.Freedom+svn387-2) unstable; urgency=low
-
- * Upload to unstable
-
- -- Vincent Fourmond fourm...@debian.org Fri, 25 Jun 2010 00:30:30 +0200
-
-jsymphonic (0.3.0.Ode.To.Freedom+svn387-1) experimental; urgency=low
-
- * SVN snapshot based on the new upstream release
- * Update debian/build.xml to also ship included PNG files
- * Rewrote debian/patches/10-config-file.diff to take care of the new
-location for the configuration file.
-
- -- Vincent Fourmond fourm...@debian.org Thu, 11 Mar 2010 23:59:08 +0100
-
-jsymphonic (0.3.0beta+svn321-1) unstable; urgency=medium
-
- * New SVN snapshot (though not the most recent one), now getting rid of
-precompiled classes (closes: #572949)
- * Switching to source format 3.0 (quilt)
- * Updated watchfile to correctly detect newer versions (note that the
-newer version hasn't been packaged yet)
- * Urgency medium to fix RC bug in testing
- * Updated the debian/get-orig-svn to be more verbose about what it
-removes and to remove precompiled .class files
- * Conforms to standards 3.8.4
- * Dropping build-depends on dpatch, now useless
- * Dropping debian/README.source, now useless too
-
- -- Vincent Fourmond fourm...@debian.org Mon, 08 Mar 2010 21:44:53 +0100
-
-jsymphonic (0.3.0beta+svn320-1) unstable; urgency=low
-
- * New upstream SVN snapshot
- * Refresh 10-config-file
- * Add 20-fix-isocountry to fix a compilation problem
- * Now depends on libswing-layout-java:
-- updated debian/{control,rules} and debian/wrappers/jsymphonic
- * Wrote a desktop file (I guess it addresses LP: #386783)
- * Added a debian/README.source file
- * Now conforms to standards 3.8.3
- * Forcing the build to proceed with encoding UTF-8
-
- -- Vincent Fourmond fourm...@debian.org Sun, 11 Oct 2009 02:37:25 +0200
-
-jsymphonic (0.3.0alpha1+svn268-1) unstable; urgency=low
-
- * Pulling in new upstream SVN revision
- * Uploading to unstable now that lenny is out.
- * Suggests pmount, as this could come in quite handy to mount the
-player.
- * Recommends ffmpeg, as it can be used by jsymphonic to recode on the
-fly songs that are not in the right format. (although admittedly,
-you're probably more interested in the package by Christian Marillat,
-for MP3 support).
- * Added an icon, based on vignette.png from the archive.
-
- -- Vincent Fourmond fourm...@debian.org Sat, 07 Mar 2009 23:19:54 +0100
-
-jsymphonic (0.3.0alpha1+svn252-1) experimental; urgency=low
-
- * Adapted debian/get-svn-source to the newer SVN structure
- * Switching to a SVN export, as the -sources.zip file is not complete.
- * Updated debian/build.xml to copy resources.
- * debian/patches/10-config-file.dpatch to put config and log files as
-hidden files in $HOME
-
- -- Vincent Fourmond fourm...@debian.org Thu, 29 Jan 2009 20:21:02 +0100
-
-jsymphonic (0.3.0alpha1-1) experimental; urgency=low
-
- * New upstream release
- * Wrote a decent watchfile, and a small new-upstream script to repackage
-and rearrange the zip file.
- * Wrote from scratch a debian/build.xml, as the build system is not
-provided in the source zip file
- * Wrote a (rather rudimentary) manual page
- * Added ${misc:Depends} for debhelper
-
- -- Vincent Fourmond fourm...@debian.org Mon, 26 Jan 2009 22:52:48 +0100
-
-jsymphonic (0.2.1alpha+svn196-1) never released; urgency=low
-
- * Initial release (Closes: #493971)
- * Machine-readable copyright file
- * Adding alternative on cacao-oj6-jre
- * Depends on java-wrappers for the executable script
-
- -- Vincent Fourmond fourm...@debian.org Mon, 01 Dec 2008 20:11:27 +0100
Copied: tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-5/debian
[pkg-java] r13681 - trunk/statcvs/debian
Author: fourmond
Date: 2011-05-10 22:38:49 + (Tue, 10 May 2011)
New Revision: 13681
Modified:
trunk/statcvs/debian/changelog
trunk/statcvs/debian/control
trunk/statcvs/debian/statcvs.classpath
Log:
[statcvs] uploading to unstable + fix build to match the newer behaviour of
javahelper
Modified: trunk/statcvs/debian/changelog
===
--- trunk/statcvs/debian/changelog 2011-05-10 22:31:57 UTC (rev 13680)
+++ trunk/statcvs/debian/changelog 2011-05-10 22:38:49 UTC (rev 13681)
@@ -1,3 +1,11 @@
+statcvs (1:0.7.0.dfsg-4) unstable; urgency=low
+
+ * Upload to unstable
+ * Conforms to standards 3.9.2
+ * Fix the classpath patching to follow newer javahelper behaviour
+
+ -- Vincent Fourmond fourm...@debian.org Wed, 11 May 2011 00:32:12 +0200
+
statcvs (1:0.7.0.dfsg-3) experimental; urgency=low
* Now fully using javahelper, thanks mjj29 !
Modified: trunk/statcvs/debian/control
===
--- trunk/statcvs/debian/control2011-05-10 22:31:57 UTC (rev 13680)
+++ trunk/statcvs/debian/control2011-05-10 22:38:49 UTC (rev 13681)
@@ -5,8 +5,8 @@
Uploaders: Vincent Fourmond fourm...@debian.org, Christian Bayle
ba...@debian.org
Build-Depends: cdbs, debhelper (= 5), ant, junit,
libjcommon-java, libjfreechart-java (= 1.0.13), libjdom1-java,
- default-jdk, javahelper (= 0.19)
-Standards-Version: 3.9.1
+ default-jdk, javahelper (= 0.34)
+Standards-Version: 3.9.2
Homepage: http://statcvs.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/statcvs
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/statcvs
@@ -15,7 +15,7 @@
Package: statcvs
Architecture: all
Depends: java-gcj-compat | java-runtime, ${java:Depends},
- libjfreechart-java (= 1.0.13), java-wrappers (= 0.1.20),
+ libjfreechart-java (= 1.0.13), java-wrappers (= 0.1.22),
${misc:Depends}
Breaks: statsvn ( 0.5.0)
Conflicts: statsvn ( 0.5.0)
Modified: trunk/statcvs/debian/statcvs.classpath
===
--- trunk/statcvs/debian/statcvs.classpath 2011-05-10 22:31:57 UTC (rev
13680)
+++ trunk/statcvs/debian/statcvs.classpath 2011-05-10 22:38:49 UTC (rev
13681)
@@ -1 +1 @@
-dist/statcvs.jar /usr/share/java/jdom1.jar /usr/share/java/jcommon.jar
/usr/share/java/jfreechart.jar
+usr/share/java/statcvs.jar /usr/share/java/jdom1.jar
/usr/share/java/jcommon.jar /usr/share/java/jfreechart.jar
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r13682 - in tags/statcvs: . 1:0.7.0.dfsg-4/debian
Author: fourmond
Date: 2011-05-10 22:45:20 + (Tue, 10 May 2011)
New Revision: 13682
Added:
tags/statcvs/1:0.7.0.dfsg-4/
tags/statcvs/1:0.7.0.dfsg-4/debian/changelog
tags/statcvs/1:0.7.0.dfsg-4/debian/control
tags/statcvs/1:0.7.0.dfsg-4/debian/statcvs.classpath
Removed:
tags/statcvs/1:0.7.0.dfsg-4/debian/changelog
tags/statcvs/1:0.7.0.dfsg-4/debian/control
tags/statcvs/1:0.7.0.dfsg-4/debian/statcvs.classpath
Log:
[svn-buildpackage] Tagging statcvs 1:0.7.0.dfsg-4
Deleted: tags/statcvs/1:0.7.0.dfsg-4/debian/changelog
===
--- trunk/statcvs/debian/changelog 2011-05-10 22:02:23 UTC (rev 13676)
+++ tags/statcvs/1:0.7.0.dfsg-4/debian/changelog2011-05-10 22:45:20 UTC
(rev 13682)
@@ -1,192 +0,0 @@
-statcvs (1:0.7.0.dfsg-3) experimental; urgency=low
-
- * Now fully using javahelper, thanks mjj29 !
- * Profit from it to set a real classpath
- * Now conforms to standards 3.9.1
- * Fix spelling mistakes in the package description
- * Changed the wrapper to automatically get the classpath from the jar
-file (needs recent java-wrappers)
- * Dropped and from the final classpath, as it is only needed for the
-statcvs ant class
-
- -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 10:16:50 +0200
-
-statcvs (1:0.7.0.dfsg-2) unstable; urgency=low
-
- * Does not actually break statsvn 0.5.0, so upload to unstable is pretty
-fine.
-
- -- Vincent Fourmond fourm...@debian.org Tue, 09 Mar 2010 21:17:00 +0100
-
-statcvs (1:0.7.0.dfsg-1) experimental; urgency=low
-
- * Newer upstream release
- * Switch to format 3.0 (quilt), and convert patches to the quilt format,
-drop dependency on dpatch
- * Refresh/update patches
- * Breaks and conflict with statsvn 0.7.0
- * Conforms to newer standards
- * Uploading to experimental to allow for some time to prepare statsvn
- * Getting rid of debian/README.source, obsoleted by the use of 3.0 (quilt)
- * debian/new-upstream now compresses using bzip2: no need to use more
-space than necessary...
-
- -- Vincent Fourmond fourm...@debian.org Sat, 06 Mar 2010 23:11:15 +0100
-
-statcvs (1:0.5.0.dfsg-2) unstable; urgency=low
-
- * Moved to Section: vcs
- * Breaks statsvn 0.4
- * Works fine with statsvn 0.5, upload to unstable
-
- -- Vincent Fourmond fourm...@debian.org Mon, 22 Jun 2009 20:56:58 +0200
-
-statcvs (1:0.5.0.dfsg-1) experimental; urgency=low
-
- * New upstream release.
- * Already conforms to standards 3.8.2
- * Add a ${misc:Depends} for potential debhelper-induced dependencies
- * Bump debhelper compatibility level to 5
- * Add ant clean in debian/new-upstream to avoid adding temporary files
-in the orig tarball
- * Refreshed debian/patches/01-disable-unjar
- * Upload to experimental to allow for tests with statsvn
- * I have finally learned how to use DEB_UPSTREAM_VERSION...
- * This version requires libjfreechart-java version 1.0.13
- * Disable tests from the build system, as their source isn't provided.
-
- -- Vincent Fourmond fourm...@debian.org Sun, 21 Jun 2009 16:17:45 +0200
-
-statcvs (1:0.4.0.dfsg-3) unstable; urgency=low
-
- * Document patches, to make lintian a fair deal happier
- * Add a debian/README.source file to comply with standards 3.8.0
- * Replace the dependency on libjdom-java by libjdom1-java and update
-debian/wrappers/statcvs and debian/rules accordingly (closes: #502037)
-
- -- Vincent Fourmond fourm...@debian.org Mon, 13 Oct 2008 21:02:42 +0200
-
-statcvs (1:0.4.0.dfsg-2) unstable; urgency=low
-
- * Conflicts with older statsvn, as statsvn crashes with the newer
-statcvs
-
- -- Vincent Fourmond fourm...@debian.org Sat, 28 Jun 2008 15:28:09 +0200
-
-statcvs (1:0.4.0.dfsg-1) unstable; urgency=low
-
- * New upstream release (closes: #481798):
-- updated debian/new-upstream to cope for the new test
- files in the archive
-- Updated 01-disable-unjar, to remove various tests and to
- have jar as the default build target.
-- Disabling 10-fix-null-exception, not needed anymore
- * Now depends on libjdom-java as well
- * Fix the old-fsf-address-in-copyright-file lintian warning
- * Improved manual page
- * Updated debian/new-upstream to strip the sourceless jtreemap jar
-from upstream's archive
- * 10-disable-jtreemap to disable the generation of the page with
-jtreemap-based map display
- * Updated REAME.Debian
-
- -- Vincent Fourmond fourm...@debian.org Sat, 28 Jun 2008 13:14:09 +0200
-
-statcvs (1:0.3.dfsg+1-1) unstable; urgency=low
-
- * Re-uploading with a new source, so the package isn't sourceless
-in debian (work-around for a dak bug, Closes: #477381)
-
- -- Vincent Fourmond fourm...@debian.org Fri, 11 Apr 2008 00:10:05 +0200
-
-statcvs (1:0.3.dfsg-4) unstable; urgency=low
-
- * The 'oops, I should not forget again to upload the source when
-I move from contrib to main' release
-
- -- Vincent Fourmond fourm...@debian.org Fri, 11
[pkg-java] r13683 - trunk/statsvn/debian
Author: fourmond
Date: 2011-05-10 22:57:59 + (Tue, 10 May 2011)
New Revision: 13683
Modified:
trunk/statsvn/debian/changelog
trunk/statsvn/debian/control
trunk/statsvn/debian/statsvn.classpath
Log:
[statsvn] Upload to unstable + (almost) fix the classpath problems with newer
javahelper
Modified: trunk/statsvn/debian/changelog
===
--- trunk/statsvn/debian/changelog 2011-05-10 22:45:20 UTC (rev 13682)
+++ trunk/statsvn/debian/changelog 2011-05-10 22:57:59 UTC (rev 13683)
@@ -1,3 +1,13 @@
+statsvn (0.7.0.dfsg-5) unstable; urgency=low
+
+ * Fix jar path for the call to jh_classpath
+ * Conforms to standards 3.9.2
+ * Tighten up dependencies on statcvs, as old versions didn't have a proper
+classpath
+ * Uploading to unstable
+
+ -- Vincent Fourmond fourm...@debian.org Wed, 11 May 2011 00:47:35 +0200
+
statsvn (0.7.0.dfsg-4) experimental; urgency=low
* Now using javahelper, thanks to mjj29 !
Modified: trunk/statsvn/debian/control
===
--- trunk/statsvn/debian/control2011-05-10 22:45:20 UTC (rev 13682)
+++ trunk/statsvn/debian/control2011-05-10 22:57:59 UTC (rev 13683)
@@ -5,8 +5,8 @@
Uploaders: Vincent Fourmond fourm...@debian.org
Build-Depends: cdbs, debhelper (= 5), ant, libbackport-util-concurrent-java,
libjcommon-java, libjfreechart-java, statcvs (= 1:0.5.0), default-jdk,
- libsvnkit-java, libjdom1-java, javahelper (= 0.19)
-Standards-Version: 3.9.1
+ libsvnkit-java, libjdom1-java, javahelper (= 0.34)
+Standards-Version: 3.9.2
Homepage: http://www.statsvn.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/statsvn
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/statsvn
@@ -15,7 +15,7 @@
Package: statsvn
Architecture: all
Depends: java-gcj-compat | java-runtime, ${java:Depends},
- statcvs (= 1:0.7.0), subversion, java-wrappers (= 0.1.20),
+ statcvs (= 1:0.7.0.dfsg-4~), subversion, java-wrappers (= 0.1.22),
${misc:Depends}
Description: SVN repository statistics
StatSVN retrieves information from a Subversion repository and generates
Modified: trunk/statsvn/debian/statsvn.classpath
===
--- trunk/statsvn/debian/statsvn.classpath 2011-05-10 22:45:20 UTC (rev
13682)
+++ trunk/statsvn/debian/statsvn.classpath 2011-05-10 22:57:59 UTC (rev
13683)
@@ -1 +1 @@
-dist/statsvn.jar /usr/share/java/backport-util-concurrent.jar
/usr/share/java/statcvs.jar /usr/share/java/svnkit.jar
+usr/share/java/statsvn.jar /usr/share/java/backport-util-concurrent.jar
/usr/share/java/statcvs.jar /usr/share/java/svnkit.jar
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r13684 - in tags/statsvn: . 0.7.0.dfsg-5/debian
Author: fourmond
Date: 2011-05-10 22:58:10 + (Tue, 10 May 2011)
New Revision: 13684
Added:
tags/statsvn/0.7.0.dfsg-5/
tags/statsvn/0.7.0.dfsg-5/debian/changelog
tags/statsvn/0.7.0.dfsg-5/debian/control
tags/statsvn/0.7.0.dfsg-5/debian/statsvn.classpath
Removed:
tags/statsvn/0.7.0.dfsg-5/debian/changelog
tags/statsvn/0.7.0.dfsg-5/debian/control
tags/statsvn/0.7.0.dfsg-5/debian/statsvn.classpath
Log:
[svn-buildpackage] Tagging statsvn 0.7.0.dfsg-5
Deleted: tags/statsvn/0.7.0.dfsg-5/debian/changelog
===
--- trunk/statsvn/debian/changelog 2011-05-10 22:02:23 UTC (rev 13676)
+++ tags/statsvn/0.7.0.dfsg-5/debian/changelog 2011-05-10 22:58:10 UTC (rev
13684)
@@ -1,99 +0,0 @@
-statsvn (0.7.0.dfsg-4) experimental; urgency=low
-
- * Now using javahelper, thanks to mjj29 !
- * Now specifying a real classpath
- * Letting java-wrappers find the classpath itself.
- * Now almost using upstream target for building the jar
-
- -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 17:12:20 +0200
-
-statsvn (0.7.0.dfsg-3) unstable; urgency=low
-
- * Add libjdom1-java to dependencies + add jdom1 in the classpath
-to fix class not found exception when generating XML (closes: #616412)
- * Tighten up dependencies on more recent versions of java-wrapper
-
- -- Vincent Fourmond fourm...@debian.org Wed, 23 Mar 2011 11:01:07 +0100
-
-statsvn (0.7.0.dfsg-2) unstable; urgency=low
-
- * Pull option documentation from upstream's wiki:
-http://wiki.statsvn.org/Default.aspx?Page=User Manual (closes: 576664)
-Thanks to Mathieu Malaterre for pointing out.
-
- -- Vincent Fourmond fourm...@debian.org Tue, 06 Apr 2010 22:24:27 +0200
-
-statsvn (0.7.0.dfsg-1) unstable; urgency=low
-
- * New upstream release (closes: #572613)
- * Switch to source format 3.0 (quilt)
- * Drop build-dependency on dpatch, now unneeded
- * Now conforms to standards 3.8.4
- * Switch to a dependency on default-jdk for building
- * Now depends on libsvnkit-java
- * Manual page updates.
-
- -- Vincent Fourmond fourm...@debian.org Tue, 16 Mar 2010 21:32:06 +0100
-
-statsvn (0.5.0.dfsg-1) unstable; urgency=low
-
- * New upstream release
- * Updated the debian/new-upstream script to remove extraneous files.
- * Moved to the new section vcs
- * Needs statcvs 0.5.0 or later.
- * Added ${misc:Depends} for debhelper-induced dependencies
- * Bumped debhelper compatibility level to 5
- * Added a debian/README.source file to explain the patch system
- * Now conforms to standards 3.8.2
-
- -- Vincent Fourmond fourm...@debian.org Mon, 22 Jun 2009 20:32:34 +0200
-
-statsvn (0.4.0.dfsg-1) unstable; urgency=low
-
- * New upstream version (closes: #481799)
- * Does not work with older statcvs, tightening up dependencies
- * statsvn still complains about files with spaces within, but
-it does not seem to affect statistics anymore, so it
-closes: #469937,#469938
-
- -- Vincent Fourmond fourm...@debian.org Sat, 28 Jun 2008 15:53:07 +0200
-
-statsvn (0.3.1.dfsg+1-1) unstable; urgency=low
-
- [ Michael Koch ]
- * Updated watch file to remove .dfsg part from debian version before
-comparison.
-
- [ Vincent Fourmond ]
- * Now that statcvs has moved to main, statsvn also works fine
-within main; moving there (closes: #469820)
-
- -- Vincent Fourmond fourm...@debian.org Sat, 19 Apr 2008 21:13:17 +0200
-
-statsvn (0.3.1.dfsg-3) unstable; urgency=low
-
- * The 'Whoa I never uploaded two versions that close together' release
- * statsvn must of course Depend on java-wrappers... (closes: #470394)
-
- -- Vincent Fourmond fourm...@debian.org Mon, 10 Mar 2008 23:40:29 +0100
-
-statsvn (0.3.1.dfsg-2) unstable; urgency=low
-
- * Move subversion to Depends, as it is truly required
- * Document -tags in the manual page, patch courtesy of
-Emmanuel Fleury fle...@labri.fr (closes: #470252)
-
- -- Vincent Fourmond fourm...@debian.org Mon, 10 Mar 2008 23:08:05 +0100
-
-statsvn (0.3.1.dfsg-1) unstable; urgency=low
-
- * Initial release (Closes: 456250)
- * 10-build-xml-classpath to get it to build with debian packages
- * 15-build-xml-build-jar-only to tweak the build system to get a
-jar containing only statsvn code (and not many more as upstreams').
- * 20-disable-jtreemap to disable the jtreemap-based report, as jtreemap
-is not currently packaged for Debian
- * Wrote a manual page, based on the one from statcvs
- * Updated FSF's address in debian/copyright
-
- -- Vincent Fourmond fourm...@debian.org Wed, 05 Mar 2008 00:29:20 +0100
Copied: tags/statsvn/0.7.0.dfsg-5/debian/changelog (from rev 13683,
trunk/statsvn/debian/changelog)
===
--- tags/statsvn/0.7.0.dfsg-5/debian/changelog (rev 0)
+++ tags/statsvn/0.7.0.dfsg-5/debian/changelog 2011-05-10 22:58:10 UTC (rev
13684)
@@ -0,0 +1,109 @@
+statsvn (0.7.0.dfsg-5) unstable
Bug#626329: Please follow symlinks for manifest-tweaking tools !
Package: javahelper Version: 0.34 Severity: important Hello again ! Hmmm... Just had a look at the statsvn package I've uploaded: -rw-r--r-- root/root100922 2011-05-11 00:49 ./usr/share/java/statsvn.jar -rw-r--r-- root/root100891 2011-05-11 00:49 ./usr/share/java/statsvn-0.7.0.jar Shouldn't statsvn.jar be linked to the versioned jar ? The problem comes from the fact that the manifest-tweaking tools do not follow symlinks. So, for now: * using usr/share/java/statsvn.jar leads to two different files instead of a symlink * using usr/share/java/statsvn-0.7.0.jar works but requires changing the files for every sourceful upload... Cheers, Vincent PS: and, again, I can tackle that if you wish -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.38-2-amd64 (SMP w/2 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages javahelper depends on: ii bsdmainutils 8.2.2 collection of more utilities from ii dctrl-tools 2.18 Command-line tools to process Debi ii debhelper 8.1.6 helper programs for debian/rules ii devscripts2.10.73scripts to make the life of a Debi ii dpkg-dev 1.16.0.3 Debian package development tools ii libarchive-zip-perl 1.30-4 Perl module for manipulation of ZI javahelper recommends no packages. Versions of packages javahelper suggests: ii cvs 2:1.12.13+real-4 Concurrent Versions System ii gawk1:3.1.7.dfsg-5 GNU awk, a pattern scanning and pr pn tofrodosnone (no description available) -- no debconf information __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
[pkg-java] r13541 - trunk/libjaba-client-java/debian
Author: fourmond Date: 2011-04-17 07:05:20 + (Sun, 17 Apr 2011) New Revision: 13541 Modified: trunk/libjaba-client-java/debian/copyright Log: [libjaba-client-java] fix missing licenses in the copyright file Modified: trunk/libjaba-client-java/debian/copyright === --- trunk/libjaba-client-java/debian/copyright 2011-04-16 19:44:26 UTC (rev 13540) +++ trunk/libjaba-client-java/debian/copyright 2011-04-17 07:05:20 UTC (rev 13541) @@ -26,6 +26,14 @@ On Debian system, the full text of the license can be found at /usr/share/common-licenses/Apache-2.0 +Files: compbio/util/annotation/*ThreadSafe.java +Copyright: 2005 Brian Goetz and Tim Peierls +License: CC-BY + Released under the Creative Commons Attribution License + (http://creativecommons.org/licenses/by/2.5) + . + Any republication or derived work distributed in source code form + must include this copyright and license notice. Files: debian/* Copyright: 2011 by Vincent Fourmond fourm...@debian.org ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r13542 - trunk/jalview/debian
Author: fourmond Date: 2011-04-17 07:40:32 + (Sun, 17 Apr 2011) New Revision: 13542 Modified: trunk/jalview/debian/control trunk/jalview/debian/rules Log: [jalview] pulling in a whole lot of additional dependencies - it now almost builds ! Modified: trunk/jalview/debian/control === --- trunk/jalview/debian/control2011-04-17 07:05:20 UTC (rev 13541) +++ trunk/jalview/debian/control2011-04-17 07:40:32 UTC (rev 13542) @@ -9,7 +9,8 @@ libcommons-discovery-java, libcommons-logging-java, libstevesoft-regex-java, libjmol-java, libcastor-xml-java, libvamsas-client-java, - javahelper + libjaba-client-java, libaxis-java, jmol-applet, + javahelper, javahelp2 Standards-Version: 3.9.2 Homepage: http://www.jalview.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview Modified: trunk/jalview/debian/rules === --- trunk/jalview/debian/rules 2011-04-17 07:05:20 UTC (rev 13541) +++ trunk/jalview/debian/rules 2011-04-17 07:40:32 UTC (rev 13542) @@ -1,7 +1,7 @@ #!/usr/bin/make -f export JAVA_HOME=/usr/lib/jvm/default-java -export CLASSPATH=/usr/share/java/castor-xml.jar:/usr/share/java/commons-logging.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/castor-core.jar:/usr/share/java/Jmol.jar:/usr/share/java/vamsas-client.jar +export CLASSPATH=/usr/share/java/castor-xml.jar:/usr/share/java/commons-logging.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/castor-core.jar:/usr/share/java/Jmol.jar:/usr/share/java/vamsas-client.jar:/usr/share/java/min-jaba-client.jar:/usr/share/java/axis-jaxrpc.jar:/usr/share/java/axis.jar:/usr/share/jmol-applet/JmolApplet.jar:/usr/share/java/jh.jar %: dh $@ --with javahelper ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
Bug#623158: does not identify correctly recent JVM versions
Package: jclassinfo Version: 0.19.1-5 Severity: normal Hi, jclassinfo does not identify the JVM requirements for class files built with recent JVMs. They give [CLASS INFORMATION] public interface net.sf.freecol.common.networking.MessageHandler extends java.lang.Object Compiled from MessageHandler.java Requires: Java VM unknown or higher while file identifies them correctly (annoying, isn't it ?) MessageHandler.class:compiled Java class data, version 49.0 (Java 1.5) I'll really have to dig into that... Cheers, Vincent -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.38-2-amd64 (SMP w/2 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages jclassinfo depends on: ii libc6 2.11.2-13Embedded GNU C Library: Shared lib ii zlib1g 1:1.2.3.4.dfsg-3 compression library - runtime jclassinfo recommends no packages. jclassinfo suggests no packages. -- no debconf information __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
[pkg-java] r13550 - in tags/jclassinfo: . 0.19.1-6/debian 0.19.1-6/debian/patches
Author: fourmond Date: 2011-04-17 21:58:07 + (Sun, 17 Apr 2011) New Revision: 13550 Added: tags/jclassinfo/0.19.1-6/ tags/jclassinfo/0.19.1-6/debian/changelog tags/jclassinfo/0.19.1-6/debian/compat tags/jclassinfo/0.19.1-6/debian/control tags/jclassinfo/0.19.1-6/debian/docs tags/jclassinfo/0.19.1-6/debian/patches/01-make-static-lib.diff tags/jclassinfo/0.19.1-6/debian/patches/02-use-stdin.diff tags/jclassinfo/0.19.1-6/debian/patches/03-fix-malloc.diff tags/jclassinfo/0.19.1-6/debian/patches/04-newer-jvms.diff tags/jclassinfo/0.19.1-6/debian/patches/05-fix-jstring-memory.diff tags/jclassinfo/0.19.1-6/debian/patches/series tags/jclassinfo/0.19.1-6/debian/rules tags/jclassinfo/0.19.1-6/debian/source/ Removed: tags/jclassinfo/0.19.1-6/debian/README.source tags/jclassinfo/0.19.1-6/debian/changelog tags/jclassinfo/0.19.1-6/debian/compat tags/jclassinfo/0.19.1-6/debian/control tags/jclassinfo/0.19.1-6/debian/dirs tags/jclassinfo/0.19.1-6/debian/docs tags/jclassinfo/0.19.1-6/debian/patches/00list tags/jclassinfo/0.19.1-6/debian/patches/01-make-static-lib.dpatch tags/jclassinfo/0.19.1-6/debian/patches/02-use-stdin.dpatch tags/jclassinfo/0.19.1-6/debian/patches/03-fix-malloc.dpatch tags/jclassinfo/0.19.1-6/debian/rules Log: [svn-buildpackage] Tagging jclassinfo 0.19.1-6 Deleted: tags/jclassinfo/0.19.1-6/debian/README.source === --- trunk/jclassinfo/debian/README.source 2011-04-13 22:17:14 UTC (rev 13529) +++ tags/jclassinfo/0.19.1-6/debian/README.source 2011-04-17 21:58:07 UTC (rev 13550) @@ -1,7 +0,0 @@ -Note about the source package of jclassinfo. - -This package uses dpatch to manage all modifications to the upstream -source. See /usr/share/doc/dpatch/README.source.gz to get more -information on how to use it. - - -- Vincent Fourmond fourm...@debian.org, Tue, 5 May 2009 20:24:09 +0200 Deleted: tags/jclassinfo/0.19.1-6/debian/changelog === --- trunk/jclassinfo/debian/changelog 2011-04-13 22:17:14 UTC (rev 13529) +++ tags/jclassinfo/0.19.1-6/debian/changelog 2011-04-17 21:58:07 UTC (rev 13550) @@ -1,42 +0,0 @@ -jclassinfo (0.19.1-5) unstable; urgency=low - - * patches/03-fix-malloc: fix a memory allocation error (closes: #550203) - * Now conforms to 3.8.3 - - -- Vincent Fourmond fourm...@debian.org Tue, 26 Jan 2010 21:03:03 +0100 - -jclassinfo (0.19.1-4) unstable; urgency=low - - * Definitely should go in Section: java... - - -- Vincent Fourmond fourm...@debian.org Tue, 05 May 2009 21:15:32 +0200 - -jclassinfo (0.19.1-3) unstable; urgency=medium - - * Running libtoolize -f for every build to make sure libtool and -autoconf are in sync (closes: #526553). Thanks to Daniel Schepler -dschep...@gmail.com for reporting and giving a fix. - * Urgency medium to fix a RC bug in testing. - * Adding a debian/README.source to document the patch system. - * Now conforms to standard 3.8.1 - * Update the FSF's address in debian/copyright - - -- Vincent Fourmond fourm...@debian.org Tue, 05 May 2009 20:26:09 +0200 - -jclassinfo (0.19.1-2) unstable; urgency=low - - * Make it team-maintained - * Added VCS fields - * Fixed copyright problems. - - -- Vincent Fourmond fourm...@debian.org Tue, 01 Jan 2008 19:32:35 +0100 - -jclassinfo (0.19.1-1) unstable; urgency=low - - * Initial release (Closes: #458062) - * 01-make-static-lib to link libjclass statically - * 02-use-stdin to have - work with the usual meaning -as an argument (this way, no need for temporary files for jar analysis). - - -- Vincent Fourmond fourm...@debian.org Fri, 28 Dec 2007 10:18:32 +0100 - Copied: tags/jclassinfo/0.19.1-6/debian/changelog (from rev 13549, trunk/jclassinfo/debian/changelog) === --- tags/jclassinfo/0.19.1-6/debian/changelog (rev 0) +++ tags/jclassinfo/0.19.1-6/debian/changelog 2011-04-17 21:58:07 UTC (rev 13550) @@ -0,0 +1,55 @@ +jclassinfo (0.19.1-6) unstable; urgency=low + + * Switch to dh 7 and its wonderful sequencer + * Bump compatibility level accordingly + * Now conforms to standards 3.9.2 + * Switch to format 3.0 (quilt) + * Drop dependencies on dpatch + * Drop README.source + * Now recognizing newer JVMs (closes: #623158) + * Find the flaw in the computations of the string size (closes: #613367) + + -- Vincent Fourmond fourm...@debian.org Sun, 17 Apr 2011 23:18:23 +0200 + +jclassinfo (0.19.1-5) unstable; urgency=low + + * patches/03-fix-malloc: fix a memory allocation error (closes: #550203) + * Now conforms to 3.8.3 + + -- Vincent Fourmond fourm...@debian.org Tue, 26 Jan 2010 21:03:03 +0100 + +jclassinfo (0.19.1-4) unstable; urgency=low + + * Definitely should go in Section: java... + + -- Vincent Fourmond fourm...@debian.org Tue, 05 May 2009 21:15:32 +0200 + +jclassinfo (0.19.1-3
[pkg-java] r13539 - in trunk: . libjaba-client-java libjaba-client-java/debian libjaba-client-java/debian/source
Author: fourmond
Date: 2011-04-16 19:43:17 + (Sat, 16 Apr 2011)
New Revision: 13539
Added:
trunk/libjaba-client-java/
trunk/libjaba-client-java/debian/
trunk/libjaba-client-java/debian/changelog
trunk/libjaba-client-java/debian/compat
trunk/libjaba-client-java/debian/control
trunk/libjaba-client-java/debian/copyright
trunk/libjaba-client-java/debian/javabuild
trunk/libjaba-client-java/debian/libjaba-client-java.dirs
trunk/libjaba-client-java/debian/libjaba-client-java.jlibs
trunk/libjaba-client-java/debian/rules
trunk/libjaba-client-java/debian/source/
trunk/libjaba-client-java/debian/source/format
Log:
[libjaba-client-java] Initial packaging
Property changes on: trunk/libjaba-client-java/debian
___
Added: mergeWithUpstream
+ 1
Added: trunk/libjaba-client-java/debian/changelog
===
--- trunk/libjaba-client-java/debian/changelog (rev 0)
+++ trunk/libjaba-client-java/debian/changelog 2011-04-16 19:43:17 UTC (rev
13539)
@@ -0,0 +1,5 @@
+libjaba-client-java (0-1~java1) unstable; urgency=low
+
+ * Initial release. (Closes: #623030)
+
+ -- Vincent Fourmond fourm...@debian.org Thu, 14 Apr 2011 22:03:33 +0200
Added: trunk/libjaba-client-java/debian/compat
===
--- trunk/libjaba-client-java/debian/compat (rev 0)
+++ trunk/libjaba-client-java/debian/compat 2011-04-16 19:43:17 UTC (rev
13539)
@@ -0,0 +1 @@
+7
Added: trunk/libjaba-client-java/debian/control
===
--- trunk/libjaba-client-java/debian/control(rev 0)
+++ trunk/libjaba-client-java/debian/control2011-04-16 19:43:17 UTC (rev
13539)
@@ -0,0 +1,20 @@
+Source: libjaba-client-java
+Section: java
+Priority: optional
+Maintainer: Vincent Fourmond fourm...@debian.org
+Build-Depends: debhelper (= 7.0.50~), javahelper, default-jdk,
+ liblog4j1.2-java
+Standards-Version: 3.9.2
+Homepage: http://www.compbio.dundee.ac.uk/jabaws/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjaba-client-java
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/libjaba-client-java
+
+
+Package: libjaba-client-java
+Architecture: all
+Depends: ${misc:Depends}, ${java:Depends}
+Description: minimal client for the JABAWS server
+ This package contains a library for building a client for the JABAWS
+ sequence alignment server.
+ .
+ This library is needed by jalview.
Added: trunk/libjaba-client-java/debian/copyright
===
--- trunk/libjaba-client-java/debian/copyright (rev 0)
+++ trunk/libjaba-client-java/debian/copyright 2011-04-16 19:43:17 UTC (rev
13539)
@@ -0,0 +1,50 @@
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=filerev=174
+Upstream-Name: JABAWS command-line client
+Source: http://www.compbio.dundee.ac.uk/jabaws/download.html
+ The source jar file actually found on that page is missing a few
+ bits, which were kindly provided privately by Peter Troshin. This
+ situation should improve soon enough.
+
+Files: *
+Copyright: 2009, 2010 by Peter Troshin
+License: Apache 2.0
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the License); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an AS IS BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian system, the full text of the license can be found at
+ /usr/share/common-licenses/Apache-2.0
+
+
+Files: debian/*
+Copyright: 2011 by Vincent Fourmond fourm...@debian.org
+License: GPL2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation
[pkg-java] r13530 - in trunk/jalview/debian: . wrappers
Author: fourmond Date: 2011-04-14 15:21:32 + (Thu, 14 Apr 2011) New Revision: 13530 Modified: trunk/jalview/debian/changelog trunk/jalview/debian/control trunk/jalview/debian/rules trunk/jalview/debian/watch trunk/jalview/debian/wrappers/jalview Log: [jalview] Updating for debian-packaged Jmol -- does not work yet ! Modified: trunk/jalview/debian/changelog === --- trunk/jalview/debian/changelog 2011-04-13 22:17:14 UTC (rev 13529) +++ trunk/jalview/debian/changelog 2011-04-14 15:21:32 UTC (rev 13530) @@ -19,5 +19,6 @@ * Dropping provided commons-logging.jar, (build)?-dep on libcommons-logging-java * Dropping provided regex.jar, (build)?-dep on libstevesoft-regex-java + * Dropping provided JMol.jar, now that jmol has been packaged for Debian ! - -- Vincent Fourmond fourm...@debian.org Sat, 28 Mar 2009 09:48:46 +0100 + -- Vincent Fourmond fourm...@debian.org Thu, 14 Apr 2011 16:52:07 +0200 Modified: trunk/jalview/debian/control === --- trunk/jalview/debian/control2011-04-13 22:17:14 UTC (rev 13529) +++ trunk/jalview/debian/control2011-04-14 15:21:32 UTC (rev 13530) @@ -7,7 +7,7 @@ libaxis-java, libwsdl4j-java, libgnujaf-java, libgnumail-java, liblog4j1.2-java, javahelp2, libcommons-discovery-java, libcommons-logging-java, - libstevesoft-regex-java + libstevesoft-regex-java, libjmol-java Standards-Version: 3.8.0 Homepage: http://www.jalview.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview @@ -20,7 +20,7 @@ java-wrappers (= 0.1.11), libxerces2-java, libxalan2-java, libaxis-java, libwsdl4j-java, libgnujaf-java, libgnumail-java, liblog4j1.2-java, javahelp2, libcommons-discovery-java, -libcommons-logging-java, libstevesoft-regex-java +libcommons-logging-java, libstevesoft-regex-java, libjmol-java Suggests: kalign, t-coffee, clustalw Description: multiple alignment editor JalView is a Java alignement editor that can work with sequence Modified: trunk/jalview/debian/rules === --- trunk/jalview/debian/rules 2011-04-13 22:17:14 UTC (rev 13529) +++ trunk/jalview/debian/rules 2011-04-14 15:21:32 UTC (rev 13530) @@ -24,35 +24,27 @@ DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar xml-api xercesImpl \ axis saaj gnumail wsdl4j activation jaxrpc log4j-1.2 \ - jhall commons-discovery commons-logging regex + jhall Jmol commons-discovery commons-logging regex # Additional arguments for ant, such as properties. ANT_ARGS := -DJALVIEW_VERSION=$(VERSION) -# Some comments here: -# libaxis-java -# - saaj.jar -# - jaxrpc.jar -# libwsdl4j-java -# - wsdl4j.jar -# libgnujaf-java -# - activation.jar -# javahelp2: -# - jhall.jar - # These are jar provided by the source tarball that should be installed # along with the program to make it work. # # AS LONG AS THIS VARIABLE EXISTS, UPLOAD TO MAIN, AND POSSIBLY TO NON-FREE, # IS IMPOSSIBLE ! BINARY_JARS = castor-1.1-cycle-xml.jar \ - Jmol-11.0.2.jar \ vamsas-client.jar # The source for castor-1.1-cycle-xml.jar can be found at # http://dist.codehaus.org/castor/1.1 # +# Apparently, jalview works with only the following (newer) files: +# - ./castor-1.3.1-xml +# - ./castor-1.3.1-core +# # By looking quickly at the src/build.xml file, it sounds as if it is # possible to only compile the xml part. Not sure if that makes sense, # or even if it would work, though... Modified: trunk/jalview/debian/watch === --- trunk/jalview/debian/watch 2011-04-13 22:17:14 UTC (rev 13529) +++ trunk/jalview/debian/watch 2011-04-14 15:21:32 UTC (rev 13530) @@ -6,5 +6,5 @@ # Compulsory line, this is a version 3 file version=3 -opts=dversionmangle=s/\.dfsg//,uversionmangle=s/_/./ \ +opts=dversionmangle=s/\.dfsg//,uversionmangle=s/_/./g\ http://www.jalview.org/source/source.html jalview_(.*)\.tar\.gz debian debian/new-upstream Modified: trunk/jalview/debian/wrappers/jalview === --- trunk/jalview/debian/wrappers/jalview 2011-04-13 22:17:14 UTC (rev 13529) +++ trunk/jalview/debian/wrappers/jalview 2011-04-14 15:21:32 UTC (rev 13530) @@ -8,7 +8,7 @@ find_jars activation axis jalview-castor-1.1-cycle-xml \ commons-discovery commons-logging jaxrpc \ -jhall jalview-Jmol-11.0.2 log4j-1.2 \ +jhall Jmol log4j-1.2 \ gnumail regex saaj jalview-vamsas-client \ wsdl4j xercesImpl xml-apis \ jalview ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r13532 - in trunk/jalview/debian: . patches source
Author: fourmond
Date: 2011-04-14 22:29:53 + (Thu, 14 Apr 2011)
New Revision: 13532
Added:
trunk/jalview/debian/javabuild
trunk/jalview/debian/source/
trunk/jalview/debian/source/format
Removed:
trunk/jalview/debian/patches/00list
trunk/jalview/debian/patches/10-build.dpatch
Modified:
trunk/jalview/debian/changelog
trunk/jalview/debian/control
trunk/jalview/debian/new-upstream
trunk/jalview/debian/rules
Log:
[jalview] Mutilation of my old packaging of jalview; there is still quite a lot
of work to do...
Modified: trunk/jalview/debian/changelog
===
--- trunk/jalview/debian/changelog 2011-04-14 21:37:44 UTC (rev 13531)
+++ trunk/jalview/debian/changelog 2011-04-14 22:29:53 UTC (rev 13532)
@@ -1,24 +1,9 @@
-jalview (2.4.dfsg-1) UNRELEASED unstable; urgency=low
+jalview (2.6.1.dfsg-1) unstable; urgency=low
- * DO NOT UPLOAD THIS PACKAGE: WORK IN PROGRESS !
* Initial release (Closes: #507436)
* Adding a debian/new-upstream script to repackage the original
-tarball, getting rid of the non-free bits.
- * debian/patches/10-build.dpatch: disable features that depends
-on things removed from the .dfsg tarball
- * Dropping provided xercesImpl.jar, (build)?-dep on libxerces2-java
- * Dropping provided xml-apis.jar, (build)?-dep on libxalan2-java
- * Dropping provided axis.jar and saaj.jar, (build)?-dep on libaxis-java
- * Also dropping jaxrpc.jar, also in libaxis-java
- * Dropping provided log4j-1.2.8.jar, (build)?-dep on liblog4j1.2-java
- * Dropping provided jhall.jar, (build)?-dep on javahelp2
- * debian/patches/10-build.dpatch: tweaked the classpath of the
-buildindices task for it to find the class.
- * Dropping provided commons-discovery.jar, (build)?-dep on
-libcommons-discovery-java
- * Dropping provided commons-logging.jar, (build)?-dep on
-libcommons-logging-java
- * Dropping provided regex.jar, (build)?-dep on libstevesoft-regex-java
- * Dropping provided JMol.jar, now that jmol has been packaged for Debian !
+tarball, getting rid of the bundled JAR file (I love JAR files)
+ * Using dh 7 and javahelper
+ * Using jh_build for building
- -- Vincent Fourmond fourm...@debian.org Thu, 14 Apr 2011 16:52:07 +0200
+ -- Vincent Fourmond fourm...@debian.org Fri, 15 Apr 2011 00:28:48 +0200
Modified: trunk/jalview/debian/control
===
--- trunk/jalview/debian/control2011-04-14 21:37:44 UTC (rev 13531)
+++ trunk/jalview/debian/control2011-04-14 22:29:53 UTC (rev 13532)
@@ -3,12 +3,14 @@
Priority: optional
Maintainer: Vincent Fourmond fourm...@debian.org
Build-Depends: cdbs, debhelper (= 7), default-jdk,
- ant, ant-optional, dpatch, libxerces2-java, libxalan2-java,
+ ant, ant-optional, libxerces2-java, libxalan2-java,
libaxis-java, libwsdl4j-java, libgnujaf-java,
libgnumail-java, liblog4j1.2-java, javahelp2,
libcommons-discovery-java, libcommons-logging-java,
- libstevesoft-regex-java, libjmol-java
-Standards-Version: 3.8.0
+ libstevesoft-regex-java, libjmol-java,
+ libcastor-xml-java, libvamsas-client-java,
+ javahelper
+Standards-Version: 3.9.2
Homepage: http://www.jalview.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/jalview
@@ -17,10 +19,7 @@
Package: jalview
Architecture: all
Depends: ${misc:Depends}, openjdk-6-jre | cacao-oj6-jre | java6-runtime,
-java-wrappers (= 0.1.11), libxerces2-java, libxalan2-java,
-libaxis-java, libwsdl4j-java, libgnujaf-java, libgnumail-java,
-liblog4j1.2-java, javahelp2, libcommons-discovery-java,
-libcommons-logging-java, libstevesoft-regex-java, libjmol-java
+java-wrappers (= 0.1.22), ${java:Depends}
Suggests: kalign, t-coffee, clustalw
Description: multiple alignment editor
JalView is a Java alignement editor that can work with sequence
Added: trunk/jalview/debian/javabuild
===
--- trunk/jalview/debian/javabuild (rev 0)
+++ trunk/jalview/debian/javabuild 2011-04-14 22:29:53 UTC (rev 13532)
@@ -0,0 +1 @@
+jalview.jar src
Modified: trunk/jalview/debian/new-upstream
===
--- trunk/jalview/debian/new-upstream 2011-04-14 21:37:44 UTC (rev 13531)
+++ trunk/jalview/debian/new-upstream 2011-04-14 22:29:53 UTC (rev 13532)
@@ -21,23 +21,18 @@
# We repackage the upstream source zip file:
tar xvz -C $dir -f $filename
-origname=jalview_$version.dfsg.orig.tar.gz
+origname=jalview_$version.dfsg.orig.tar.bz2
# We repackage excluding the lib/ subdir
cd $dir
# Removing the utils/ directory, not needed for build ?
rm -rf jalview*/utils
-# Remove
Bug#621857: dh sequencing isn't the same as cdbs sequencing
Package: javahelper Version: 0.32 Severity: normal Hello, I've just been hit by a problem with respect to the sequencing in dh: insert_after(jh_installlibs, jh_classpath); insert_after(jh_classpath, jh_manifest); This means that all manifest-related actions will be taken *AFTER* the installation of the jars, which is bad since that means that in the debian/package.classpath file for instance, one must specify the target rather than the source. While one would normally write stuff.jar first-dep.jar second.jar one has to write debian/stuff/usr/share/java/stuff-version.jar ... This is pretty painful at best ;-)... BTW, I'm grateful for javahelper ! I think that eventually all java libs should be transitioned to use it (well, at least those in control of the java team), that would make java packaging a great deal easier. Cheers, Vincent -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.38-2-amd64 (SMP w/2 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages javahelper depends on: ii bsdmainutils 8.2.2 collection of more utilities from ii dctrl-tools 2.18 Command-line tools to process Debi ii debhelper 8.1.3 helper programs for debian/rules ii devscripts2.10.71scripts to make the life of a Debi ii dpkg-dev 1.16.0.1 Debian package development tools ii fastjar 2:0.98-3 Jar creation utility ii libarchive-zip-perl 1.30-4 Perl module for manipulation of ZI javahelper recommends no packages. Versions of packages javahelper suggests: ii cvs 1:1.12.13-12 Concurrent Versions System ii gawk 1:3.1.7.dfsg-5 GNU awk, a pattern scanning and pr pn tofrodos none (no description available) -- no debconf information __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#621857: dh sequencing isn't the same as cdbs sequencing
Hi ! On 09/04/11 23:01, Niels Thykier wrote: I've just been hit by a problem with respect to the sequencing in dh: insert_after(jh_installlibs, jh_classpath); insert_after(jh_classpath, jh_manifest); Actually this was a deliberate choice, but we failed to convert cdbs to this as well (see the 0.32 changelog entry). I will reorder the cdbs sequence to match the DH one with the next upload. OK. Then please, update the examples in the tutorial to show that you can't use something like build/stuff.jar my classpath but you should use usr/share/java/stuff.jar my classpath ? (Did I actually get you right here) ? That would be very helpful, or, put it another way, not doing it would be misleading at best :-)... If you use the package files (debian/pkg.jlibs) then you can skip the debian/pkg part and you do not have to include the version either, since jh_manifest/jh_classpath are able to update manifests via a symlink. I am not sure how jh_manifest handled it before 0.32, but I rewrote it in perl, I made sure it worked correctly if it was passed a symlink (and jh_classpath uses jh_manifest). NB: The dependencies do not change in this case. I'm unsure what you mean by that... as fortunately jh_depends is run after the manifest-tweaking jh_... the depends substvar should be updated ? I would also very much like to see greater adoption of javahelper through the java packages. Particularly if we get the Java Library Transition part implemented (debated at DebConf10 and on list). For that you'll first need that classpath do reflect the actual dependencies, which I'm afraid is quite wrong (see our exchange on bug #620829). But I'm ready to invest some time to get that right. Cheers, Vincent -- Vincent Fourmond, Debian Developer http://vince-debian.blogspot.com/ A guess is just a guess until you turn it into a pie chart. Then it's an analysis. -- Scott Adams Vincent, listening to Dinosaur (Ke$ha) __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
[pkg-java] r13510 - in trunk/java-wrappers: . debian
Author: fourmond
Date: 2011-04-06 08:34:57 + (Wed, 06 Apr 2011)
New Revision: 13510
Modified:
trunk/java-wrappers/debian/changelog
trunk/java-wrappers/java-wrappers.sh
Log:
[java-wrappers] Fix a final glitch, ready for upload to unstable
Modified: trunk/java-wrappers/debian/changelog
===
--- trunk/java-wrappers/debian/changelog2011-04-05 23:58:10 UTC (rev
13509)
+++ trunk/java-wrappers/debian/changelog2011-04-06 08:34:57 UTC (rev
13510)
@@ -1,9 +1,9 @@
-java-wrappers (0.1.22) experimental; urgency=low
+java-wrappers (0.1.22) unstable; urgency=low
- * NOT RELEASABLE YET
* Now correctly following relative links from classpaths.
+ * Fix a final glitch, ready for upload to unstable
- -- Vincent Fourmond fourm...@debian.org Wed, 06 Apr 2011 01:56:41 +0200
+ -- Vincent Fourmond fourm...@debian.org Wed, 06 Apr 2011 10:33:57 +0200
java-wrappers (0.1.21) experimental; urgency=low
Modified: trunk/java-wrappers/java-wrappers.sh
===
--- trunk/java-wrappers/java-wrappers.sh2011-04-05 23:58:10 UTC (rev
13509)
+++ trunk/java-wrappers/java-wrappers.sh2011-04-06 08:34:57 UTC (rev
13510)
@@ -222,7 +222,7 @@
# Recursively adds the jar and its classpath to the classpath
_recurse_jar_classpath() {
if [ -r $1 ]; then
- if echo $JAVA_CLASSPATH | fgrep $1; then
+ if echo $JAVA_CLASSPATH | fgrep $1 /dev/null; then
return 0;
fi
JAVA_CLASSPATH=$JAVA_CLASSPATH:$1
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r13511 - in tags/java-wrappers: . 0.1.22 0.1.22/debian
Author: fourmond
Date: 2011-04-06 08:35:53 + (Wed, 06 Apr 2011)
New Revision: 13511
Added:
tags/java-wrappers/0.1.22/
tags/java-wrappers/0.1.22/debian/changelog
tags/java-wrappers/0.1.22/java-wrappers.sh
Removed:
tags/java-wrappers/0.1.22/debian/changelog
tags/java-wrappers/0.1.22/java-wrappers.sh
Log:
[svn-buildpackage] Tagging java-wrappers 0.1.22
Deleted: tags/java-wrappers/0.1.22/debian/changelog
===
--- trunk/java-wrappers/debian/changelog2011-04-04 19:20:12 UTC (rev
13505)
+++ tags/java-wrappers/0.1.22/debian/changelog 2011-04-06 08:35:53 UTC (rev
13511)
@@ -1,166 +0,0 @@
-java-wrappers (0.1.21) experimental; urgency=low
-
- * Final form of the find_jar_classpath function that now only performs
-path expansion for the argument, but not for the elements found in the
-manifests that should be full paths anyway (closes: #563197)
- * Trim down significantly the number of JVMs available, as fortunately
-the dozens-of-jvms dark age is long gone (closes: #612903)
- * Make it sure that mistakes such as find_java_runtime default-jre won't
-go unnoticed.
-
- -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 21:08:31 +0200
-
-java-wrappers (0.1.20) experimental; urgency=low
-
- * Adding unzip as we need it to get the classpath correctly...
- * Switch to dh 7
-
- -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 09:44:15 +0200
-
-java-wrappers (0.1.19) experimental; urgency=low
-
- * First draft of a recursive classpath resolution function.
-
- -- Vincent Fourmond fourm...@debian.org Sun, 03 Apr 2011 01:38:16 +0200
-
-java-wrappers (0.1.18) unstable; urgency=low
-
- * The let's break Java applications in Wheezy ! upload, or, in other
-words, upload to unstable
- * Switching to format 3.0 (native)
-
- -- Vincent Fourmond fourm...@debian.org Fri, 11 Feb 2011 13:35:24 +0100
-
-java-wrappers (0.1.17) experimental; urgency=low
-
- [ Gabriele Giacone ]
- * First step toward java-alternatives integration
-
- [ Vincent Fourmond ]
- * Final step (closes: #609731); thanks Gabriele for the first ;-)...
- * Conforms to standards 3.9.1
-
- -- Vincent Fourmond fourm...@debian.org Thu, 13 Jan 2011 23:01:43 +0100
-
-java-wrappers (0.1.16) unstable; urgency=low
-
- * Adding default as a valid jre choice, and make it the default for
-'all'; patch courtesy of Torsten Werner twer...@debian.org
-(closes: #580180)
- * Slightly arrange the documentation, which addresses to some extent bug
-#578944, but probably not satisfyingly enough.
- * Conforms to 3.8.4
- * Adding ${misc:Depends} for potential dh-induced dependencies
-
- -- Vincent Fourmond fourm...@debian.org Tue, 04 May 2010 23:42:54 +0200
-
-java-wrappers (0.1.15) unstable; urgency=low
-
- * Switch to Section java
-
- -- Vincent Fourmond fourm...@debian.org Wed, 29 Apr 2009 20:04:02 +0200
-
-java-wrappers (0.1.14) unstable; urgency=low
-
- * Fix absolute path in locate_jar (closes: #526087). Thanks to Paul
-Millar paul.mil...@desy.de for spotting and for the patch.
- * Conforms to 3.8.1
-
- -- Vincent Fourmond fourm...@debian.org Wed, 29 Apr 2009 19:13:40 +0200
-
-java-wrappers (0.1.13) unstable; urgency=low
-
- * Now that lenny is out, it's time to an upload to unstable !
-
- -- Vincent Fourmond fourm...@debian.org Sun, 15 Feb 2009 15:41:01 +0100
-
-java-wrappers (0.1.12) experimental; urgency=low
-
- * Now provides java2, java5 and java6 aliases that correspond respectively
-to the java2-runtime, java5-runtime and java6-runtime virtual packages
-(closes: #514339)
-
- -- Vincent Fourmond fourm...@debian.org Sun, 08 Feb 2009 16:38:13 +0100
-
-java-wrappers (0.1.11) experimental; urgency=low
-
- * Adding (back) the sunmin5 alias for jabref
-
- -- Vincent Fourmond fourm...@debian.org Sat, 22 Nov 2008 14:13:19 +0100
-
-java-wrappers (0.1.10) experimental; urgency=low
-
- * Added Vcs-* fields
- * Adding cacaooj6 runtime + adding it to the openjdk alias. (closes: #503819)
-
- -- Vincent Fourmond fourm...@debian.org Sun, 16 Nov 2008 03:17:33 +0100
-
-java-wrappers (0.1.9) experimental; urgency=low
-
- * Added a 'all' alias, and make find_java_runtime take no arguments
-as all
-
- -- Vincent Fourmond fourm...@debian.org Mon, 22 Sep 2008 23:57:26 +0200
-
-java-wrappers (0.1.8) experimental; urgency=low
-
- * The 'oops, I missed a syntax error release' - fix a missing
-fi in java-wrappers.sh
- * Fixed a few other syntax errors
-
- -- Vincent Fourmond fourm...@debian.org Tue, 16 Sep 2008 00:04:37 +0200
-
-java-wrappers (0.1.7) experimental; urgency=low
-
- * Rewrite of find_java_runtime in a much more flexible fashion...
-(closes: #494744)
-
- -- Vincent Fourmond fourm...@debian.org Tue, 22 Jul 2008 23:49:08 +0200
-
-java-wrappers (0.1.6) unstable; urgency=low
-
- * Add openjdk6 to the list of runtime flavors
- * java-wrappers.sh now understands a JAVA_FLAVOR environment
[pkg-java] r13509 - in trunk/java-wrappers: . debian
Author: fourmond
Date: 2011-04-05 23:58:10 + (Tue, 05 Apr 2011)
New Revision: 13509
Modified:
trunk/java-wrappers/debian/changelog
trunk/java-wrappers/java-wrappers.sh
Log:
[java-wrappers] Now correctly following relative paths from the Class-Path
attribute
Modified: trunk/java-wrappers/debian/changelog
===
--- trunk/java-wrappers/debian/changelog2011-04-05 03:50:37 UTC (rev
13508)
+++ trunk/java-wrappers/debian/changelog2011-04-05 23:58:10 UTC (rev
13509)
@@ -1,3 +1,10 @@
+java-wrappers (0.1.22) experimental; urgency=low
+
+ * NOT RELEASABLE YET
+ * Now correctly following relative links from classpaths.
+
+ -- Vincent Fourmond fourm...@debian.org Wed, 06 Apr 2011 01:56:41 +0200
+
java-wrappers (0.1.21) experimental; urgency=low
* Final form of the find_jar_classpath function that now only performs
Modified: trunk/java-wrappers/java-wrappers.sh
===
--- trunk/java-wrappers/java-wrappers.sh2011-04-05 03:50:37 UTC (rev
13508)
+++ trunk/java-wrappers/java-wrappers.sh2011-04-05 23:58:10 UTC (rev
13509)
@@ -229,10 +229,11 @@
java_debug Looking at classpath of jar: '$1'
for jar in $(/usr/lib/java-wrappers/get-classpath $1); do
if [ ${jar##/} = $jar ]; then
- java_warning jar file $1 contains relative classpath element:
$jar
- else
- _recurse_jar_classpath $jar;
+ # Relative path = path relative to the location of the
+ # JAR file !
+ jar=$(dirname $1)/$jar
fi
+ _recurse_jar_classpath $jar;
done
else
java_debug Unable to find file $1 that may be needed
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r13496 - trunk/java-wrappers/debian
Author: fourmond Date: 2011-04-04 08:22:34 + (Mon, 04 Apr 2011) New Revision: 13496 Modified: trunk/java-wrappers/debian/changelog trunk/java-wrappers/debian/control trunk/java-wrappers/debian/rules Log: [java-wrappers] Switch to dh 7 Modified: trunk/java-wrappers/debian/changelog === --- trunk/java-wrappers/debian/changelog2011-04-04 04:27:03 UTC (rev 13495) +++ trunk/java-wrappers/debian/changelog2011-04-04 08:22:34 UTC (rev 13496) @@ -2,8 +2,9 @@ * NOT RELEASED YET * Adding unzip as we need it to get the classpath correctly... + * Switch to dh 7 - -- Vincent Fourmond fourm...@debian.org Sun, 03 Apr 2011 01:53:18 +0200 + -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 09:44:15 +0200 java-wrappers (0.1.19) experimental; urgency=low Modified: trunk/java-wrappers/debian/control === --- trunk/java-wrappers/debian/control 2011-04-04 04:27:03 UTC (rev 13495) +++ trunk/java-wrappers/debian/control 2011-04-04 08:22:34 UTC (rev 13496) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org Uploaders: Vincent Fourmond fourm...@debian.org -Build-Depends: debhelper (= 5) +Build-Depends: debhelper (= 7) Standards-Version: 3.9.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java-wrappers Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/java-wrappers Modified: trunk/java-wrappers/debian/rules === --- trunk/java-wrappers/debian/rules2011-04-04 04:27:03 UTC (rev 13495) +++ trunk/java-wrappers/debian/rules2011-04-04 08:22:34 UTC (rev 13496) @@ -1,46 +1,3 @@ #!/usr/bin/make -f -# MAde with the aid of dh_make, by Craig Small -# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. -# Some lines taken from debmake, by Cristoph Lameter. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -clean: - dh_testdir - dh_testroot - dh_clean - -install: install-stamp -install-stamp: - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - touch install-stamp - -binary-arch: - -# Build architecture-independent files here. -# Pass -i to all debhelper commands in this target to reduce clutter. -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_installdocs -i - dh_installexamples -i - dh_installman -i - dh_install -i - dh_installchangelogs -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +%: + dh $@ ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r13498 - in tags/java-wrappers: . 0.1.20 0.1.20/debian
Author: fourmond
Date: 2011-04-04 08:25:44 + (Mon, 04 Apr 2011)
New Revision: 13498
Added:
tags/java-wrappers/0.1.20/
tags/java-wrappers/0.1.20/debian/changelog
tags/java-wrappers/0.1.20/debian/control
tags/java-wrappers/0.1.20/debian/java-wrappers.install
tags/java-wrappers/0.1.20/debian/rules
tags/java-wrappers/0.1.20/get-classpath
tags/java-wrappers/0.1.20/java-wrappers.sh
Removed:
tags/java-wrappers/0.1.20/debian/changelog
tags/java-wrappers/0.1.20/debian/control
tags/java-wrappers/0.1.20/debian/java-wrappers.install
tags/java-wrappers/0.1.20/debian/rules
tags/java-wrappers/0.1.20/java-wrappers.sh
Log:
[svn-buildpackage] Tagging java-wrappers 0.1.20
Deleted: tags/java-wrappers/0.1.20/debian/changelog
===
--- trunk/java-wrappers/debian/changelog2011-04-01 09:47:57 UTC (rev
13487)
+++ tags/java-wrappers/0.1.20/debian/changelog 2011-04-04 08:25:44 UTC (rev
13498)
@@ -1,141 +0,0 @@
-java-wrappers (0.1.18) unstable; urgency=low
-
- * The let's break Java applications in Wheezy ! upload, or, in other
-words, upload to unstable
- * Switching to format 3.0 (native)
-
- -- Vincent Fourmond fourm...@debian.org Fri, 11 Feb 2011 13:35:24 +0100
-
-java-wrappers (0.1.17) experimental; urgency=low
-
- [ Gabriele Giacone ]
- * First step toward java-alternatives integration
-
- [ Vincent Fourmond ]
- * Final step (closes: #609731); thanks Gabriele for the first ;-)...
- * Conforms to standards 3.9.1
-
- -- Vincent Fourmond fourm...@debian.org Thu, 13 Jan 2011 23:01:43 +0100
-
-java-wrappers (0.1.16) unstable; urgency=low
-
- * Adding default as a valid jre choice, and make it the default for
-'all'; patch courtesy of Torsten Werner twer...@debian.org
-(closes: #580180)
- * Slightly arrange the documentation, which addresses to some extent bug
-#578944, but probably not satisfyingly enough.
- * Conforms to 3.8.4
- * Adding ${misc:Depends} for potential dh-induced dependencies
-
- -- Vincent Fourmond fourm...@debian.org Tue, 04 May 2010 23:42:54 +0200
-
-java-wrappers (0.1.15) unstable; urgency=low
-
- * Switch to Section java
-
- -- Vincent Fourmond fourm...@debian.org Wed, 29 Apr 2009 20:04:02 +0200
-
-java-wrappers (0.1.14) unstable; urgency=low
-
- * Fix absolute path in locate_jar (closes: #526087). Thanks to Paul
-Millar paul.mil...@desy.de for spotting and for the patch.
- * Conforms to 3.8.1
-
- -- Vincent Fourmond fourm...@debian.org Wed, 29 Apr 2009 19:13:40 +0200
-
-java-wrappers (0.1.13) unstable; urgency=low
-
- * Now that lenny is out, it's time to an upload to unstable !
-
- -- Vincent Fourmond fourm...@debian.org Sun, 15 Feb 2009 15:41:01 +0100
-
-java-wrappers (0.1.12) experimental; urgency=low
-
- * Now provides java2, java5 and java6 aliases that correspond respectively
-to the java2-runtime, java5-runtime and java6-runtime virtual packages
-(closes: #514339)
-
- -- Vincent Fourmond fourm...@debian.org Sun, 08 Feb 2009 16:38:13 +0100
-
-java-wrappers (0.1.11) experimental; urgency=low
-
- * Adding (back) the sunmin5 alias for jabref
-
- -- Vincent Fourmond fourm...@debian.org Sat, 22 Nov 2008 14:13:19 +0100
-
-java-wrappers (0.1.10) experimental; urgency=low
-
- * Added Vcs-* fields
- * Adding cacaooj6 runtime + adding it to the openjdk alias. (closes: #503819)
-
- -- Vincent Fourmond fourm...@debian.org Sun, 16 Nov 2008 03:17:33 +0100
-
-java-wrappers (0.1.9) experimental; urgency=low
-
- * Added a 'all' alias, and make find_java_runtime take no arguments
-as all
-
- -- Vincent Fourmond fourm...@debian.org Mon, 22 Sep 2008 23:57:26 +0200
-
-java-wrappers (0.1.8) experimental; urgency=low
-
- * The 'oops, I missed a syntax error release' - fix a missing
-fi in java-wrappers.sh
- * Fixed a few other syntax errors
-
- -- Vincent Fourmond fourm...@debian.org Tue, 16 Sep 2008 00:04:37 +0200
-
-java-wrappers (0.1.7) experimental; urgency=low
-
- * Rewrite of find_java_runtime in a much more flexible fashion...
-(closes: #494744)
-
- -- Vincent Fourmond fourm...@debian.org Tue, 22 Jul 2008 23:49:08 +0200
-
-java-wrappers (0.1.6) unstable; urgency=low
-
- * Add openjdk6 to the list of runtime flavors
- * java-wrappers.sh now understands a JAVA_FLAVOR environment variable.
- * Already conforms to policy 3.8.0
-
- -- Vincent Fourmond fourm...@debian.org Sat, 19 Jul 2008 22:59:31 +0200
-
-java-wrappers (0.1.5) unstable; urgency=low
-
- * Fix the pattern for conjuring up a JAVA_HOME when it is missing.
-(closes: #478054)
-
- -- Vincent Fourmond fourm...@debian.org Sat, 03 May 2008 09:30:16 +0200
-
-java-wrappers (0.1.4) unstable; urgency=low
-
- * Improved find_java_runtime to take several arguments
-
- -- Vincent Fourmond fourm...@debian.org Wed, 27 Feb 2008 00:42:03 +0100
-
-java-wrappers (0.1.3) unstable; urgency=low
-
- * Small documentation fixes
- * Fix small typos in java-wrappers.sh
- * Fix
[pkg-java] r13500 - in tags/statcvs: . 1:0.7.0.dfsg-3/debian 1:0.7.0.dfsg-3/debian/wrappers
Author: fourmond
Date: 2011-04-04 08:37:57 + (Mon, 04 Apr 2011)
New Revision: 13500
Added:
tags/statcvs/1:0.7.0.dfsg-3/
tags/statcvs/1:0.7.0.dfsg-3/debian/changelog
tags/statcvs/1:0.7.0.dfsg-3/debian/control
tags/statcvs/1:0.7.0.dfsg-3/debian/rules
tags/statcvs/1:0.7.0.dfsg-3/debian/statcvs.classpath
tags/statcvs/1:0.7.0.dfsg-3/debian/statcvs.install
tags/statcvs/1:0.7.0.dfsg-3/debian/statcvs.jlibs
tags/statcvs/1:0.7.0.dfsg-3/debian/wrappers/statcvs
Removed:
tags/statcvs/1:0.7.0.dfsg-3/debian/changelog
tags/statcvs/1:0.7.0.dfsg-3/debian/control
tags/statcvs/1:0.7.0.dfsg-3/debian/rules
tags/statcvs/1:0.7.0.dfsg-3/debian/wrappers/statcvs
Log:
[svn-buildpackage] Tagging statcvs 1:0.7.0.dfsg-3
Deleted: tags/statcvs/1:0.7.0.dfsg-3/debian/changelog
===
--- trunk/statcvs/debian/changelog 2011-04-01 09:47:57 UTC (rev 13487)
+++ tags/statcvs/1:0.7.0.dfsg-3/debian/changelog2011-04-04 08:37:57 UTC
(rev 13500)
@@ -1,172 +0,0 @@
-statcvs (1:0.7.0.dfsg-1) experimental; urgency=low
-
- * Newer upstream release
- * Switch to format 3.0 (quilt), and convert patches to the quilt format,
-drop dependency on dpatch
- * Refresh/update patches
- * Breaks and conflict with statsvn 0.7.0
- * Conforms to newer standards
- * Uploading to experimental to allow for some time to prepare statsvn
- * Getting rid of debian/README.source, obsoleted by the use of 3.0 (quilt)
- * debian/new-upstream now compresses using bzip2: no need to use more
-space than necessary...
-
- -- Vincent Fourmond fourm...@debian.org Sat, 06 Mar 2010 23:11:15 +0100
-
-statcvs (1:0.5.0.dfsg-2) unstable; urgency=low
-
- * Moved to Section: vcs
- * Breaks statsvn 0.4
- * Works fine with statsvn 0.5, upload to unstable
-
- -- Vincent Fourmond fourm...@debian.org Mon, 22 Jun 2009 20:56:58 +0200
-
-statcvs (1:0.5.0.dfsg-1) experimental; urgency=low
-
- * New upstream release.
- * Already conforms to standards 3.8.2
- * Add a ${misc:Depends} for potential debhelper-induced dependencies
- * Bump debhelper compatibility level to 5
- * Add ant clean in debian/new-upstream to avoid adding temporary files
-in the orig tarball
- * Refreshed debian/patches/01-disable-unjar
- * Upload to experimental to allow for tests with statsvn
- * I have finally learned how to use DEB_UPSTREAM_VERSION...
- * This version requires libjfreechart-java version 1.0.13
- * Disable tests from the build system, as their source isn't provided.
-
- -- Vincent Fourmond fourm...@debian.org Sun, 21 Jun 2009 16:17:45 +0200
-
-statcvs (1:0.4.0.dfsg-3) unstable; urgency=low
-
- * Document patches, to make lintian a fair deal happier
- * Add a debian/README.source file to comply with standards 3.8.0
- * Replace the dependency on libjdom-java by libjdom1-java and update
-debian/wrappers/statcvs and debian/rules accordingly (closes: #502037)
-
- -- Vincent Fourmond fourm...@debian.org Mon, 13 Oct 2008 21:02:42 +0200
-
-statcvs (1:0.4.0.dfsg-2) unstable; urgency=low
-
- * Conflicts with older statsvn, as statsvn crashes with the newer
-statcvs
-
- -- Vincent Fourmond fourm...@debian.org Sat, 28 Jun 2008 15:28:09 +0200
-
-statcvs (1:0.4.0.dfsg-1) unstable; urgency=low
-
- * New upstream release (closes: #481798):
-- updated debian/new-upstream to cope for the new test
- files in the archive
-- Updated 01-disable-unjar, to remove various tests and to
- have jar as the default build target.
-- Disabling 10-fix-null-exception, not needed anymore
- * Now depends on libjdom-java as well
- * Fix the old-fsf-address-in-copyright-file lintian warning
- * Improved manual page
- * Updated debian/new-upstream to strip the sourceless jtreemap jar
-from upstream's archive
- * 10-disable-jtreemap to disable the generation of the page with
-jtreemap-based map display
- * Updated REAME.Debian
-
- -- Vincent Fourmond fourm...@debian.org Sat, 28 Jun 2008 13:14:09 +0200
-
-statcvs (1:0.3.dfsg+1-1) unstable; urgency=low
-
- * Re-uploading with a new source, so the package isn't sourceless
-in debian (work-around for a dak bug, Closes: #477381)
-
- -- Vincent Fourmond fourm...@debian.org Fri, 11 Apr 2008 00:10:05 +0200
-
-statcvs (1:0.3.dfsg-4) unstable; urgency=low
-
- * The 'oops, I should not forget again to upload the source when
-I move from contrib to main' release
-
- -- Vincent Fourmond fourm...@debian.org Fri, 11 Apr 2008 00:03:56 +0200
-
-statcvs (1:0.3.dfsg-3) unstable; urgency=low
-
- * Fix manual page: statcvs does not have info documentation !
- * Fix another glitch in manual page
- * statcvs can now move to main (Closes: #463520)
- * Remove last remaining file not in the debian/ subdir,
-so lintian is happy
-
- -- Vincent Fourmond fourm...@debian.org Thu, 10 Apr 2008 23:25:02 +0200
-
-statcvs (1:0.3.dfsg-2) unstable; urgency=low
-
- * Switched to using java-wrappers, adapted
[pkg-java] r13501 - in trunk/statsvn/debian: . patches wrappers
Author: fourmond
Date: 2011-04-04 15:19:44 + (Mon, 04 Apr 2011)
New Revision: 13501
Added:
trunk/statsvn/debian/statsvn.classpath
trunk/statsvn/debian/statsvn.install
trunk/statsvn/debian/statsvn.jlibs
Modified:
trunk/statsvn/debian/changelog
trunk/statsvn/debian/control
trunk/statsvn/debian/patches/15-build-xml-build-jar-only.diff
trunk/statsvn/debian/rules
trunk/statsvn/debian/wrappers/statsvn
Log:
[statsvn] Now using javahelper + the new features of java-wrappers
Modified: trunk/statsvn/debian/changelog
===
--- trunk/statsvn/debian/changelog 2011-04-04 08:37:57 UTC (rev 13500)
+++ trunk/statsvn/debian/changelog 2011-04-04 15:19:44 UTC (rev 13501)
@@ -1,3 +1,12 @@
+statsvn (0.7.0.dfsg-4) experimental; urgency=low
+
+ * Now using javahelper, thanks to mjj29 !
+ * Now specifying a real classpath
+ * Letting java-wrappers find the classpath itself.
+ * Now almost using upstream target for building the jar
+
+ -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 17:12:20 +0200
+
statsvn (0.7.0.dfsg-3) unstable; urgency=low
* Add libjdom1-java to dependencies + add jdom1 in the classpath
Modified: trunk/statsvn/debian/control
===
--- trunk/statsvn/debian/control2011-04-04 08:37:57 UTC (rev 13500)
+++ trunk/statsvn/debian/control2011-04-04 15:19:44 UTC (rev 13501)
@@ -5,7 +5,7 @@
Uploaders: Vincent Fourmond fourm...@debian.org
Build-Depends: cdbs, debhelper (= 5), ant, libbackport-util-concurrent-java,
libjcommon-java, libjfreechart-java, statcvs (= 1:0.5.0), default-jdk,
- libsvnkit-java, libjdom1-java
+ libsvnkit-java, libjdom1-java, javahelper (= 0.19)
Standards-Version: 3.9.1
Homepage: http://www.statsvn.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/statsvn
@@ -14,10 +14,9 @@
Package: statsvn
Architecture: all
-Depends: java-gcj-compat | java-runtime, libjcommon-java,
- libjfreechart-java, libbackport-util-concurrent-java, statcvs (= 1:0.7.0),
- subversion, java-wrappers (= 0.1.16), ${misc:Depends},
- libsvnkit-java, libjdom1-java
+Depends: java-gcj-compat | java-runtime, ${java:Depends},
+ statcvs (= 1:0.7.0), subversion, java-wrappers (= 0.1.20),
+ ${misc:Depends}
Description: SVN repository statistics
StatSVN retrieves information from a Subversion repository and generates
various tables and charts describing the project evolution, e.g.
Modified: trunk/statsvn/debian/patches/15-build-xml-build-jar-only.diff
===
--- trunk/statsvn/debian/patches/15-build-xml-build-jar-only.diff
2011-04-04 08:37:57 UTC (rev 13500)
+++ trunk/statsvn/debian/patches/15-build-xml-build-jar-only.diff
2011-04-04 15:19:44 UTC (rev 13501)
@@ -6,8 +6,8 @@
@DPATCH@
Index: statsvn-0.7.0.dfsg/build.xml
===
statsvn-0.7.0.dfsg.orig/build.xml 2010-03-08 20:25:30.347534255 +0100
-+++ statsvn-0.7.0.dfsg/build.xml 2010-03-08 20:25:34.015528882 +0100
+--- statsvn-0.7.0.dfsg.orig/build.xml 2011-04-04 17:02:57.269898047 +0200
statsvn-0.7.0.dfsg/build.xml 2011-04-04 17:04:41.013898105 +0200
@@ -1,6 +1,6 @@
?xml version=1.0 encoding=ISO-8859-1?
@@ -16,17 +16,19 @@
property file=project.properties /
property name=project value=statsvn /
-@@ -93,6 +93,13 @@
- /java
+@@ -132,15 +132,6 @@
/target
-+ target name=jar depends=compile,copyfiles
-+ !-- Creates an executable jar file for the project --
-+ mkdir dir=${dist} /
-+ jar jarfile=${dist}/${project.jar} basedir=${build} /
-+ /target
-+
-+
- target name=init.tests
- !-- Create the build directory structure used by compile.tests
--
- mkdir dir=${build.tests} /
+ target name=dist depends=compile,copyfiles
+- !-- Creates an executable jar file for the project --
+- unjar src=${lib}/${statcvs.jar} dest=${build} /
+- !-- Expand and use the concurrent JAR --
+- unjar src=${lib}/${concurrent.jar} dest=${build} /
+-
+- !-- Now included in statcvs.jar --
+- !--unjar src=${lib}/${jfreechart.jar} dest=${build} /
+- unjar src=${lib}/${jcommon.jar} dest=${build} /--
+-
+ mkdir dir=${dist} /
+ jar jarfile=${dist}/${project.jar} basedir=${build}
+ manifest
Modified: trunk/statsvn/debian/rules
===
--- trunk/statsvn/debian/rules 2011-04-04 08:37:57 UTC (rev 13500)
+++ trunk/statsvn/debian/rules 2011-04-04 15:19:44 UTC (rev 13501)
@@ -1,35 +1,24 @@
#!/usr/bin/make -f
# debian/rules for statsvn, based on the one from Batik (uses CDBS)
-# Uncomment this to turn
[pkg-java] r13502 - in tags/statsvn: . 0.7.0.dfsg-4/debian 0.7.0.dfsg-4/debian/patches 0.7.0.dfsg-4/debian/wrappers
Author: fourmond
Date: 2011-04-04 15:26:31 + (Mon, 04 Apr 2011)
New Revision: 13502
Added:
tags/statsvn/0.7.0.dfsg-4/
tags/statsvn/0.7.0.dfsg-4/debian/changelog
tags/statsvn/0.7.0.dfsg-4/debian/control
tags/statsvn/0.7.0.dfsg-4/debian/patches/15-build-xml-build-jar-only.diff
tags/statsvn/0.7.0.dfsg-4/debian/rules
tags/statsvn/0.7.0.dfsg-4/debian/statsvn.classpath
tags/statsvn/0.7.0.dfsg-4/debian/statsvn.install
tags/statsvn/0.7.0.dfsg-4/debian/statsvn.jlibs
tags/statsvn/0.7.0.dfsg-4/debian/wrappers/statsvn
Removed:
tags/statsvn/0.7.0.dfsg-4/debian/changelog
tags/statsvn/0.7.0.dfsg-4/debian/control
tags/statsvn/0.7.0.dfsg-4/debian/patches/15-build-xml-build-jar-only.diff
tags/statsvn/0.7.0.dfsg-4/debian/rules
tags/statsvn/0.7.0.dfsg-4/debian/wrappers/statsvn
Log:
[svn-buildpackage] Tagging statsvn 0.7.0.dfsg-4
Deleted: tags/statsvn/0.7.0.dfsg-4/debian/changelog
===
--- trunk/statsvn/debian/changelog 2011-04-01 09:47:57 UTC (rev 13487)
+++ tags/statsvn/0.7.0.dfsg-4/debian/changelog 2011-04-04 15:26:31 UTC (rev
13502)
@@ -1,90 +0,0 @@
-statsvn (0.7.0.dfsg-3) unstable; urgency=low
-
- * Add libjdom1-java to dependencies + add jdom1 in the classpath
-to fix class not found exception when generating XML (closes: #616412)
- * Tighten up dependencies on more recent versions of java-wrapper
-
- -- Vincent Fourmond fourm...@debian.org Wed, 23 Mar 2011 11:01:07 +0100
-
-statsvn (0.7.0.dfsg-2) unstable; urgency=low
-
- * Pull option documentation from upstream's wiki:
-http://wiki.statsvn.org/Default.aspx?Page=User Manual (closes: 576664)
-Thanks to Mathieu Malaterre for pointing out.
-
- -- Vincent Fourmond fourm...@debian.org Tue, 06 Apr 2010 22:24:27 +0200
-
-statsvn (0.7.0.dfsg-1) unstable; urgency=low
-
- * New upstream release (closes: #572613)
- * Switch to source format 3.0 (quilt)
- * Drop build-dependency on dpatch, now unneeded
- * Now conforms to standards 3.8.4
- * Switch to a dependency on default-jdk for building
- * Now depends on libsvnkit-java
- * Manual page updates.
-
- -- Vincent Fourmond fourm...@debian.org Tue, 16 Mar 2010 21:32:06 +0100
-
-statsvn (0.5.0.dfsg-1) unstable; urgency=low
-
- * New upstream release
- * Updated the debian/new-upstream script to remove extraneous files.
- * Moved to the new section vcs
- * Needs statcvs 0.5.0 or later.
- * Added ${misc:Depends} for debhelper-induced dependencies
- * Bumped debhelper compatibility level to 5
- * Added a debian/README.source file to explain the patch system
- * Now conforms to standards 3.8.2
-
- -- Vincent Fourmond fourm...@debian.org Mon, 22 Jun 2009 20:32:34 +0200
-
-statsvn (0.4.0.dfsg-1) unstable; urgency=low
-
- * New upstream version (closes: #481799)
- * Does not work with older statcvs, tightening up dependencies
- * statsvn still complains about files with spaces within, but
-it does not seem to affect statistics anymore, so it
-closes: #469937,#469938
-
- -- Vincent Fourmond fourm...@debian.org Sat, 28 Jun 2008 15:53:07 +0200
-
-statsvn (0.3.1.dfsg+1-1) unstable; urgency=low
-
- [ Michael Koch ]
- * Updated watch file to remove .dfsg part from debian version before
-comparison.
-
- [ Vincent Fourmond ]
- * Now that statcvs has moved to main, statsvn also works fine
-within main; moving there (closes: #469820)
-
- -- Vincent Fourmond fourm...@debian.org Sat, 19 Apr 2008 21:13:17 +0200
-
-statsvn (0.3.1.dfsg-3) unstable; urgency=low
-
- * The 'Whoa I never uploaded two versions that close together' release
- * statsvn must of course Depend on java-wrappers... (closes: #470394)
-
- -- Vincent Fourmond fourm...@debian.org Mon, 10 Mar 2008 23:40:29 +0100
-
-statsvn (0.3.1.dfsg-2) unstable; urgency=low
-
- * Move subversion to Depends, as it is truly required
- * Document -tags in the manual page, patch courtesy of
-Emmanuel Fleury fle...@labri.fr (closes: #470252)
-
- -- Vincent Fourmond fourm...@debian.org Mon, 10 Mar 2008 23:08:05 +0100
-
-statsvn (0.3.1.dfsg-1) unstable; urgency=low
-
- * Initial release (Closes: 456250)
- * 10-build-xml-classpath to get it to build with debian packages
- * 15-build-xml-build-jar-only to tweak the build system to get a
-jar containing only statsvn code (and not many more as upstreams').
- * 20-disable-jtreemap to disable the jtreemap-based report, as jtreemap
-is not currently packaged for Debian
- * Wrote a manual page, based on the one from statcvs
- * Updated FSF's address in debian/copyright
-
- -- Vincent Fourmond fourm...@debian.org Wed, 05 Mar 2008 00:29:20 +0100
Copied: tags/statsvn/0.7.0.dfsg-4/debian/changelog (from rev 13501,
trunk/statsvn/debian/changelog)
===
--- tags/statsvn/0.7.0.dfsg-4/debian/changelog (rev 0)
+++ tags/statsvn/0.7.0.dfsg-4/debian/changelog 2011-04-04 15:26:31 UTC (rev
[pkg-java] r13503 - in trunk/java-wrappers: . debian
Author: fourmond
Date: 2011-04-04 18:35:33 + (Mon, 04 Apr 2011)
New Revision: 13503
Modified:
trunk/java-wrappers/debian/changelog
trunk/java-wrappers/java-wrappers.sh
Log:
[java-wrappers] Finalize the form of find_jar_classpath
Modified: trunk/java-wrappers/debian/changelog
===
--- trunk/java-wrappers/debian/changelog2011-04-04 15:26:31 UTC (rev
13502)
+++ trunk/java-wrappers/debian/changelog2011-04-04 18:35:33 UTC (rev
13503)
@@ -1,3 +1,11 @@
+java-wrappers (0.1.21) experimental; urgency=low
+
+ * Final form of the find_jar_classpath function that now only performs
+path expansion for the argument, but not for the elements found in the
+manifests that should be full paths anyway.
+
+ -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 20:31:36 +0200
+
java-wrappers (0.1.20) experimental; urgency=low
* Adding unzip as we need it to get the classpath correctly...
Modified: trunk/java-wrappers/java-wrappers.sh
===
--- trunk/java-wrappers/java-wrappers.sh2011-04-04 15:26:31 UTC (rev
13502)
+++ trunk/java-wrappers/java-wrappers.sh2011-04-04 18:35:33 UTC (rev
13503)
@@ -171,7 +171,7 @@
# If the user provides a JAVA_FLAVOR environment variable, we
-# force the runtime to be the given flavor, such as for fund_java_runtime
+# force the runtime to be the given flavor, such as for find_java_runtime
if [ $JAVA_FLAVOR ]; then
find_java_runtime $JAVA_FLAVOR || \
java_warning Could not find runtime for user-supplied flavor
'${JAVA_FLAVOR}
@@ -215,6 +215,27 @@
done
}
+# Recursively adds the jar and its classpath to the classpath
+_recurse_jar_classpath() {
+if [ -r $1 ]; then
+ if echo $JAVA_CLASSPATH | fgrep $1; then
+ return 0;
+ fi
+ JAVA_CLASSPATH=$JAVA_CLASSPATH:$1
+ java_debug Looking at classpath of jar: '$1'
+ for jar in $(/usr/lib/java-wrappers/get-classpath $1); do
+ if [ ${jar##/} = $jar ]; then
+ java_warning jar file $1 contains relative classpath element:
$jar
+ else
+ _recurse_jar_classpath $jar;
+ fi
+ done
+else
+ java_debug Unable to find file $1 that may be needed
+ return 1;
+fi
+}
+
# This function tries to mimick the behaviour of the -jar option of
# the java executable, by adding the target jar and all its classpath
# recursively.
@@ -227,15 +248,9 @@
find_jar_classpath() {
if locate_jar $1; then
looked_for_jars=1
- if echo $JAVA_CLASSPATH | grep found_jar; then
- return 0;
- fi
- JAVA_CLASSPATH=$JAVA_CLASSPATH:$found_jar
- for jar in $(/usr/lib/java-wrappers/get-classpath $found_jar); do
- find_jar_classpath $jar;
- done
+ _recurse_jar_classpath $found_jar
else
- java_warning Unable to locate the necessary jar file $jar
+ java_warn Unable to find the jar file $jar
return 1;
fi
}
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r13504 - in trunk/java-wrappers: . debian
Author: fourmond
Date: 2011-04-04 19:10:52 + (Mon, 04 Apr 2011)
New Revision: 13504
Modified:
trunk/java-wrappers/debian/changelog
trunk/java-wrappers/java-wrappers.sh
trunk/java-wrappers/jvm-list.sh
Log:
[java-wrappers] Severely trim down the list of valid JVMs + ensure the likes of
find_java_runtime default-jre are spotted in due time
Modified: trunk/java-wrappers/debian/changelog
===
--- trunk/java-wrappers/debian/changelog2011-04-04 18:35:33 UTC (rev
13503)
+++ trunk/java-wrappers/debian/changelog2011-04-04 19:10:52 UTC (rev
13504)
@@ -2,9 +2,13 @@
* Final form of the find_jar_classpath function that now only performs
path expansion for the argument, but not for the elements found in the
-manifests that should be full paths anyway.
+manifests that should be full paths anyway (closes: #563197)
+ * Trim down significantly the number of JVMs available, as fortunately
+the dozens-of-jvms dark age is long gone (closes: #612903)
+ * Make it sure that mistakes such as find_java_runtime default-jre won't
+go unnoticed.
- -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 20:31:36 +0200
+ -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 21:08:31 +0200
java-wrappers (0.1.20) experimental; urgency=low
Modified: trunk/java-wrappers/java-wrappers.sh
===
--- trunk/java-wrappers/java-wrappers.sh2011-04-04 18:35:33 UTC (rev
13503)
+++ trunk/java-wrappers/java-wrappers.sh2011-04-04 19:10:52 UTC (rev
13504)
@@ -105,13 +105,17 @@
while test $1
do
- found_jvm=$(eval echo -n \$__jvm_$1)
- if [ -z $found_jvm ]; then
- java_warning JVM flavor '${1:-none}' not understood
+ if echo $1 | egrep -- '[^0-9A-Za-z_]'; then
+ java_warning JVM flavor '${1}' contains illegal characters
else
- DIRS=$DIRS $found_jvm
- shift
+ found_jvm=$(eval echo -n \$__jvm_$1)
+ if [ -z $found_jvm ] ; then
+ java_warning JVM flavor '${1:-none}' not understood
+ else
+ DIRS=$DIRS $found_jvm
+ fi
fi
+ shift
done
# Nothing means everything
if [ -z $DIRS ]; then
Modified: trunk/java-wrappers/jvm-list.sh
===
--- trunk/java-wrappers/jvm-list.sh 2011-04-04 18:35:33 UTC (rev 13503)
+++ trunk/java-wrappers/jvm-list.sh 2011-04-04 19:10:52 UTC (rev 13504)
@@ -26,39 +26,27 @@
__jvm_default=/usr/lib/jvm/default-java
# Sun runtimes
-__jvm_sun4=/usr/lib/j2*1.4-sun
-__jvm_sun5=/usr/lib/jvm/java-1.5.0-sun /usr/lib/j2*1.5-sun
__jvm_sun6=/usr/lib/jvm/java-6-sun /usr/lib/j2*1.6-sun
# all sun runtimes
-__jvm_sun=$__jvm_sun4 $__jvm_sun5 $__jvm_sun6
+__jvm_sun=$__jvm_sun6
# Sun version at least 5:
-__jvm_sunmin5=$__jvm_sun5 $__jvm_sun6
+__jvm_sunmin5=$__jvm_sun6
-# IBM runtimes. This comes from argouml.sh
-# I'm not quite sure it is still useful, but, we never know !
-__jvm_ibm=/usr/lib/j2*1.[456]-ibm
-
-
# Now, free runtimes:
__jvm_gcj2=/usr/lib/jvm/java-*-gcj-4.*
__jvm_gcj5=/usr/lib/jvm/java-1.5*-gcj-4.*
-__jvm_sablevm=/usr/lib/sablevm # Probably should be dropped, only in etch
-__jvm_kaffe=/usr/lib/kaffe /usr/lib/kaffe/pthreads /usr/lib/kaffe/jthreads
-__jvm_icedtea=/usr/lib/jvm/java-7-icedtea # Probably should be dropped...
-__jvm_cacao=/usr/lib/jvm/cacao
__jvm_openjdk6=/usr/lib/jvm/java-6-openjdk
-__jvm_cacaooj6=/usr/lib/jvm/java-6-cacao/jre
# And a few aliases
__jvm_gcj=$__jvm_gcj2
-__jvm_openjdk=$__jvm_openjdk6 $__jvm_cacaooj6
+__jvm_openjdk=$__jvm_openjdk6
# The java* runtimes:
# - corresponds to Provides: java6-runtime
-__jvm_java6=$__jvm_openjdk6 $__jvm_cacaooj6 $__jvm_sun6
+__jvm_java6=$__jvm_openjdk6 $__jvm_sun6
# - corresponds to Provides: java5-runtime
-__jvm_java5=$__jvm_gcj5 $__jvm_java6 $__jvm_sun5
+__jvm_java5=$__jvm_gcj5 $__jvm_java6
# - corresponds to Provides: java2-runtime
__jvm_java2=$__jvm_java5 $__jvm_gcj2
@@ -66,6 +54,6 @@
__jvm_alt=$(readlink /etc/alternatives/java|sed -n
's/\(\/usr\/lib\/jvm\/[^\/]*\)\/.*/\1/p')
# All JVMs
-__jvm_all=$__jvm_default /usr/lib/jvm/* $__jvm_ibm $__jvm_sun4 $__jvm_sablevm
$__jvm_kaffe
+__jvm_all=$__jvm_default /usr/lib/jvm/*
# Probably here should come a few meaningful global aliases.
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
Bug#620868: checkstyle wrapper: invalid runtime default-jre
Package: checkstyle Version: 5.3-2 Severity: minor Hello, While grepping over all rdepends of java-wrappers, I found the following stanza in checkstyle: find_java_runtime default-jre Due to the kind of shell hackery I used, this actually does do what you think it does but it doesn't show any warning. (and, yes, it works anyway). Starting from java-wrappers 0.1.21, you'll get a few ugly warnings. Just using find_java_runtime default or even find_java_runtime will be enough. Cheers, and thanks for using java-wrappers ! Vincent -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.38-2-amd64 (SMP w/2 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
[pkg-java] r13505 - in tags/java-wrappers: . 0.1.21 0.1.21/debian
Author: fourmond
Date: 2011-04-04 19:20:12 + (Mon, 04 Apr 2011)
New Revision: 13505
Added:
tags/java-wrappers/0.1.21/
tags/java-wrappers/0.1.21/debian/changelog
tags/java-wrappers/0.1.21/debian/control
tags/java-wrappers/0.1.21/debian/java-wrappers.install
tags/java-wrappers/0.1.21/debian/rules
tags/java-wrappers/0.1.21/get-classpath
tags/java-wrappers/0.1.21/java-wrappers.sh
tags/java-wrappers/0.1.21/jvm-list.sh
Removed:
tags/java-wrappers/0.1.21/debian/changelog
tags/java-wrappers/0.1.21/debian/control
tags/java-wrappers/0.1.21/debian/java-wrappers.install
tags/java-wrappers/0.1.21/debian/rules
tags/java-wrappers/0.1.21/java-wrappers.sh
tags/java-wrappers/0.1.21/jvm-list.sh
Log:
[svn-buildpackage] Tagging java-wrappers 0.1.21
Deleted: tags/java-wrappers/0.1.21/debian/changelog
===
--- trunk/java-wrappers/debian/changelog2011-04-01 09:47:57 UTC (rev
13487)
+++ tags/java-wrappers/0.1.21/debian/changelog 2011-04-04 19:20:12 UTC (rev
13505)
@@ -1,141 +0,0 @@
-java-wrappers (0.1.18) unstable; urgency=low
-
- * The let's break Java applications in Wheezy ! upload, or, in other
-words, upload to unstable
- * Switching to format 3.0 (native)
-
- -- Vincent Fourmond fourm...@debian.org Fri, 11 Feb 2011 13:35:24 +0100
-
-java-wrappers (0.1.17) experimental; urgency=low
-
- [ Gabriele Giacone ]
- * First step toward java-alternatives integration
-
- [ Vincent Fourmond ]
- * Final step (closes: #609731); thanks Gabriele for the first ;-)...
- * Conforms to standards 3.9.1
-
- -- Vincent Fourmond fourm...@debian.org Thu, 13 Jan 2011 23:01:43 +0100
-
-java-wrappers (0.1.16) unstable; urgency=low
-
- * Adding default as a valid jre choice, and make it the default for
-'all'; patch courtesy of Torsten Werner twer...@debian.org
-(closes: #580180)
- * Slightly arrange the documentation, which addresses to some extent bug
-#578944, but probably not satisfyingly enough.
- * Conforms to 3.8.4
- * Adding ${misc:Depends} for potential dh-induced dependencies
-
- -- Vincent Fourmond fourm...@debian.org Tue, 04 May 2010 23:42:54 +0200
-
-java-wrappers (0.1.15) unstable; urgency=low
-
- * Switch to Section java
-
- -- Vincent Fourmond fourm...@debian.org Wed, 29 Apr 2009 20:04:02 +0200
-
-java-wrappers (0.1.14) unstable; urgency=low
-
- * Fix absolute path in locate_jar (closes: #526087). Thanks to Paul
-Millar paul.mil...@desy.de for spotting and for the patch.
- * Conforms to 3.8.1
-
- -- Vincent Fourmond fourm...@debian.org Wed, 29 Apr 2009 19:13:40 +0200
-
-java-wrappers (0.1.13) unstable; urgency=low
-
- * Now that lenny is out, it's time to an upload to unstable !
-
- -- Vincent Fourmond fourm...@debian.org Sun, 15 Feb 2009 15:41:01 +0100
-
-java-wrappers (0.1.12) experimental; urgency=low
-
- * Now provides java2, java5 and java6 aliases that correspond respectively
-to the java2-runtime, java5-runtime and java6-runtime virtual packages
-(closes: #514339)
-
- -- Vincent Fourmond fourm...@debian.org Sun, 08 Feb 2009 16:38:13 +0100
-
-java-wrappers (0.1.11) experimental; urgency=low
-
- * Adding (back) the sunmin5 alias for jabref
-
- -- Vincent Fourmond fourm...@debian.org Sat, 22 Nov 2008 14:13:19 +0100
-
-java-wrappers (0.1.10) experimental; urgency=low
-
- * Added Vcs-* fields
- * Adding cacaooj6 runtime + adding it to the openjdk alias. (closes: #503819)
-
- -- Vincent Fourmond fourm...@debian.org Sun, 16 Nov 2008 03:17:33 +0100
-
-java-wrappers (0.1.9) experimental; urgency=low
-
- * Added a 'all' alias, and make find_java_runtime take no arguments
-as all
-
- -- Vincent Fourmond fourm...@debian.org Mon, 22 Sep 2008 23:57:26 +0200
-
-java-wrappers (0.1.8) experimental; urgency=low
-
- * The 'oops, I missed a syntax error release' - fix a missing
-fi in java-wrappers.sh
- * Fixed a few other syntax errors
-
- -- Vincent Fourmond fourm...@debian.org Tue, 16 Sep 2008 00:04:37 +0200
-
-java-wrappers (0.1.7) experimental; urgency=low
-
- * Rewrite of find_java_runtime in a much more flexible fashion...
-(closes: #494744)
-
- -- Vincent Fourmond fourm...@debian.org Tue, 22 Jul 2008 23:49:08 +0200
-
-java-wrappers (0.1.6) unstable; urgency=low
-
- * Add openjdk6 to the list of runtime flavors
- * java-wrappers.sh now understands a JAVA_FLAVOR environment variable.
- * Already conforms to policy 3.8.0
-
- -- Vincent Fourmond fourm...@debian.org Sat, 19 Jul 2008 22:59:31 +0200
-
-java-wrappers (0.1.5) unstable; urgency=low
-
- * Fix the pattern for conjuring up a JAVA_HOME when it is missing.
-(closes: #478054)
-
- -- Vincent Fourmond fourm...@debian.org Sat, 03 May 2008 09:30:16 +0200
-
-java-wrappers (0.1.4) unstable; urgency=low
-
- * Improved find_java_runtime to take several arguments
-
- -- Vincent Fourmond fourm...@debian.org Wed, 27 Feb 2008 00:42:03 +0100
-
-java-wrappers (0.1.3) unstable; urgency=low
[pkg-java] r13506 - in trunk/jsymphonic/debian: . wrappers
Author: fourmond
Date: 2011-04-04 20:00:51 + (Mon, 04 Apr 2011)
New Revision: 13506
Added:
trunk/jsymphonic/debian/jsymphonic.classpath
trunk/jsymphonic/debian/jsymphonic.jlibs
Modified:
trunk/jsymphonic/debian/build.xml
trunk/jsymphonic/debian/changelog
trunk/jsymphonic/debian/control
trunk/jsymphonic/debian/jsymphonic.install
trunk/jsymphonic/debian/rules
trunk/jsymphonic/debian/wrappers/jsymphonic
Log:
[jsymphonic] a well defined classpath + other benefits...
Modified: trunk/jsymphonic/debian/build.xml
===
--- trunk/jsymphonic/debian/build.xml 2011-04-04 19:20:12 UTC (rev 13505)
+++ trunk/jsymphonic/debian/build.xml 2011-04-04 20:00:51 UTC (rev 13506)
@@ -5,7 +5,7 @@
property name=srcdir value=src /
property name=builddir value=build /
property name=jardir value=dist /
- property name=jarname value=${jardir}/jsymphonic-${PACKAGE_VERSION}.jar
/
+ property name=jarname value=${jardir}/jsymphonic.jar /
target name=init
mkdir dir=${builddir} /
Modified: trunk/jsymphonic/debian/changelog
===
--- trunk/jsymphonic/debian/changelog 2011-04-04 19:20:12 UTC (rev 13505)
+++ trunk/jsymphonic/debian/changelog 2011-04-04 20:00:51 UTC (rev 13506)
@@ -1,3 +1,12 @@
+jsymphonic (0.3.0.Ode.To.Freedom+svn387-3) experimental; urgency=low
+
+ * Switching to javahelper
+ * Using real classpath
+ * Using automatic classpath expansion for the wrapper.
+ * Already conforms to standards 3.9.1
+
+ -- Vincent Fourmond fourm...@debian.org Mon, 04 Apr 2011 21:48:59 +0200
+
jsymphonic (0.3.0.Ode.To.Freedom+svn387-2) unstable; urgency=low
* Upload to unstable
Modified: trunk/jsymphonic/debian/control
===
--- trunk/jsymphonic/debian/control 2011-04-04 19:20:12 UTC (rev 13505)
+++ trunk/jsymphonic/debian/control 2011-04-04 20:00:51 UTC (rev 13506)
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian Java Maintainers
pkg-java-maintainers@lists.alioth.debian.org
Uploaders: Vincent Fourmond fourm...@debian.org
-Build-Depends: cdbs, debhelper (= 7), ant
+Build-Depends: cdbs, debhelper (= 7), ant, javahelper
Build-Depends-Indep: openjdk-6-jdk, libswing-layout-java
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://sourceforge.net/projects/symphonic/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jsymphonic
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/jsymphonic
@@ -13,8 +13,8 @@
Package: jsymphonic
Architecture: all
-Depends: openjdk-6-jre | java6-runtime, java-wrappers (= 0.1.11),
-${misc:Depends}, libswing-layout-java
+Depends: openjdk-6-jre | java6-runtime, java-wrappers (= 0.1.21),
+${misc:Depends}, ${java:Depends}
Recommends: ffmpeg
Suggests: pmount
Description: File manager for Sony's MP3 players
Added: trunk/jsymphonic/debian/jsymphonic.classpath
===
--- trunk/jsymphonic/debian/jsymphonic.classpath
(rev 0)
+++ trunk/jsymphonic/debian/jsymphonic.classpath2011-04-04 20:00:51 UTC
(rev 13506)
@@ -0,0 +1 @@
+dist/jsymphonic.jar /usr/share/java/swing-layout.jar
Modified: trunk/jsymphonic/debian/jsymphonic.install
===
--- trunk/jsymphonic/debian/jsymphonic.install 2011-04-04 19:20:12 UTC (rev
13505)
+++ trunk/jsymphonic/debian/jsymphonic.install 2011-04-04 20:00:51 UTC (rev
13506)
@@ -1,2 +1,3 @@
debian/jsymphonic.xpm usr/share/pixmaps
-debian/jsymphonic.desktop usr/share/applications
\ No newline at end of file
+debian/jsymphonic.desktop usr/share/applications
+debian/wrappers/jsymphonic usr/bin
\ No newline at end of file
Added: trunk/jsymphonic/debian/jsymphonic.jlibs
===
--- trunk/jsymphonic/debian/jsymphonic.jlibs(rev 0)
+++ trunk/jsymphonic/debian/jsymphonic.jlibs2011-04-04 20:00:51 UTC (rev
13506)
@@ -0,0 +1 @@
+dist/jsymphonic.jar
\ No newline at end of file
Modified: trunk/jsymphonic/debian/rules
===
--- trunk/jsymphonic/debian/rules 2011-04-04 19:20:12 UTC (rev 13505)
+++ trunk/jsymphonic/debian/rules 2011-04-04 20:00:51 UTC (rev 13506)
@@ -9,8 +9,8 @@
sed -r 's/(\.dfsg)?-[0-9.]+//')
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/javahelper.mk
include /usr/share/cdbs/1/class/ant.mk
-# include /usr/share/cdbs/1/rules/dpatch.mk
JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk
ANT_HOME := /usr/share/ant
@@ -29,10 +29,3 @@
print-version:
echo $(VERSION)
-
-
-install/jsymphonic::
- install -m 644 dist/*.jar $(target_dir)/jsymphonic-$(VERSION).jar
- ln -s jsymphonic-$(VERSION
[pkg-java] r13507 - in tags/jsymphonic: . 0.3.0.Ode.To.Freedom+svn387-3/debian 0.3.0.Ode.To.Freedom+svn387-3/debian/wrappers
Author: fourmond
Date: 2011-04-04 20:07:57 + (Mon, 04 Apr 2011)
New Revision: 13507
Added:
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/build.xml
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/changelog
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/control
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/jsymphonic.classpath
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/jsymphonic.install
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/jsymphonic.jlibs
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/rules
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/wrappers/jsymphonic
Removed:
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/build.xml
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/changelog
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/control
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/jsymphonic.install
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/rules
tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/wrappers/jsymphonic
Log:
[svn-buildpackage] Tagging jsymphonic 0.3.0.Ode.To.Freedom+svn387-3
Deleted: tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/build.xml
===
--- trunk/jsymphonic/debian/build.xml 2011-04-04 19:20:12 UTC (rev 13505)
+++ tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/build.xml
2011-04-04 20:07:57 UTC (rev 13507)
@@ -1,42 +0,0 @@
-?xml version=1.0?
-!-- Ant build file for the jsymphonic debian package --
-!-- Copyright 2009 by Vincent Fourmond --
-project name=test default=build basedir=..
- property name=srcdir value=src /
- property name=builddir value=build /
- property name=jardir value=dist /
- property name=jarname value=${jardir}/jsymphonic-${PACKAGE_VERSION}.jar
/
-
- target name=init
-mkdir dir=${builddir} /
-mkdir dir=${jardir} /
- /target
-
- target name=clean
-delete dir=${builddir} /
-delete dir=${jardir} /
- /target
-
- target name=languages depends=init
-copy todir=${builddir}/localization
- fileset dir=${srcdir}/localization /
-/copy
- /target
-
- target name=resources depends=init
-copy todir=${builddir}
- fileset dir=${srcdir}
- include name=**/resources/* /
- include name=**/*.png /
- /fileset
-/copy
- /target
-
- target name=compile depends=init
-javac srcdir=${srcdir} destdir=${builddir} encoding=UTF-8 /
- /target
-
- target name=build depends=compile,languages,resources
-jar basedir=${builddir} destfile=${jarname} /
- /target
-/project
Copied: tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/build.xml (from
rev 13506, trunk/jsymphonic/debian/build.xml)
===
--- tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/build.xml
(rev 0)
+++ tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/build.xml
2011-04-04 20:07:57 UTC (rev 13507)
@@ -0,0 +1,42 @@
+?xml version=1.0?
+!-- Ant build file for the jsymphonic debian package --
+!-- Copyright 2009 by Vincent Fourmond --
+project name=test default=build basedir=..
+ property name=srcdir value=src /
+ property name=builddir value=build /
+ property name=jardir value=dist /
+ property name=jarname value=${jardir}/jsymphonic.jar /
+
+ target name=init
+mkdir dir=${builddir} /
+mkdir dir=${jardir} /
+ /target
+
+ target name=clean
+delete dir=${builddir} /
+delete dir=${jardir} /
+ /target
+
+ target name=languages depends=init
+copy todir=${builddir}/localization
+ fileset dir=${srcdir}/localization /
+/copy
+ /target
+
+ target name=resources depends=init
+copy todir=${builddir}
+ fileset dir=${srcdir}
+ include name=**/resources/* /
+ include name=**/*.png /
+ /fileset
+/copy
+ /target
+
+ target name=compile depends=init
+javac srcdir=${srcdir} destdir=${builddir} encoding=UTF-8 /
+ /target
+
+ target name=build depends=compile,languages,resources
+jar basedir=${builddir} destfile=${jarname} /
+ /target
+/project
Deleted: tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/changelog
===
--- trunk/jsymphonic/debian/changelog 2011-04-04 19:20:12 UTC (rev 13505)
+++ tags/jsymphonic/0.3.0.Ode.To.Freedom+svn387-3/debian/changelog
2011-04-04 20:07:57 UTC (rev 13507)
@@ -1,89 +0,0 @@
-jsymphonic (0.3.0.Ode.To.Freedom+svn387-2) unstable; urgency=low
-
- * Upload to unstable
-
- -- Vincent Fourmond fourm...@debian.org Fri, 25 Jun 2010 00:30:30 +0200
-
-jsymphonic (0.3.0.Ode.To.Freedom+svn387-1) experimental; urgency=low
-
- * SVN snapshot based on the new upstream release
- * Update debian/build.xml to also ship included PNG files
- * Rewrote debian/patches/10-config-file.diff to take care of the new
[pkg-java] r13488 - trunk/statcvs/debian
Author: fourmond
Date: 2011-04-02 23:37:49 + (Sat, 02 Apr 2011)
New Revision: 13488
Added:
trunk/statcvs/debian/statcvs.classpath
Modified:
trunk/statcvs/debian/changelog
trunk/statcvs/debian/control
trunk/statcvs/debian/rules
Log:
[statcvs] First attempts at getting a correct classpath
Modified: trunk/statcvs/debian/changelog
===
--- trunk/statcvs/debian/changelog 2011-04-01 09:47:57 UTC (rev 13487)
+++ trunk/statcvs/debian/changelog 2011-04-02 23:37:49 UTC (rev 13488)
@@ -1,3 +1,19 @@
+statcvs (1:0.7.0.dfsg-3) experimental; urgency=low
+
+ * Now (partly) using javahelper
+ * Profit from it to set a real classpath
+ * Now conforms to standards 3.9.1
+ * Fix spelling mistakes in the package description
+
+ -- Vincent Fourmond fourm...@debian.org Sun, 03 Apr 2011 01:34:40 +0200
+
+statcvs (1:0.7.0.dfsg-2) unstable; urgency=low
+
+ * Does not actually break statsvn 0.5.0, so upload to unstable is pretty
+fine.
+
+ -- Vincent Fourmond fourm...@debian.org Tue, 09 Mar 2010 21:17:00 +0100
+
statcvs (1:0.7.0.dfsg-1) experimental; urgency=low
* Newer upstream release
Modified: trunk/statcvs/debian/control
===
--- trunk/statcvs/debian/control2011-04-01 09:47:57 UTC (rev 13487)
+++ trunk/statcvs/debian/control2011-04-02 23:37:49 UTC (rev 13488)
@@ -5,8 +5,8 @@
Uploaders: Vincent Fourmond fourm...@debian.org, Christian Bayle
ba...@debian.org
Build-Depends: cdbs, debhelper (= 5), ant, junit,
libjcommon-java, libjfreechart-java (= 1.0.13), libjdom1-java,
- default-jdk
-Standards-Version: 3.8.4
+ default-jdk, javahelper
+Standards-Version: 3.9.1
Homepage: http://statcvs.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/statcvs
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/statcvs
@@ -17,8 +17,8 @@
Depends: java-gcj-compat | java-runtime, libjcommon-java,
libjfreechart-java (= 1.0.13), java-wrappers (= 0.1.15), libjdom1-java,
${misc:Depends}
-Breaks: statsvn ( 0.7.0)
-Conflicts: statsvn ( 0.7.0)
+Breaks: statsvn ( 0.5.0)
+Conflicts: statsvn ( 0.5.0)
Recommends: cvs
Description: CVS Repository statistic analysis tool, written in Java
StatCvs retrieves information from a CVS repository and generates
@@ -26,7 +26,7 @@
e.g. timeline for the lines of code, contribution of each developer
etc.
.
- The current version of StatCvs generates a static suite of
- HTML documents containing tables and chart images.
- StatCvs is opens source software, released under the terms oft the LGPL.
- StatCvs uses JFreeChart to generate charts.
+ The current version of StatCvs generates a static suite of HTML
+ documents containing tables and chart images. StatCvs is open source
+ software, released under the terms oft the LGPL. StatCvs uses
+ JFreeChart to generate charts.
Modified: trunk/statcvs/debian/rules
===
--- trunk/statcvs/debian/rules 2011-04-01 09:47:57 UTC (rev 13487)
+++ trunk/statcvs/debian/rules 2011-04-02 23:37:49 UTC (rev 13488)
@@ -27,8 +27,8 @@
echo $(DEB_UPSTREAM_VERSION)
install/statcvs::
+ jh_classpath
install -m 644 dist/statcvs.jar
debian/statcvs/usr/share/java/statcvs-$(VERSION).jar
ln -s statcvs-$(VERSION).jar debian/statcvs/usr/share/java/statcvs.jar
install -m 755 -t debian/statcvs/usr/bin debian/wrappers/statcvs
-
Added: trunk/statcvs/debian/statcvs.classpath
===
--- trunk/statcvs/debian/statcvs.classpath (rev 0)
+++ trunk/statcvs/debian/statcvs.classpath 2011-04-02 23:37:49 UTC (rev
13488)
@@ -0,0 +1 @@
+dist/statcvs.jar /usr/share/java/jdom1.jar /usr/share/java/ant.jar
/usr/share/java/jcommon.jar /usr/share/java/jfreechart.jar
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r13489 - in trunk/java-wrappers: . debian
Author: fourmond
Date: 2011-04-02 23:48:44 + (Sat, 02 Apr 2011)
New Revision: 13489
Added:
trunk/java-wrappers/get-classpath
Modified:
trunk/java-wrappers/debian/changelog
trunk/java-wrappers/debian/java-wrappers.install
trunk/java-wrappers/java-wrappers.sh
Log:
[java-wrappers] Experimental support for automatic classpath loading
Modified: trunk/java-wrappers/debian/changelog
===
--- trunk/java-wrappers/debian/changelog2011-04-02 23:37:49 UTC (rev
13488)
+++ trunk/java-wrappers/debian/changelog2011-04-02 23:48:44 UTC (rev
13489)
@@ -1,3 +1,9 @@
+java-wrappers (0.1.19) experimental; urgency=low
+
+ * First draft of a recursive classpath resolution function.
+
+ -- Vincent Fourmond fourm...@debian.org Sun, 03 Apr 2011 01:38:16 +0200
+
java-wrappers (0.1.18) unstable; urgency=low
* The let's break Java applications in Wheezy ! upload, or, in other
Modified: trunk/java-wrappers/debian/java-wrappers.install
===
--- trunk/java-wrappers/debian/java-wrappers.install2011-04-02 23:37:49 UTC
(rev 13488)
+++ trunk/java-wrappers/debian/java-wrappers.install2011-04-02 23:48:44 UTC
(rev 13489)
@@ -1,2 +1,3 @@
java-wrappers.sh usr/lib/java-wrappers
-jvm-list.sh usr/lib/java-wrappers
\ No newline at end of file
+jvm-list.sh usr/lib/java-wrappers
+get-classpath usr/lib/java-wrappers
\ No newline at end of file
Added: trunk/java-wrappers/get-classpath
===
--- trunk/java-wrappers/get-classpath (rev 0)
+++ trunk/java-wrappers/get-classpath 2011-04-02 23:48:44 UTC (rev 13489)
@@ -0,0 +1,40 @@
+#! /usr/bin/perl
+
+
+# get-classpayth, copyright 2011 by Vincent Fourmond
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see
+# http://www.gnu.org/licenses/.
+
+$file = shift(@ARGV);
+open MANIFEST, unzip -p \$file\ META-INF/MANIFEST.MF | ;
+my $cp = ;
+while(my $line = MANIFEST) {
+if($line =~ /Class-Path:\s*(.*)/) {
+ $cp = $1;
+}
+elsif($cp) {
+
+ if($line =~ /^ (.*)/) {
+ $cp .= $1;
+ }
+ else {
+ last;
+ }
+}
+}
+close MANIFEST;
+$cp =~ s/\r//g;
+print $cp\n;
+
Property changes on: trunk/java-wrappers/get-classpath
___
Added: svn:executable
+ *
Modified: trunk/java-wrappers/java-wrappers.sh
===
--- trunk/java-wrappers/java-wrappers.sh2011-04-02 23:37:49 UTC (rev
13488)
+++ trunk/java-wrappers/java-wrappers.sh2011-04-02 23:48:44 UTC (rev
13489)
@@ -194,12 +194,8 @@
elif [ -r $JAVA_JARPATH/$jar.jar ]; then
found_jar=$JAVA_JARPATH/$jar.jar
elif [ -r $jar ]; then
- # Maybe issue a warning that jars should not be looked
- # for absolutely ?
found_jar=$jar
elif [ -r $jar.jar ]; then
- # Maybe issue a warning that jars should not be looked
- # for absolutely ?
found_jar=$jar.jar
else
return 1# Not found
@@ -219,6 +215,33 @@
done
}
+# This function tries to mimick the behaviour of the -jar option of
+# the java executable, by adding the target jar and all its classpath
+# recursively.
+#
+# This function is experimental for now, and its interface is not very
+# well specified yet.
+#
+# It will return without problem if the target class already is in the
+# classpath. It aborts with an error if a JAR file can't be found.
+find_jar_classpath() {
+if locate_jar $1; then
+ looked_for_jars=1
+ if echo $JAVA_CLASSPATH | grep found_jar; then
+ return 0;
+ fi
+ JAVA_CLASSPATH=$JAVA_CLASSPATH:$found_jar
+ for jar in $(/usr/lib/java-wrappers/get-classpath $found_jar); do
+ find_jar_classpath $jar;
+ done
+else
+ java_warning Unable to locate the necessary jar file $jar
+ return 1;
+fi
+}
+
+
+
# Adds the first jar found to the classpath. Useful for alternative
# dependencies.
find_one_jar_in() {
@@ -232,7 +255,7 @@
java_warning Could fine none of $@ in $JAVA_JARPATH
return 1
}
-
+
# Runs the program !
run_java() {
if [ -z $JAVA_CMD ]; then
___
pkg-java
[pkg-java] r13490 - in tags/java-wrappers: . 0.1.19 0.1.19/debian
Author: fourmond
Date: 2011-04-02 23:52:58 + (Sat, 02 Apr 2011)
New Revision: 13490
Added:
tags/java-wrappers/0.1.19/
tags/java-wrappers/0.1.19/debian/changelog
tags/java-wrappers/0.1.19/debian/java-wrappers.install
tags/java-wrappers/0.1.19/get-classpath
tags/java-wrappers/0.1.19/java-wrappers.sh
Removed:
tags/java-wrappers/0.1.19/debian/changelog
tags/java-wrappers/0.1.19/debian/java-wrappers.install
tags/java-wrappers/0.1.19/java-wrappers.sh
Log:
[svn-buildpackage] Tagging java-wrappers 0.1.19
Deleted: tags/java-wrappers/0.1.19/debian/changelog
===
--- trunk/java-wrappers/debian/changelog2011-04-01 09:47:57 UTC (rev
13487)
+++ tags/java-wrappers/0.1.19/debian/changelog 2011-04-02 23:52:58 UTC (rev
13490)
@@ -1,141 +0,0 @@
-java-wrappers (0.1.18) unstable; urgency=low
-
- * The let's break Java applications in Wheezy ! upload, or, in other
-words, upload to unstable
- * Switching to format 3.0 (native)
-
- -- Vincent Fourmond fourm...@debian.org Fri, 11 Feb 2011 13:35:24 +0100
-
-java-wrappers (0.1.17) experimental; urgency=low
-
- [ Gabriele Giacone ]
- * First step toward java-alternatives integration
-
- [ Vincent Fourmond ]
- * Final step (closes: #609731); thanks Gabriele for the first ;-)...
- * Conforms to standards 3.9.1
-
- -- Vincent Fourmond fourm...@debian.org Thu, 13 Jan 2011 23:01:43 +0100
-
-java-wrappers (0.1.16) unstable; urgency=low
-
- * Adding default as a valid jre choice, and make it the default for
-'all'; patch courtesy of Torsten Werner twer...@debian.org
-(closes: #580180)
- * Slightly arrange the documentation, which addresses to some extent bug
-#578944, but probably not satisfyingly enough.
- * Conforms to 3.8.4
- * Adding ${misc:Depends} for potential dh-induced dependencies
-
- -- Vincent Fourmond fourm...@debian.org Tue, 04 May 2010 23:42:54 +0200
-
-java-wrappers (0.1.15) unstable; urgency=low
-
- * Switch to Section java
-
- -- Vincent Fourmond fourm...@debian.org Wed, 29 Apr 2009 20:04:02 +0200
-
-java-wrappers (0.1.14) unstable; urgency=low
-
- * Fix absolute path in locate_jar (closes: #526087). Thanks to Paul
-Millar paul.mil...@desy.de for spotting and for the patch.
- * Conforms to 3.8.1
-
- -- Vincent Fourmond fourm...@debian.org Wed, 29 Apr 2009 19:13:40 +0200
-
-java-wrappers (0.1.13) unstable; urgency=low
-
- * Now that lenny is out, it's time to an upload to unstable !
-
- -- Vincent Fourmond fourm...@debian.org Sun, 15 Feb 2009 15:41:01 +0100
-
-java-wrappers (0.1.12) experimental; urgency=low
-
- * Now provides java2, java5 and java6 aliases that correspond respectively
-to the java2-runtime, java5-runtime and java6-runtime virtual packages
-(closes: #514339)
-
- -- Vincent Fourmond fourm...@debian.org Sun, 08 Feb 2009 16:38:13 +0100
-
-java-wrappers (0.1.11) experimental; urgency=low
-
- * Adding (back) the sunmin5 alias for jabref
-
- -- Vincent Fourmond fourm...@debian.org Sat, 22 Nov 2008 14:13:19 +0100
-
-java-wrappers (0.1.10) experimental; urgency=low
-
- * Added Vcs-* fields
- * Adding cacaooj6 runtime + adding it to the openjdk alias. (closes: #503819)
-
- -- Vincent Fourmond fourm...@debian.org Sun, 16 Nov 2008 03:17:33 +0100
-
-java-wrappers (0.1.9) experimental; urgency=low
-
- * Added a 'all' alias, and make find_java_runtime take no arguments
-as all
-
- -- Vincent Fourmond fourm...@debian.org Mon, 22 Sep 2008 23:57:26 +0200
-
-java-wrappers (0.1.8) experimental; urgency=low
-
- * The 'oops, I missed a syntax error release' - fix a missing
-fi in java-wrappers.sh
- * Fixed a few other syntax errors
-
- -- Vincent Fourmond fourm...@debian.org Tue, 16 Sep 2008 00:04:37 +0200
-
-java-wrappers (0.1.7) experimental; urgency=low
-
- * Rewrite of find_java_runtime in a much more flexible fashion...
-(closes: #494744)
-
- -- Vincent Fourmond fourm...@debian.org Tue, 22 Jul 2008 23:49:08 +0200
-
-java-wrappers (0.1.6) unstable; urgency=low
-
- * Add openjdk6 to the list of runtime flavors
- * java-wrappers.sh now understands a JAVA_FLAVOR environment variable.
- * Already conforms to policy 3.8.0
-
- -- Vincent Fourmond fourm...@debian.org Sat, 19 Jul 2008 22:59:31 +0200
-
-java-wrappers (0.1.5) unstable; urgency=low
-
- * Fix the pattern for conjuring up a JAVA_HOME when it is missing.
-(closes: #478054)
-
- -- Vincent Fourmond fourm...@debian.org Sat, 03 May 2008 09:30:16 +0200
-
-java-wrappers (0.1.4) unstable; urgency=low
-
- * Improved find_java_runtime to take several arguments
-
- -- Vincent Fourmond fourm...@debian.org Wed, 27 Feb 2008 00:42:03 +0100
-
-java-wrappers (0.1.3) unstable; urgency=low
-
- * Small documentation fixes
- * Fix small typos in java-wrappers.sh
- * Fix a problem with JAVA_BINDIR
-
- -- Vincent Fourmond fourm...@debian.org Wed, 27 Feb 2008 00:38:23 +0100
-
-java-wrappers (0.1.2) unstable; urgency=low
-
- * Adding link
[pkg-java] r13491 - trunk/java-wrappers/debian
Author: fourmond
Date: 2011-04-02 23:54:11 + (Sat, 02 Apr 2011)
New Revision: 13491
Modified:
trunk/java-wrappers/debian/changelog
trunk/java-wrappers/debian/control
Log:
[java-wrappers] Looks like I've forgotten something...
Modified: trunk/java-wrappers/debian/changelog
===
--- trunk/java-wrappers/debian/changelog2011-04-02 23:52:58 UTC (rev
13490)
+++ trunk/java-wrappers/debian/changelog2011-04-02 23:54:11 UTC (rev
13491)
@@ -1,3 +1,10 @@
+java-wrappers (0.1.20) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+ * Adding unzip as we need it to get the classpath correctly...
+
+ -- Vincent Fourmond fourm...@debian.org Sun, 03 Apr 2011 01:53:18 +0200
+
java-wrappers (0.1.19) experimental; urgency=low
* First draft of a recursive classpath resolution function.
Modified: trunk/java-wrappers/debian/control
===
--- trunk/java-wrappers/debian/control 2011-04-02 23:52:58 UTC (rev 13490)
+++ trunk/java-wrappers/debian/control 2011-04-02 23:54:11 UTC (rev 13491)
@@ -10,7 +10,7 @@
Package: java-wrappers
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, unzip
Architecture: all
Description: wrappers for java executables
Wrapper script facilities for java executables.
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r13492 - in trunk/statcvs/debian: . wrappers
Author: fourmond
Date: 2011-04-02 23:57:04 + (Sat, 02 Apr 2011)
New Revision: 13492
Modified:
trunk/statcvs/debian/changelog
trunk/statcvs/debian/control
trunk/statcvs/debian/wrappers/statcvs
Log:
[statcvs] Almost ready to go to experimental
Modified: trunk/statcvs/debian/changelog
===
--- trunk/statcvs/debian/changelog 2011-04-02 23:54:11 UTC (rev 13491)
+++ trunk/statcvs/debian/changelog 2011-04-02 23:57:04 UTC (rev 13492)
@@ -4,8 +4,10 @@
* Profit from it to set a real classpath
* Now conforms to standards 3.9.1
* Fix spelling mistakes in the package description
+ * Changed the wrapper to automatically get the classpath from the jar
+file
- -- Vincent Fourmond fourm...@debian.org Sun, 03 Apr 2011 01:34:40 +0200
+ -- Vincent Fourmond fourm...@debian.org Sun, 03 Apr 2011 01:55:31 +0200
statcvs (1:0.7.0.dfsg-2) unstable; urgency=low
Modified: trunk/statcvs/debian/control
===
--- trunk/statcvs/debian/control2011-04-02 23:54:11 UTC (rev 13491)
+++ trunk/statcvs/debian/control2011-04-02 23:57:04 UTC (rev 13492)
@@ -15,7 +15,7 @@
Package: statcvs
Architecture: all
Depends: java-gcj-compat | java-runtime, libjcommon-java,
- libjfreechart-java (= 1.0.13), java-wrappers (= 0.1.15), libjdom1-java,
+ libjfreechart-java (= 1.0.13), java-wrappers (= 0.1.20), libjdom1-java,
${misc:Depends}
Breaks: statsvn ( 0.5.0)
Conflicts: statsvn ( 0.5.0)
Modified: trunk/statcvs/debian/wrappers/statcvs
===
--- trunk/statcvs/debian/wrappers/statcvs 2011-04-02 23:54:11 UTC (rev
13491)
+++ trunk/statcvs/debian/wrappers/statcvs 2011-04-02 23:57:04 UTC (rev
13492)
@@ -5,6 +5,6 @@
# We first look for sun's runtime, and then for all the rest
find_java_runtime sun || find_java_runtime
-find_jars jfreechart jcommon jdom1 statcvs
+find_jar_classpath statcvs
run_java net.sf.statcvs.Main $@
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r13451 - in trunk/statsvn/debian: . wrappers
Author: fourmond
Date: 2011-03-23 10:07:39 + (Wed, 23 Mar 2011)
New Revision: 13451
Modified:
trunk/statsvn/debian/changelog
trunk/statsvn/debian/control
trunk/statsvn/debian/wrappers/statsvn
Log:
[statsvn] Fixing (trivial) XML generation problem
Modified: trunk/statsvn/debian/changelog
===
--- trunk/statsvn/debian/changelog 2011-03-23 05:26:56 UTC (rev 13450)
+++ trunk/statsvn/debian/changelog 2011-03-23 10:07:39 UTC (rev 13451)
@@ -1,3 +1,11 @@
+statsvn (0.7.0.dfsg-3) unstable; urgency=low
+
+ * Add libjdom1-java to dependencies + add jdom1 in the classpath
+to fix class not found exception when generating XML (closes: #616412)
+ * Tighten up dependencies on more recent versions of java-wrapper
+
+ -- Vincent Fourmond fourm...@debian.org Wed, 23 Mar 2011 11:01:07 +0100
+
statsvn (0.7.0.dfsg-2) unstable; urgency=low
* Pull option documentation from upstream's wiki:
Modified: trunk/statsvn/debian/control
===
--- trunk/statsvn/debian/control2011-03-23 05:26:56 UTC (rev 13450)
+++ trunk/statsvn/debian/control2011-03-23 10:07:39 UTC (rev 13451)
@@ -5,8 +5,8 @@
Uploaders: Vincent Fourmond fourm...@debian.org
Build-Depends: cdbs, debhelper (= 5), ant, libbackport-util-concurrent-java,
libjcommon-java, libjfreechart-java, statcvs (= 1:0.5.0), default-jdk,
- libsvnkit-java
-Standards-Version: 3.8.4
+ libsvnkit-java, libjdom1-java
+Standards-Version: 3.9.1
Homepage: http://www.statsvn.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/statsvn
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/statsvn
@@ -15,8 +15,9 @@
Package: statsvn
Architecture: all
Depends: java-gcj-compat | java-runtime, libjcommon-java,
- libjfreechart-java, libbackport-util-concurrent-java, statcvs (= 1:0.7.0),
- subversion, java-wrappers (= 0.1.4), ${misc:Depends}, libsvnkit-java
+ libjfreechart-java, libbackport-util-concurrent-java, statcvs (= 1:0.7.0),
+ subversion, java-wrappers (= 0.1.16), ${misc:Depends},
+ libsvnkit-java, libjdom1-java
Description: SVN repository statistics
StatSVN retrieves information from a Subversion repository and generates
various tables and charts describing the project evolution, e.g.
Modified: trunk/statsvn/debian/wrappers/statsvn
===
--- trunk/statsvn/debian/wrappers/statsvn 2011-03-23 05:26:56 UTC (rev
13450)
+++ trunk/statsvn/debian/wrappers/statsvn 2011-03-23 10:07:39 UTC (rev
13451)
@@ -5,6 +5,7 @@
# We first look for sun's runtime, and then for all the rest
find_java_runtime sun || find_java_runtime
-find_jars jfreechart jcommon statcvs backport-util-concurrent statsvn
+find_jars jfreechart jcommon statcvs backport-util-concurrent statsvn \
+jdom1
run_java net.sf.statsvn.Main $@
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r13452 - in tags/statsvn: . 0.7.0.dfsg-3/debian 0.7.0.dfsg-3/debian/wrappers
Author: fourmond
Date: 2011-03-23 10:23:46 + (Wed, 23 Mar 2011)
New Revision: 13452
Added:
tags/statsvn/0.7.0.dfsg-3/
tags/statsvn/0.7.0.dfsg-3/debian/changelog
tags/statsvn/0.7.0.dfsg-3/debian/control
tags/statsvn/0.7.0.dfsg-3/debian/wrappers/statsvn
Removed:
tags/statsvn/0.7.0.dfsg-3/debian/changelog
tags/statsvn/0.7.0.dfsg-3/debian/control
tags/statsvn/0.7.0.dfsg-3/debian/wrappers/statsvn
Log:
[svn-buildpackage] Tagging statsvn 0.7.0.dfsg-3
Deleted: tags/statsvn/0.7.0.dfsg-3/debian/changelog
===
--- trunk/statsvn/debian/changelog 2011-03-23 05:26:56 UTC (rev 13450)
+++ tags/statsvn/0.7.0.dfsg-3/debian/changelog 2011-03-23 10:23:46 UTC (rev
13452)
@@ -1,82 +0,0 @@
-statsvn (0.7.0.dfsg-2) unstable; urgency=low
-
- * Pull option documentation from upstream's wiki:
-http://wiki.statsvn.org/Default.aspx?Page=User Manual (closes: 576664)
-Thanks to Mathieu Malaterre for pointing out.
-
- -- Vincent Fourmond fourm...@debian.org Tue, 06 Apr 2010 22:24:27 +0200
-
-statsvn (0.7.0.dfsg-1) unstable; urgency=low
-
- * New upstream release (closes: #572613)
- * Switch to source format 3.0 (quilt)
- * Drop build-dependency on dpatch, now unneeded
- * Now conforms to standards 3.8.4
- * Switch to a dependency on default-jdk for building
- * Now depends on libsvnkit-java
- * Manual page updates.
-
- -- Vincent Fourmond fourm...@debian.org Tue, 16 Mar 2010 21:32:06 +0100
-
-statsvn (0.5.0.dfsg-1) unstable; urgency=low
-
- * New upstream release
- * Updated the debian/new-upstream script to remove extraneous files.
- * Moved to the new section vcs
- * Needs statcvs 0.5.0 or later.
- * Added ${misc:Depends} for debhelper-induced dependencies
- * Bumped debhelper compatibility level to 5
- * Added a debian/README.source file to explain the patch system
- * Now conforms to standards 3.8.2
-
- -- Vincent Fourmond fourm...@debian.org Mon, 22 Jun 2009 20:32:34 +0200
-
-statsvn (0.4.0.dfsg-1) unstable; urgency=low
-
- * New upstream version (closes: #481799)
- * Does not work with older statcvs, tightening up dependencies
- * statsvn still complains about files with spaces within, but
-it does not seem to affect statistics anymore, so it
-closes: #469937,#469938
-
- -- Vincent Fourmond fourm...@debian.org Sat, 28 Jun 2008 15:53:07 +0200
-
-statsvn (0.3.1.dfsg+1-1) unstable; urgency=low
-
- [ Michael Koch ]
- * Updated watch file to remove .dfsg part from debian version before
-comparison.
-
- [ Vincent Fourmond ]
- * Now that statcvs has moved to main, statsvn also works fine
-within main; moving there (closes: #469820)
-
- -- Vincent Fourmond fourm...@debian.org Sat, 19 Apr 2008 21:13:17 +0200
-
-statsvn (0.3.1.dfsg-3) unstable; urgency=low
-
- * The 'Whoa I never uploaded two versions that close together' release
- * statsvn must of course Depend on java-wrappers... (closes: #470394)
-
- -- Vincent Fourmond fourm...@debian.org Mon, 10 Mar 2008 23:40:29 +0100
-
-statsvn (0.3.1.dfsg-2) unstable; urgency=low
-
- * Move subversion to Depends, as it is truly required
- * Document -tags in the manual page, patch courtesy of
-Emmanuel Fleury fle...@labri.fr (closes: #470252)
-
- -- Vincent Fourmond fourm...@debian.org Mon, 10 Mar 2008 23:08:05 +0100
-
-statsvn (0.3.1.dfsg-1) unstable; urgency=low
-
- * Initial release (Closes: 456250)
- * 10-build-xml-classpath to get it to build with debian packages
- * 15-build-xml-build-jar-only to tweak the build system to get a
-jar containing only statsvn code (and not many more as upstreams').
- * 20-disable-jtreemap to disable the jtreemap-based report, as jtreemap
-is not currently packaged for Debian
- * Wrote a manual page, based on the one from statcvs
- * Updated FSF's address in debian/copyright
-
- -- Vincent Fourmond fourm...@debian.org Wed, 05 Mar 2008 00:29:20 +0100
Copied: tags/statsvn/0.7.0.dfsg-3/debian/changelog (from rev 13451,
trunk/statsvn/debian/changelog)
===
--- tags/statsvn/0.7.0.dfsg-3/debian/changelog (rev 0)
+++ tags/statsvn/0.7.0.dfsg-3/debian/changelog 2011-03-23 10:23:46 UTC (rev
13452)
@@ -0,0 +1,90 @@
+statsvn (0.7.0.dfsg-3) unstable; urgency=low
+
+ * Add libjdom1-java to dependencies + add jdom1 in the classpath
+to fix class not found exception when generating XML (closes: #616412)
+ * Tighten up dependencies on more recent versions of java-wrapper
+
+ -- Vincent Fourmond fourm...@debian.org Wed, 23 Mar 2011 11:01:07 +0100
+
+statsvn (0.7.0.dfsg-2) unstable; urgency=low
+
+ * Pull option documentation from upstream's wiki:
+http://wiki.statsvn.org/Default.aspx?Page=User Manual (closes: 576664)
+Thanks to Mathieu Malaterre for pointing out.
+
+ -- Vincent Fourmond fourm...@debian.org Tue, 06 Apr 2010 22:24:27 +0200
+
+statsvn (0.7.0.dfsg-1) unstable; urgency=low
+
+ * New
Bug#613367: jclassinfo: memory usage problems
Hello,
On Mon, Feb 14, 2011 at 12:19 PM, TomaszN nowak2...@poczta.onet.pl wrote:
Parsing some classes results with a crash:
(...)
81)CONSTANT_Utf8[1](too many bytes in \)
*** glibc detected *** /tmp/jclassinfo-0.19.1/jclassinfo/.libs/lt-jclassinfo:
free(): invalid next size (fast): 0x08cf5c08 ***
=== Backtrace: =
/lib/i686/cmov/libc.so.6(+0x6b281)[0xb75bb281]
/lib/i686/cmov/libc.so.6(+0x6cad8)[0xb75bcad8]
/lib/i686/cmov/libc.so.6(cfree+0x6d)[0xb75bfbbd]
/tmp/jclassinfo-0.19.1/jclassinfo/.libs/lt-jclassinfo[0x804bf07]
/tmp/jclassinfo-0.19.1/jclassinfo/.libs/lt-jclassinfo[0x804bc41]
/tmp/jclassinfo-0.19.1/jclassinfo/.libs/lt-jclassinfo[0x804c34c]
/tmp/jclassinfo-0.19.1/jclassinfo/.libs/lt-jclassinfo[0x804d8bc]
/lib/i686/cmov/libc.so.6(__libc_start_main+0xe6)[0xb7566c76]
/tmp/jclassinfo-0.19.1/jclassinfo/.libs/lt-jclassinfo[0x8049a01]
=== Memory map:
08048000-0805 r-xp 08:05 2313111
/tmp/jclassinfo-0.19.1/jclassinfo/.libs/lt-jclassinfo
0805-08051000 rw-p 8000 08:05 2313111
/tmp/jclassinfo-0.19.1/jclassinfo/.libs/lt-jclassinfo
08cf4000-08d15000 rw-p 00:00 0 [heap]
b740-b7421000 rw-p 00:00 0
b7421000-b750 ---p 00:00 0
b7517000-b7534000 r-xp 08:05 1157360 /lib/libgcc_s.so.1
b7534000-b7535000 rw-p 0001c000 08:05 1157360 /lib/libgcc_s.so.1
b754f000-b755 rw-p 00:00 0
b755-b769 r-xp 08:05 1610228 /lib/i686/cmov/libc-2.11.2.so
b769-b7692000 r--p 0013f000 08:05 1610228 /lib/i686/cmov/libc-2.11.2.so
b7692000-b7693000 rw-p 00141000 08:05 1610228 /lib/i686/cmov/libc-2.11.2.so
b7693000-b7696000 rw-p 00:00 0
b7696000-b76ba000 r-xp 08:05 1610150 /lib/i686/cmov/libm-2.11.2.so
b76ba000-b76bb000 r--p 00023000 08:05 1610150 /lib/i686/cmov/libm-2.11.2.so
b76bb000-b76bc000 rw-p 00024000 08:05 1610150 /lib/i686/cmov/libPrzerwane
I just increased the size of the char* new_string in jclass/jstring.c by 20
bytes when mallocing; not correct, but works for me.
Additionally fixed some minor memory problems.
Thanks.
To debug, use valgrind after exec in jclassinfo/jclassinfo:
exec valgrind $progdir/$program ${1+$@}
I don't really see what you're talking about here.
/usr/bin/jclassinfo is a ELF binary, not a shell script.
I'll dig into this some time soon.
As a side note for myself, I'll need to switch to format 3.0 (quilt).
Cheers,
Vincent
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please
use
debian-j...@lists.debian.org for discussions and questions.
Bug#612903: java-wrappers: jvm-list.sh contains a lot of JVMs not present in Debian
Hello, On Fri, Feb 11, 2011 at 2:41 PM, Niels Thykier ni...@thykier.net wrote: I noticed that jvm-list.sh (in the svn as well) lists a lot of old JVMs that are no longer in Debian. If you want to keep them in the file (e.g. for compatibility) it might be prudent to list that the given entries are not found in Debian. jvm_sun4 jvm_sun5 jvm_sablevm jvm_kaffe jvm_cacao jvm_cacaooj6 ^^ this one is still available in the package icedtea-6-jre-cacao (though directory may point in the wrong place). jvm_ibm This list is based on my memory of what we threw out in Squeeze, so it may not be completely accurate. Good point. I kept that for a long time since I still had memories of the days when java in Debian meant a multitude of JVMs, most of them not having enough functionality to get apps running. Fortunately, these days have gone now ;-)... I'll remove that along with the new things I'll develop for java-wrappers anyway. That said, if you want to remove them, please go ahead. Cheers, Vincent __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#611590: [libwoodstox-java] install POM file
Hello, On Mon, Jan 31, 2011 at 11:43 PM, Ludovic Claude ludovic.cla...@laposte.net wrote: There is no need to rename the pom file with the version, mh_install* does it for you. If you upload your changes to experimental, then you can use the new conveniences in maven-repo-helper, and your patch will look like this: * add file debian/libwoodstock-java.poms with this line: src/maven/wstx-lgpl.pom --has-package-version --artifact=build/wstx-lgpl-*.jar --java-lib * remove debian/install [...] As far as I'm concerned, I don't have any objection to either of you modifying the package and uploading that. Cheers, Vincent __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
[pkg-java] r13200 - in trunk/java-wrappers: . debian
Author: fourmond Date: 2011-01-13 22:00:54 + (Thu, 13 Jan 2011) New Revision: 13200 Modified: trunk/java-wrappers/debian/changelog trunk/java-wrappers/java-wrappers.sh trunk/java-wrappers/jvm-list.sh Log: [java-wrappers] Building upon Gabriele's patch for a proper fix Modified: trunk/java-wrappers/debian/changelog === --- trunk/java-wrappers/debian/changelog2011-01-12 21:21:07 UTC (rev 13199) +++ trunk/java-wrappers/debian/changelog2011-01-13 22:00:54 UTC (rev 13200) @@ -1,9 +1,13 @@ -java-wrappers (0.1.17) UNRELEASED; urgency=low +java-wrappers (0.1.17) experimental; urgency=low - * REMOVEME toward java-alternatives integration (will close #609731). + [ Gabriele Giacone ] + * First step toward java-alternatives integration - -- Gabriele Giacone 1o5g4...@gmail.com Wed, 12 Jan 2011 22:18:19 +0100 + [ Vincent Fourmond ] + * Final step (closes: #609731); thanks Gabriele for the first ;-)... + -- Vincent Fourmond fourm...@debian.org Thu, 13 Jan 2011 22:59:38 +0100 + java-wrappers (0.1.16) unstable; urgency=low * Adding default as a valid jre choice, and make it the default for Modified: trunk/java-wrappers/java-wrappers.sh === --- trunk/java-wrappers/java-wrappers.sh2011-01-12 21:21:07 UTC (rev 13199) +++ trunk/java-wrappers/java-wrappers.sh2011-01-13 22:00:54 UTC (rev 13200) @@ -117,13 +117,21 @@ if [ -z $DIRS ]; then DIRS=$all_runtimes fi + # First, we check if __jvm_alt is within the possible choices: + if echo $DIRS | fgrep $__jvm_alt /dev/null ; then + JAVA_HOME=$__jvm_alt + java_debug Picking up the JVM designated by the alternatives system: + java_debug JAVA_HOME = '$JAVA_HOME' + else + # And pick up the first one that works reasonably - for dir in $DIRS; do - if [ -x $dir/bin/java ]; then - JAVA_HOME=$dir - break; - fi - done + for dir in $DIRS; do + if [ -x $dir/bin/java ]; then + JAVA_HOME=$dir + break; + fi + done + fi else java_debug Using provided JAVA_HOME = '$JAVA_HOME' fi Modified: trunk/java-wrappers/jvm-list.sh === --- trunk/java-wrappers/jvm-list.sh 2011-01-12 21:21:07 UTC (rev 13199) +++ trunk/java-wrappers/jvm-list.sh 2011-01-13 22:00:54 UTC (rev 13200) @@ -66,6 +66,6 @@ __jvm_alt=$(readlink /etc/alternatives/java|sed -n 's/\(\/usr\/lib\/jvm\/[^\/]*\)\/.*/\1/p') # All JVMs -__jvm_all=$__jvm_alt $__jvm_default /usr/lib/jvm/* $__jvm_ibm $__jvm_sun4 $__jvm_sablevm $__jvm_kaffe +__jvm_all=$__jvm_default /usr/lib/jvm/* $__jvm_ibm $__jvm_sun4 $__jvm_sablevm $__jvm_kaffe # Probably here should come a few meaningful global aliases. ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r13201 - trunk/java-wrappers/debian
Author: fourmond Date: 2011-01-13 22:12:13 + (Thu, 13 Jan 2011) New Revision: 13201 Modified: trunk/java-wrappers/debian/changelog trunk/java-wrappers/debian/control Log: [java-wrappers] conforms to recent standards Modified: trunk/java-wrappers/debian/changelog === --- trunk/java-wrappers/debian/changelog2011-01-13 22:00:54 UTC (rev 13200) +++ trunk/java-wrappers/debian/changelog2011-01-13 22:12:13 UTC (rev 13201) @@ -5,8 +5,9 @@ [ Vincent Fourmond ] * Final step (closes: #609731); thanks Gabriele for the first ;-)... + * Conforms to standards 3.9.1 - -- Vincent Fourmond fourm...@debian.org Thu, 13 Jan 2011 22:59:38 +0100 + -- Vincent Fourmond fourm...@debian.org Thu, 13 Jan 2011 23:01:43 +0100 java-wrappers (0.1.16) unstable; urgency=low Modified: trunk/java-wrappers/debian/control === --- trunk/java-wrappers/debian/control 2011-01-13 22:00:54 UTC (rev 13200) +++ trunk/java-wrappers/debian/control 2011-01-13 22:12:13 UTC (rev 13201) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org Uploaders: Vincent Fourmond fourm...@debian.org Build-Depends: debhelper (= 5) -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java-wrappers Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/java-wrappers ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
[pkg-java] r13202 - in tags/java-wrappers: . 0.1.17 0.1.17/debian
Author: fourmond
Date: 2011-01-13 22:13:16 + (Thu, 13 Jan 2011)
New Revision: 13202
Added:
tags/java-wrappers/0.1.17/
tags/java-wrappers/0.1.17/debian/changelog
tags/java-wrappers/0.1.17/debian/control
tags/java-wrappers/0.1.17/java-wrappers.sh
tags/java-wrappers/0.1.17/jvm-list.sh
Removed:
tags/java-wrappers/0.1.17/debian/changelog
tags/java-wrappers/0.1.17/debian/control
tags/java-wrappers/0.1.17/java-wrappers.sh
tags/java-wrappers/0.1.17/jvm-list.sh
Log:
[svn-buildpackage] Tagging java-wrappers 0.1.17
Deleted: tags/java-wrappers/0.1.17/debian/changelog
===
--- trunk/java-wrappers/debian/changelog2011-01-12 21:21:07 UTC (rev
13199)
+++ tags/java-wrappers/0.1.17/debian/changelog 2011-01-13 22:13:16 UTC (rev
13202)
@@ -1,128 +0,0 @@
-java-wrappers (0.1.17) UNRELEASED; urgency=low
-
- * REMOVEME toward java-alternatives integration (will close #609731).
-
- -- Gabriele Giacone 1o5g4...@gmail.com Wed, 12 Jan 2011 22:18:19 +0100
-
-java-wrappers (0.1.16) unstable; urgency=low
-
- * Adding default as a valid jre choice, and make it the default for
-'all'; patch courtesy of Torsten Werner twer...@debian.org
-(closes: #580180)
- * Slightly arrange the documentation, which addresses to some extent bug
-#578944, but probably not satisfyingly enough.
- * Conforms to 3.8.4
- * Adding ${misc:Depends} for potential dh-induced dependencies
-
- -- Vincent Fourmond fourm...@debian.org Tue, 04 May 2010 23:42:54 +0200
-
-java-wrappers (0.1.15) unstable; urgency=low
-
- * Switch to Section java
-
- -- Vincent Fourmond fourm...@debian.org Wed, 29 Apr 2009 20:04:02 +0200
-
-java-wrappers (0.1.14) unstable; urgency=low
-
- * Fix absolute path in locate_jar (closes: #526087). Thanks to Paul
-Millar paul.mil...@desy.de for spotting and for the patch.
- * Conforms to 3.8.1
-
- -- Vincent Fourmond fourm...@debian.org Wed, 29 Apr 2009 19:13:40 +0200
-
-java-wrappers (0.1.13) unstable; urgency=low
-
- * Now that lenny is out, it's time to an upload to unstable !
-
- -- Vincent Fourmond fourm...@debian.org Sun, 15 Feb 2009 15:41:01 +0100
-
-java-wrappers (0.1.12) experimental; urgency=low
-
- * Now provides java2, java5 and java6 aliases that correspond respectively
-to the java2-runtime, java5-runtime and java6-runtime virtual packages
-(closes: #514339)
-
- -- Vincent Fourmond fourm...@debian.org Sun, 08 Feb 2009 16:38:13 +0100
-
-java-wrappers (0.1.11) experimental; urgency=low
-
- * Adding (back) the sunmin5 alias for jabref
-
- -- Vincent Fourmond fourm...@debian.org Sat, 22 Nov 2008 14:13:19 +0100
-
-java-wrappers (0.1.10) experimental; urgency=low
-
- * Added Vcs-* fields
- * Adding cacaooj6 runtime + adding it to the openjdk alias. (closes: #503819)
-
- -- Vincent Fourmond fourm...@debian.org Sun, 16 Nov 2008 03:17:33 +0100
-
-java-wrappers (0.1.9) experimental; urgency=low
-
- * Added a 'all' alias, and make find_java_runtime take no arguments
-as all
-
- -- Vincent Fourmond fourm...@debian.org Mon, 22 Sep 2008 23:57:26 +0200
-
-java-wrappers (0.1.8) experimental; urgency=low
-
- * The 'oops, I missed a syntax error release' - fix a missing
-fi in java-wrappers.sh
- * Fixed a few other syntax errors
-
- -- Vincent Fourmond fourm...@debian.org Tue, 16 Sep 2008 00:04:37 +0200
-
-java-wrappers (0.1.7) experimental; urgency=low
-
- * Rewrite of find_java_runtime in a much more flexible fashion...
-(closes: #494744)
-
- -- Vincent Fourmond fourm...@debian.org Tue, 22 Jul 2008 23:49:08 +0200
-
-java-wrappers (0.1.6) unstable; urgency=low
-
- * Add openjdk6 to the list of runtime flavors
- * java-wrappers.sh now understands a JAVA_FLAVOR environment variable.
- * Already conforms to policy 3.8.0
-
- -- Vincent Fourmond fourm...@debian.org Sat, 19 Jul 2008 22:59:31 +0200
-
-java-wrappers (0.1.5) unstable; urgency=low
-
- * Fix the pattern for conjuring up a JAVA_HOME when it is missing.
-(closes: #478054)
-
- -- Vincent Fourmond fourm...@debian.org Sat, 03 May 2008 09:30:16 +0200
-
-java-wrappers (0.1.4) unstable; urgency=low
-
- * Improved find_java_runtime to take several arguments
-
- -- Vincent Fourmond fourm...@debian.org Wed, 27 Feb 2008 00:42:03 +0100
-
-java-wrappers (0.1.3) unstable; urgency=low
-
- * Small documentation fixes
- * Fix small typos in java-wrappers.sh
- * Fix a problem with JAVA_BINDIR
-
- -- Vincent Fourmond fourm...@debian.org Wed, 27 Feb 2008 00:38:23 +0100
-
-java-wrappers (0.1.2) unstable; urgency=low
-
- * Adding link for the LGPL in debian/copyright
- * Closing ITP (closes: #467067)
-
- -- Vincent Fourmond fourm...@debian.org Fri, 22 Feb 2008 20:38:52 +0100
-
-java-wrappers (0.1.1) unstable; urgency=low
-
- * Ooops, maintainer is Java Packages, not java mailing-list !
-
- -- Vincent Fourmond fourm...@debian.org Wed, 13 Feb 2008 22:10:34 +0100
-
-java-wrappers (0.1) unstable; urgency=low
-
- * Initial release
Bug#609731: java-wrapper doesn't consider java-alternatives jvm
On Wed, Jan 12, 2011 at 12:44 PM, Gabriele Giacone 1o5g4...@gmail.com wrote: How about something like attached patch? That's a good start, thanks. That won't work for more specific things (JVM other than all), but that gave me some ideas at least. Could you please apply it in the pkg-java SVN ? (don't have access for now). I'll implement the rest tomorrow (please feel free to flame me if I don't). Cheers, Vincent __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#609731: java-wrapper doesn't consider java-alternatives jvm
On Wed, Jan 12, 2011 at 12:37 AM, Gabriele Giacone 1o5g4...@gmail.com wrote: Why doesn't find_java_runtime() also look for jvm pointed by java-alternatives? Because it is a mess when you have to consider the capacities of the different JVMs (true sun, openjdk, java6, java5, etc...). But, admittedly, that is a bug that should be fixed, if it does not cause regressions. I'll try to have a look at that some day... Cheers, Vincent __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
