[SCM] UNNAMED PROJECT branch, master, updated. 0.31-51-g1e79735

2011-03-08 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  1e79735d17cb82eafce05161ea56e0f52a1a95fe (commit)
  from  a7b20a13fabfcef765f5bac8a26ade340620 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 1e79735d17cb82eafce05161ea56e0f52a1a95fe
Author: Niels Thykier ni...@thykier.net
Date:   Wed Mar 9 08:08:19 2011 +0100

Added missing B-D-I on perl

---

Summary of changes:
 debian/changelog |1 +
 debian/control   |2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91372cb..0eaa785 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ javatools (0.33) unreleased; urgency=low
 (Closes: #612404)
   * Made jh_installlibs respect its --tmpdir option. Previously it was
 silently ignored.
+  * Added missing B-D-I on perl (for pod2man).
 
  -- Matthew Johnson mj...@debian.org  Sun, 05 Sep 2010 15:56:31 +
 
diff --git a/debian/control b/debian/control
index aee9589..e612318 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
 Uploaders: Matthew Johnson mj...@debian.org, Niels Thykier 
ni...@thykier.net
 Build-Depends: debhelper (= 7.0.50~)
-Build-Depends-Indep: default-jdk, libarchive-zip-perl (= 1.20), markdown
+Build-Depends-Indep: default-jdk, libarchive-zip-perl (= 1.20), markdown, perl
 Standards-Version: 3.9.1
 Section: java
 Vcs-Git: git://git.debian.org/git/pkg-java/javatools.git


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[pkg-java] r13401 - trunk/grinvin/debian

2011-03-10 Thread Niels Thykier
Author: nthykier
Date: 2011-03-10 18:28:54 + (Thu, 10 Mar 2011)
New Revision: 13401

Modified:
   trunk/grinvin/debian/changelog
   trunk/grinvin/debian/control
   trunk/grinvin/debian/rules
Log:
grinvin (1.2-1.1) UNRELEASED; urgency=low

  * Team upload.
  * Reduced B-D on default-jdk-builddep to default-jdk.
  * Removed deprecated dh_desktop command.
  * Added missing ${misc:Depends}
  * Corrected Vcs-Svn field.

 -- Niels Thykier ni...@thykier.net  Thu, 10 Mar 2011 19:22:35 +0100


Modified: trunk/grinvin/debian/changelog
===
--- trunk/grinvin/debian/changelog  2011-03-09 19:27:08 UTC (rev 13400)
+++ trunk/grinvin/debian/changelog  2011-03-10 18:28:54 UTC (rev 13401)
@@ -1,3 +1,13 @@
+grinvin (1.2-1.1) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Reduced B-D on default-jdk-builddep to default-jdk.
+  * Removed deprecated dh_desktop command.
+  * Added missing ${misc:Depends}
+  * Corrected Vcs-Svn field.
+
+ -- Niels Thykier ni...@thykier.net  Thu, 10 Mar 2011 19:22:35 +0100
+
 grinvin (1.2-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/grinvin/debian/control
===
--- trunk/grinvin/debian/control2011-03-09 19:27:08 UTC (rev 13400)
+++ trunk/grinvin/debian/control2011-03-10 18:28:54 UTC (rev 13401)
@@ -4,14 +4,14 @@
 Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
 Uploaders: Adriaan Peeters apeet...@lashout.net
 Homepage: http://www.grinvin.org/
-Build-Depends: debhelper ( 5.0.0), cdbs, patchutils, ant, 
default-jdk-builddep, docbook-to-man
-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/grinvin/
+Build-Depends: debhelper ( 5.0.0), cdbs, patchutils, ant, default-jdk, 
docbook-to-man
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/grinvin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/grinvin/
 Standards-Version: 3.8.0
 
 Package: grinvin
 Architecture: any
-Depends: ${shlibs:Depends}, libgrinvin-core-java (= 1.2)
+Depends: ${shlibs:Depends}, libgrinvin-core-java (= 1.2), ${misc:Depends}
 Recommends: libgrinvin-invariants-java (= 1.2), libgrinvin-factories-java (= 
1.2), libgrinvin-generators-java (= 1.0), libgrinvin-help-java (= 1.2), 
libgrinvin-graphs-java (= 1.2)
 Description: interactive software for studying graphs and their invariants
  GrInvIn is a software package for studying graphs, their properties

Modified: trunk/grinvin/debian/rules
===
--- trunk/grinvin/debian/rules  2011-03-09 19:27:08 UTC (rev 13400)
+++ trunk/grinvin/debian/rules  2011-03-10 18:28:54 UTC (rev 13401)
@@ -20,4 +20,3 @@
cp debian/grinvin.sh build/grinvin
dh_install -pgrinvin build/grinvin-dist-$(DEB_UPSTREAM_VERSION).jar 
usr/share/java/
dh_link -pgrinvin 
usr/share/java/grinvin-dist-$(DEB_UPSTREAM_VERSION).jar 
usr/share/java/grinvin-dist.jar
-   dh_desktop -pgrinvin


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[pkg-java] r13402 - trunk/grinvin/debian

2011-03-10 Thread Niels Thykier
Author: nthykier
Date: 2011-03-10 18:34:33 + (Thu, 10 Mar 2011)
New Revision: 13402

Modified:
   trunk/grinvin/debian/changelog
Log:
Fixed version

Modified: trunk/grinvin/debian/changelog
===
--- trunk/grinvin/debian/changelog  2011-03-10 18:28:54 UTC (rev 13401)
+++ trunk/grinvin/debian/changelog  2011-03-10 18:34:33 UTC (rev 13402)
@@ -1,4 +1,4 @@
-grinvin (1.2-1.1) UNRELEASED; urgency=low
+grinvin (1.2-2) UNRELEASED; urgency=low
 
   * Team upload.
   * Reduced B-D on default-jdk-builddep to default-jdk.


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[pkg-java] r13403 - trunk/apache-log4j1.2/debian

2011-03-10 Thread Niels Thykier
Author: nthykier
Date: 2011-03-10 18:35:33 + (Thu, 10 Mar 2011)
New Revision: 13403

Modified:
   trunk/apache-log4j1.2/debian/changelog
   trunk/apache-log4j1.2/debian/control
Log:
apache-log4j1.2 (1.2.16-3) UNRELEASED; urgency=low

  * Team upload.
  * Corrected default-jdk-builddep to default-jdk and
gcj-native-helper.
  * Updated Vcs-* fields.

 -- Niels Thykier ni...@thykier.net  Thu, 10 Mar 2011 19:30:47 +0100


Modified: trunk/apache-log4j1.2/debian/changelog
===
--- trunk/apache-log4j1.2/debian/changelog  2011-03-10 18:34:33 UTC (rev 
13402)
+++ trunk/apache-log4j1.2/debian/changelog  2011-03-10 18:35:33 UTC (rev 
13403)
@@ -1,3 +1,12 @@
+apache-log4j1.2 (1.2.16-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Corrected default-jdk-builddep to default-jdk and
+gcj-native-helper.
+  * Updated Vcs-* fields.
+
+ -- Niels Thykier ni...@thykier.net  Thu, 10 Mar 2011 19:30:47 +0100
+
 apache-log4j1.2 (1.2.16-2) experimental; urgency=low
 
   * Add --has-package-version to libapache-log4j1.2-java.poms

Modified: trunk/apache-log4j1.2/debian/control
===
--- trunk/apache-log4j1.2/debian/control2011-03-10 18:34:33 UTC (rev 
13402)
+++ trunk/apache-log4j1.2/debian/control2011-03-10 18:35:33 UTC (rev 
13403)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
 Uploaders: Kalle Kivimaa kil...@debian.org, Michael Koch konque...@gmx.de, 
Varun Hiremath va...@debian.org, Kumar Appaiah aku...@debian.org, Torsten 
Werner twer...@debian.org, Thomas Koch thomas.k...@ymc.ch, Ludovic Claude 
ludovic.cla...@laposte.net
-Build-Depends: debhelper (= 7), cdbs, default-jdk-builddep, ant, 
libgnujaf-java,
+Build-Depends: debhelper (= 7), cdbs, default-jdk, gcj-native-helper, ant, 
libgnujaf-java,
  libgnumail-java, maven-repo-helper, default-jdk-doc, libjboss-jmx-java, bnd
 Standards-Version: 3.9.1
 Homepage: http://logging.apache.org/log4j/1.2/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jakarta-log4j
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jakarta-log4j
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/apache-log4j1.2
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/apache-log4j1.2
 
 Package: liblog4j1.2-java
 Architecture: all


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[pkg-java] r13404 - trunk/jmagick/debian

2011-03-10 Thread Niels Thykier
Author: nthykier
Date: 2011-03-10 18:39:32 + (Thu, 10 Mar 2011)
New Revision: 13404

Modified:
   trunk/jmagick/debian/changelog
   trunk/jmagick/debian/control
Log:
jmagick (6.2.6-0-8) UNRELEASED; urgency=low

  * Team upload.
  * Reduced B-D on default-jdk-builddep to default-jdk.
  * Removed unneeded dependency on JREs for a java library.
  * Bumped Standards-Version to 3.9.1 - no changes required.

 -- Niels Thykier ni...@thykier.net  Thu, 10 Mar 2011 19:35:46 +0100


Modified: trunk/jmagick/debian/changelog
===
--- trunk/jmagick/debian/changelog  2011-03-10 18:35:33 UTC (rev 13403)
+++ trunk/jmagick/debian/changelog  2011-03-10 18:39:32 UTC (rev 13404)
@@ -1,3 +1,12 @@
+jmagick (6.2.6-0-8) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Reduced B-D on default-jdk-builddep to default-jdk.
+  * Removed unneeded dependency on JREs for a java library.
+  * Bumped Standards-Version to 3.9.1 - no changes required.
+
+ -- Niels Thykier ni...@thykier.net  Thu, 10 Mar 2011 19:35:46 +0100
+
 jmagick (6.2.6-0-7) unstable; urgency=low
 
   UNRELEASED

Modified: trunk/jmagick/debian/control
===
--- trunk/jmagick/debian/control2011-03-10 18:35:33 UTC (rev 13403)
+++ trunk/jmagick/debian/control2011-03-10 18:39:32 UTC (rev 13404)
@@ -3,8 +3,8 @@
 Uploaders: Varun Hiremath va...@debian.org, Kumar Appaiah 
aku...@debian.org, Michael Koch konque...@gmx.de
 Section: graphics
 Priority: optional
-Standards-Version: 3.8.4
-Build-Depends: debhelper (= 7), cdbs, default-jdk-builddep, libmagick9-dev, 
autotools-dev, chrpath
+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
@@ -12,7 +12,7 @@
 Package: libjmagick6-java
 Architecture: all
 Section: java
-Depends: ${misc:Depends}, libjmagick6-jni (= ${source:Version}), 
default-jre-headless | java2-runtime-headless
+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


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


Re: gtk-look and feel for KDE SC/oxygen

2011-03-11 Thread Niels Thykier
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Hey,

I am just forwarding this to debian-java@l.d.o, which is our debate list
to give it more exposure.

~Niels

On 2011-03-12 01:58, Fabi wrote:
 Hello. I want to ask something. For the KDE SC there is now a gtk theme 
 (oxygen-gtk) available thats ports the oxygen theme to gtk. now we can use 
 this theme with java to but we need to uncomment the file: 
 /usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/swing.properties. What i want to 
 ask is, if you can uncomment it so that we have an nicer workflow. like all 
 other, with a gtk-desktop env? 
 
 
 
 __
 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.

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJNeyACAAoJEAVLu599gGRC7MEP/2jG+dVgUzlqDcYeO/E+rVCY
bZQVhKjnUMmDm8lVGgO2l2mfvimF7y8VvI6pr36f0ZDesTJ9qgHu/Vdwyqx1dLcb
e3ElkV1HW849eoshC8TeDfGO+mcrkKvlX501SVSg2G0tq1HJDTCYD6jQhIyTB92N
DP4fz3ttw3z4DZac5b6HscXkLTD7r20CqvxAtZM73hqasGbvX6/k0iSlbILT08gM
TciNTXAxqjJW94lkYWwQlmqkHDt5NdkbIDnY50dLusrBnGmyaza02DqtFbRGhDjQ
1lRcWqDiWMTOdD4NGHYICdHWLuyZwQFze1A/8HLkyzsF1yxEPKInvM6STpZZaOQ5
akIIbgcsKJMgUgKw6GYOS8pFGoa1VyywvPM6PsloijFZV+ELygwuI9sGdEayt6zq
jH7NOHcRjyXbwKNewKkPxjr1JpyjwFN5pS3o0op4BFJMbJ6yYA/vACqvIA0rQmjc
Ur43alhlsFyQaFdpt/BVgLk4KRZvNNzN9YduyInOQ8MM2pTDN/UXrzgd1VX/AQBD
l1NNbIVp63MFasVBDLIigSA6LGoBpLG+KupMCgZxUAwWTmBm77Lw/2J0D7B5IrXB
G/bilhZZzLIAbMp0C3q+0XSryvMH3JFT8Bn66Wp/sNum5q18psobqvbs274nMgvw
wnu0X/vzVzKQMlYcEL/X
=HpgX
-END PGP SIGNATURE-

__
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] r13411 - in trunk/libsaxon-java/debian: . patches source

2011-03-12 Thread Niels Thykier
Author: nthykier
Date: 2011-03-12 08:44:05 + (Sat, 12 Mar 2011)
New Revision: 13411

Added:
   trunk/libsaxon-java/debian/javadoc-args
   trunk/libsaxon-java/debian/libsaxon-java-doc.examples
   trunk/libsaxon-java/debian/libsaxon-java-doc.javadoc
   trunk/libsaxon-java/debian/libsaxon-java-doc.lintian-overrides
   trunk/libsaxon-java/debian/libsaxon-java.jlibs
   trunk/libsaxon-java/debian/patches/
   trunk/libsaxon-java/debian/patches/series
   trunk/libsaxon-java/debian/patches/uppercase-encoding-names.patch
   trunk/libsaxon-java/debian/source/
   trunk/libsaxon-java/debian/source/format
Removed:
   trunk/libsaxon-java/debian/dirs
   trunk/libsaxon-java/debian/libsaxon-java-doc.javadoc
   trunk/libsaxon-java/debian/libsaxon-java-doc.lintian
Modified:
   trunk/libsaxon-java/debian/changelog
   trunk/libsaxon-java/debian/compat
   trunk/libsaxon-java/debian/control
   trunk/libsaxon-java/debian/rules
Log:
libsaxon-java (1:6.5.5-7) UNRELEASED; urgency=low

  * Team upload.
  * Removed unneeded JREs from lib package.  Thanks to Brian M.
Carlson for the report.  (Closes: #584243)
  * Removed Arnaud Vandyck from uploaders.  Thanks for your work
on this package.
  * Bumped Standards-Versions to 3.9.1
- Moved the packages to the java section
  * Use javadoc from default-java instead of openjdk-6.
  * Use javahelper to install jar files.
  * Rewrote d/rules as dh7 with overrides.
  * Replaced default-jdk-builddep with default-jdk and
gcj-native-helper.
  * Added missing ${misc:Depends}.
  * Linked the javadoc against system javadoc.
  * Accepted patch from Brian M. Carlson to make saxon use
uppercase encoding names.  (Closes: #568347)
  * Converted source package to 3.0 (quilt).

 -- Niels Thykier ni...@thykier.net  Sat, 12 Mar 2011 09:07:41 +0100


Modified: trunk/libsaxon-java/debian/changelog
===
--- trunk/libsaxon-java/debian/changelog2011-03-12 01:13:41 UTC (rev 
13410)
+++ trunk/libsaxon-java/debian/changelog2011-03-12 08:44:05 UTC (rev 
13411)
@@ -1,3 +1,25 @@
+libsaxon-java (1:6.5.5-7) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Removed unneeded JREs from lib package.  Thanks to Brian M.
+Carlson for the report.  (Closes: #584243)
+  * Removed Arnaud Vandyck from uploaders.  Thanks for your work
+on this package.
+  * Bumped Standards-Versions to 3.9.1
+- Moved the packages to the java section
+  * Use javadoc from default-java instead of openjdk-6.
+  * Use javahelper to install jar files.
+  * Rewrote d/rules as dh7 with overrides.
+  * Replaced default-jdk-builddep with default-jdk and
+gcj-native-helper.
+  * Added missing ${misc:Depends}.
+  * Linked the javadoc against system javadoc.
+  * Accepted patch from Brian M. Carlson to make saxon use
+uppercase encoding names.  (Closes: #568347)
+  * Converted source package to 3.0 (quilt).
+
+ -- Niels Thykier ni...@thykier.net  Sat, 12 Mar 2011 09:07:41 +0100
+
 libsaxon-java (1:6.5.5-6) unstable; urgency=low
 
   * Fix last fix to only use javadoc from openjdk-6. (Closes: #559966)

Modified: trunk/libsaxon-java/debian/compat
===
--- trunk/libsaxon-java/debian/compat   2011-03-12 01:13:41 UTC (rev 13410)
+++ trunk/libsaxon-java/debian/compat   2011-03-12 08:44:05 UTC (rev 13411)
@@ -1 +1 @@
-4
+7

Modified: trunk/libsaxon-java/debian/control
===
--- trunk/libsaxon-java/debian/control  2011-03-12 01:13:41 UTC (rev 13410)
+++ trunk/libsaxon-java/debian/control  2011-03-12 08:44:05 UTC (rev 13411)
@@ -1,17 +1,19 @@
 Source: libsaxon-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Arnaud Vandyck av...@debian.org, Michael Koch konque...@gmx.de
-Build-Depends: debhelper (= 4.2.30), default-jdk-builddep, libjdom1-java
-Standards-Version: 3.7.3
+Uploaders: Michael Koch konque...@gmx.de
+Build-Depends: debhelper (= 7.0.50~), default-jdk, javahelper (= 0.32~),
+ libjdom1-java, gcj-native-helper, default-jdk-doc, libjdom1-java-doc
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libsaxon-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libsaxon-java
 Homepage: http://saxon.sourceforge.net/
 
 Package: libsaxon-java
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${misc:Depends}, ${java:Depends}
+Recommends: ${java:Recommends}
 Suggests: libjdom1-java, libsaxon-java-doc
 Description: The Saxon XSLT Processor
  The saxon package is a collection of tools for processing XML documents and 
@@ -23,7 +25,9 @@
 
 Package: libsaxon-java-gcj
 Architecture: any
-Depends: libsaxon-java (= ${source:Version}), ${misc:Depends}, 
${shlibs:Depends}
+Depends: libsaxon-java (= ${source:Version}), ${misc:Depends}, 
${shlibs:Depends},
+ ${java:Depends

Bug#617897: javahelper: jh_installlibs assumes Debian epoch to be a part of upstream version

2011-03-12 Thread Niels Thykier
Package: javahelper
Version: 0.32
Severity: important

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

As the subject says. jh_installlibs thinks that the upstream version
of 1:6.5.5-3 is 1:6.5.5.

~Niels

- -- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-5-686 (SMP w/2 CPU cores)
Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (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.2  helper programs for debian/rules
ii  devscripts2.10.71scripts to make the life of a Debi
ii  dpkg-dev  1.15.8.10  Debian package development tools
ii  fastjar   2:0.98-3   Jar creation utility
ii  libarchive-zip-perl   1.30-3 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  gawk1:3.1.7.dfsg-5   GNU awk, a pattern scanning and pr
ii  tofrodos1.7.8.debian.1-2 Converts DOS - Unix text files, 

- -- no debconf information

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJNezg2AAoJEAVLu599gGRCr18QAIbtboRSj5S+f+4npKMabJHJ
CO20MBi8aOL1V3b0+6a+NkW86eyNpuBhxI+o9eFMRpaJBo94skmONhJfOK/CGe4m
dgVjtO+q43HXVGs5g23hsBKkBl7N+lX2YvZKqfWShvROCnCs/6WvD/KrVdwPSSKq
lF7v4XnYzjEiiIfr8/ZgCTQn9HW9nMLqmRK8aCmd8LMpXJpcje4jBbdqv33nCB1H
71Vreipkf1BMWQjnu6g5JUZ+909vifDD79kntn5uBMVEdyuSjGsubmp65kHuuqcR
2cPzRTUocr/v2YiMPBBQC4vQKT4b5VUhOZTFxof7/vm5ky9E3/UF3vu4UBgyrqFT
nqkNlNd8bYCzOlhfZgOS6gL4arfO7ubJu9z2TPWAvJz8RRUxFApK3P0VWL9sfqpm
rbFaADdGy4/5ww0xISRH+3UCzST+e5MLZaVNRQEX7XPRsrzarVHJFKVgiujiOwyT
Qdmj+BPnKPmWqGNicLAu6uyu8aidmDPEXugfDH2D+BPeSKbPDysd94irW/ccr2Ww
34AmfUkY0AZ2a6/TYRNy+pxJQMRWT8pEaNhp4XRVoTk2SmqygPLF3snDWpwrDQ0+
73FfdV0epjhsA4eAyQCceSvCCXdWg0WZ3ywK89YSOyVaM5qAe/hbYuYNlJCI92uN
1FvxYnet8owCjoAqnN52
=h8ef
-END PGP SIGNATURE-



__
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] r13412 - trunk/libsaxon-java/debian

2011-03-12 Thread Niels Thykier
Author: nthykier
Date: 2011-03-12 09:14:28 + (Sat, 12 Mar 2011)
New Revision: 13412

Modified:
   trunk/libsaxon-java/debian/rules
Log:
Worked around broken jh_installlibs and jh_depends and remove .PHONEY
and broken binary target.


Modified: trunk/libsaxon-java/debian/rules
===
--- trunk/libsaxon-java/debian/rules2011-03-12 08:44:05 UTC (rev 13411)
+++ trunk/libsaxon-java/debian/rules2011-03-12 09:14:28 UTC (rev 13412)
@@ -5,6 +5,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+UPSTREAM_VERSION=6.5.5
 JAVA_HOME=/usr/lib/jvm/default-java
 SOURCES=src
 BUILD=build
@@ -37,11 +38,16 @@
rm -f build-stamp configure-stamp saxon*.jar
rm -rf $(BUILD)
 
+override_jh_installlibs:
+   jh_installlibs --upstream-version=$(UPSTREAM_VERSION)
+
+override_jh_depends:
+   # jh_depends chokes on the jar file for some reason
+   jh_depends -plibsaxon-java-doc
+
 override_dh_strip:
 ifeq ($(with_gcj_native),yes)
dh_nativejava -plibsaxon-java-gcj
 endif
dh_strip
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[pkg-java] r13413 - trunk/libsaxon-java/debian

2011-03-12 Thread Niels Thykier
Author: nthykier
Date: 2011-03-12 09:26:05 + (Sat, 12 Mar 2011)
New Revision: 13413

Modified:
   trunk/libsaxon-java/debian/changelog
   trunk/libsaxon-java/debian/control
   trunk/libsaxon-java/debian/rules
Log:
Updated the description and avoided compiling javadoc
when doing binary-only builds.


Modified: trunk/libsaxon-java/debian/changelog
===
--- trunk/libsaxon-java/debian/changelog2011-03-12 09:14:28 UTC (rev 
13412)
+++ trunk/libsaxon-java/debian/changelog2011-03-12 09:26:05 UTC (rev 
13413)
@@ -17,6 +17,9 @@
   * Accepted patch from Brian M. Carlson to make saxon use
 uppercase encoding names.  (Closes: #568347)
   * Converted source package to 3.0 (quilt).
+  * Updated the descriptions a bit.
+  * Moved javadoc compilation to binary/binary-indep to avoid it
+being build when doing binary-only builds.
 
  -- Niels Thykier ni...@thykier.net  Sat, 12 Mar 2011 09:07:41 +0100
 

Modified: trunk/libsaxon-java/debian/control
===
--- trunk/libsaxon-java/debian/control  2011-03-12 09:14:28 UTC (rev 13412)
+++ trunk/libsaxon-java/debian/control  2011-03-12 09:26:05 UTC (rev 13413)
@@ -4,7 +4,8 @@
 Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
 Uploaders: Michael Koch konque...@gmx.de
 Build-Depends: debhelper (= 7.0.50~), default-jdk, javahelper (= 0.32~),
- libjdom1-java, gcj-native-helper, default-jdk-doc, libjdom1-java-doc
+ libjdom1-java, gcj-native-helper
+Build-Depends-Indep:  default-jdk-doc, libjdom1-java-doc
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libsaxon-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libsaxon-java
@@ -15,7 +16,7 @@
 Depends: ${misc:Depends}, ${java:Depends}
 Recommends: ${java:Recommends}
 Suggests: libjdom1-java, libsaxon-java-doc
-Description: The Saxon XSLT Processor
+Description: Saxon XSLT Processor
  The saxon package is a collection of tools for processing XML documents and 
  implements the XSLT 1.0 recommendation, including XPath 1.0, in its entirety.
  .
@@ -28,20 +29,23 @@
 Depends: libsaxon-java (= ${source:Version}), ${misc:Depends}, 
${shlibs:Depends},
  ${java:Depends}
 Recommends: ${java:Recommends}
-Description: The Saxon XSLT Processor (native code)
+Description: Saxon XSLT Processor (native code)
  The saxon package is a collection of tools for processing XML documents and
  implements the XSLT 1.0 recommendation, including XPath 1.0, in its entirety.
  .
  Saxon is known to work well for processing DocBook XML documents
  with the DocBook XSL Stylesheets. Related packages make the process
  straightforward.
+ .
+ This package contains the native compiled byte code for the Saxon XSLT
+ processor.
 
 Package: libsaxon-java-doc
 Section: doc
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}
 Recommends: ${java:Recommends}
-Description: The Saxon XSLT Processor's documentation and javadoc
+Description: Saxon XSLT Processor's documentation and javadoc
  The saxon package is a collection of tools for processing XML documents and 
  implements the XSLT 1.0 recommendation, including XPath 1.0, in its entirety.
  .

Modified: trunk/libsaxon-java/debian/rules
===
--- trunk/libsaxon-java/debian/rules2011-03-12 09:14:28 UTC (rev 13412)
+++ trunk/libsaxon-java/debian/rules2011-03-12 09:26:05 UTC (rev 13413)
@@ -30,9 +30,13 @@
# split off jdom classes, everything else into saxon.jar
(cd $(BUILD); $(JAVA_HOME)/bin/jar -cfM ../saxon.jar META-INF `find . 
-name \*.class | egrep -v $(JDOM)`; \
 $(JAVA_HOME)/bin/jar -cfM ../saxon-jdom.jar $(JDOM)/*.class )
+   touch build-stamp
+
+binary binary-indep:
+   # Only compile the javadoc if we have too
(cd $(APIDOC) ; $(JAVADOC) -sourcepath ../../$(SOURCES) -link 
/usr/share/doc/default-jdk-doc/api \
-link /usr/share/doc/libjdom1-java/api 
@../../debian/javadoc-args )
-   touch build-stamp
+   dh $@ --with javahelper
 
 override_dh_auto_clean:
rm -f build-stamp configure-stamp saxon*.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] r13414 - trunk/libsaxon-java/debian

2011-03-12 Thread Niels Thykier
Author: nthykier
Date: 2011-03-12 09:33:48 + (Sat, 12 Mar 2011)
New Revision: 13414

Modified:
   trunk/libsaxon-java/debian/changelog
   trunk/libsaxon-java/debian/control
Log:
Set dist.

Modified: trunk/libsaxon-java/debian/changelog
===
--- trunk/libsaxon-java/debian/changelog2011-03-12 09:26:05 UTC (rev 
13413)
+++ trunk/libsaxon-java/debian/changelog2011-03-12 09:33:48 UTC (rev 
13414)
@@ -1,4 +1,4 @@
-libsaxon-java (1:6.5.5-7) UNRELEASED; urgency=low
+libsaxon-java (1:6.5.5-7) unstable; urgency=low
 
   * Team upload.
   * Removed unneeded JREs from lib package.  Thanks to Brian M.

Modified: trunk/libsaxon-java/debian/control
===
--- trunk/libsaxon-java/debian/control  2011-03-12 09:26:05 UTC (rev 13413)
+++ trunk/libsaxon-java/debian/control  2011-03-12 09:33:48 UTC (rev 13414)
@@ -5,7 +5,7 @@
 Uploaders: Michael Koch konque...@gmx.de
 Build-Depends: debhelper (= 7.0.50~), default-jdk, javahelper (= 0.32~),
  libjdom1-java, gcj-native-helper
-Build-Depends-Indep:  default-jdk-doc, libjdom1-java-doc
+Build-Depends-Indep: default-jdk-doc, libjdom1-java-doc
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libsaxon-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libsaxon-java


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[pkg-java] r13415 - tags/libsaxon-java

2011-03-12 Thread Niels Thykier
Author: nthykier
Date: 2011-03-12 09:37:20 + (Sat, 12 Mar 2011)
New Revision: 13415

Added:
   tags/libsaxon-java/1:6.5.5-7/
Log:
Tag for 1:6.5.5-7 upload


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


Bug#587657: locally installed plugins aren't loaded

2011-03-15 Thread Niels Thykier
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 2011-03-15 21:10, Borden Rhodes wrote:
 Is this bug still being worked on?  [...]

Hi

Personally I am hoping for a solution from upstream here;  at best we
can hope to provide some fragile scripts that on a best effort basis
attempts to repair the bundles files.
  It would be a much better solution if upstream anticipated this kind
of setup and these possible mismatches.  Especially since we are much
less likely to be able to create a solid solution to assist in a 3.5 -
3.6 migration (or similar).

 I don't know if I have the same
 cause but I have the same symptoms.  I got a new computer, installed
 Eclipse, moved my ~/.eclipse folder over to the machine and, same as
 the initial bug report, the local plug-ins show up in Installed
 Software they're not accessible in Eclipse.  If I wipe ~/.eclipse and
 start fresh, I can reinstall the plug-ins but this is pretty
 inconvenient since I have quite a few and configured just the way I
 want them.
 
 I'm using Eclipse 3.5.2-9 (Wheezy) on a 64-bit processor (which may be
 relevant since my old laptop was a 32-bit system...)

 With thanks!


I have a feeling eclipse does not support this kind of thing.
~/.eclipse/ is filled with paths and user dependent stuff.  An example:

  grep -r $USER  ~/.eclipse/

That command will fill your screen with things that are dependent on
your username alone.  If you check for workspace in ~/.eclipse/ it
also comes up with a couple of binary files that matches (at least in my
case).
  I would definitely not be surprised if some of this is also
architecture dependent.  Actually, if you search for x86 (at least on
an i386) you will probably see something like[1].  So I am actually
rather confident that it is definitely architecture dependent.

On a related note, I noticed eclipse apparently dumped a lot of class
files in my ~/.eclipse, which I am trying to investigate why has happened.


You are very welcome to help us locate files that contains actual user
settings; it could very well help us inform users how (or possibly even
partly automate) to migrate preferences from 3.5 to 3.6 when we get 3.6
ready.  Though these preferences are likely to be plugin dependent.

~Niels

[1]
org.eclipse.core.filesystem.linux.x86,1.3.0.R35x_v20091203-1235,plugins/org.eclipse.core.filesystem.linux.x86_1.3.0.R35x_v20091203-1235.jar,4,false
[...]
Binary file
../../.eclipse/org.eclipse.platform_3.5.0_155965261/configuration/org.eclipse.osgi/.bundledata.14
matches
Binary file
../../.eclipse/org.eclipse.platform_3.5.0_155965261/configuration/org.eclipse.osgi/.state.14
matches
Binary file
../../.eclipse/org.eclipse.platform_3.5.0_155965261/configuration/org.eclipse.osgi/.lazy.14
matches
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJNf+O8AAoJEAVLu599gGRC1/kP/A2KpiXfGW6me/6pw+sbHB1G
aHywzsVoD4Z43sZDMhDNn0rGopDixNd6H/bhLX7IYKFyG1tK8vaY9zBOAG5ecq16
zlY4WZj4yT6EEcCht04Tjbe0LAR8D2GiVfBR9jgLa3NpnoCG761jpQms0YYUtdCN
6xlzUZNHGWon+QJqZCmV4RhM8cFoVhP8fJa4+SNw+UKyXYvVn+08bPEx8QigSOHu
3Xa6qk4JmHacSHFw8Bqbhor00iIhr3NsWzOetO5b7A7zPCw1GxnXDMTwuHrJ1ywI
tHRh7e4kaKuc3bTieNa5dhzhFHtLAeK7tdMkmnjOuo5RQlaV0YFYd0MxqBm6sBqz
zmvaNKfW4GODPfHcRBxTHzg+iyaMWSPxA58Au5KRSE/W6Lib+0VHbI2daFUEahLu
FL+Q66TR+OU3rWZ6KPQSTL1lZLRMKwI3CzxwEKRSm+SCLMu07klmlF7zK6rmD6wj
O/oMwE6JKc02UHNghMC8k7d13v9CuAKMtVwfpgLBlQsC0qjAdZg9SEslM3gred7P
41Rb+galPz6arb0OvE2Aaja2xKRBQpCX4cZIUNe4T2jWKKuI7H9iSPGw/4fTfh5h
1BD+HrkE/NrVuQmbN4ZW6gyjP9WF6BQwxWLar7gYGpI/FNkgHPYkuLEBeKHIvhV6
JYLulcw24BsQVyhLLLZl
=X2Uq
-END PGP SIGNATURE-



__
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#612124: Acknowledgement (libxerces2-java: Depends-line broken due to hidden special character)

2011-03-16 Thread Niels Thykier
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 2011-02-06 06:19, Martin Millnert wrote:
 An update.
 
 My first assumption seems to be wrong, but something else seems to be
 seriously wrong:
 
 root@sslvpn-test:/usr/src# aptitude why libxerces2-java gcj-4.4-base
 p   libxerces2-java  Depends  default-jre-headless | 
 java1-runtime-headless | java2-runtime-headless
 p   gcj-4.4-jre-headless Provides java2-runtime-headless  
   
 p   gcj-4.4-jre-headless Depends  gcj-4.4-base (= 4.4.5-2)
   
 root@sslvpn-test:/usr/src# aptitude why libxerces2-java sun-java6-jre
 p   libxerces2-java Depends  default-jre-headless | java1-runtime-headless | 
 java2-runtime-headless
 i   sun-java6-jre   Provides java2-runtime-headless   
  
 
 http://packages.debian.org/sid/java2-runtime-headless
 
 Either of the packages on the above URL should satisfy the dependency,
 yet neither aptitute nor apt-get manages to understand that the virtual
 package is provided for already.
 
 I'm at a loss as to why this does not install w/o gcj.
 
 Regards,
 Martin
 


Hi

Your problem is most likely that recommends are being installed by
default and libxerces2-java recommends  libxerces2-java-gcj. (It could
also come from a dependency of libxerces2-java(-gcj))
  Installing recommends by default was enabled in Lenny (as I recall).

~Niels


 On Sun, 2011-02-06 at 05:06 +, Debian Bug Tracking System wrote:
 Thank you for filing a new Bug report with Debian.

 This is an automatically generated reply to let you know your message
 has been received.

 Your message is being forwarded to the package maintainers and other
 interested parties for their attention; they will reply in due course.

 Your message has been sent to the package maintainer(s):
  Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org

 If you wish to submit further information on this problem, please
 send it to 612...@bugs.debian.org.

 Please do not send mail to ow...@bugs.debian.org unless you wish
 to report a problem with the Bug-tracking system.

 
 
 
 
 
 __
 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.
 

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJNgJj9AAoJEAVLu599gGRCLR8P/1K1ZgvKtfA6Kp5Ibm2/Qe0I
Q3+Ir9gY8iofAowtseiGivjA+BDPnYHpi4BjIbb0fr+c+/0jkhXfyqQKYljCkI60
sHSQRJqUlm3qN7mPQM9+5b/USSd8Yr6YzEHqTkhxuqrO/jXZ5Kg5NyvZs6GkElaV
8mA9GLaNOwsc2ISAYECgduoGgKLkT42pjY6ETbHwnV39fykrzzqDhtTpYkGaEvfz
vT2ds0EVWhzGaZMelocadrIRruNAwtkUYZLQ7cTjTnDq45s4mC4E557JZ4cZXYhp
ulrod0keuSkn5hQm6d2+zaZtoMWzx4ZQVvpbFM86QvLDr4S7X1GH441BIi1VRHid
ngJoqZH/fvt+GnUMSMmZc5Kxv6UTRq8r422yFFXXdYtucss9w4ZuKgB7QxTbCcw+
cexU4n2MzZyK+O2xw3AJoe47tQD4bXHqTk+XEPqA+uKKFX7RHg0aWaKDyaN2dwAu
FxDKym2HKVa2Fvq4QXJ+c7cn2QXUxstu1uIb1jrVx581SfcfVdlaQf7wRoyrzTEe
U7Zyg83MK4/eS/eTYoS0WzM8Pi41ShIpQl9FL1A9FTNJ9Oeuye+8zSTw+Uqiti4h
H79QCS0H/gL120kSyxP0lJ9bpd/5KyXfAYvCaikXgOGXNETsqultBB6F9wrZVsxc
i/TmjBTesUSw8NQZYNTh
=IMpO
-END PGP SIGNATURE-



__
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#607742: vuze pkg in debian

2011-03-17 Thread Niels Thykier
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 2011-03-16 23:39, Paolo Aglialoro wrote:
 Hello!
 
 I'm writing you to inquire about the status of vuze in debian... I'm running
 sid but even now, after the release of squeeze, there's no update to the old
 version in the repos... which not only is old and memory hungry, but,
 *especially*, does not yet feature the search function working :(
 
 Is this going to change soon?
 Thanks a lot for all your work
 Paolo
 
 
 
 [...]

Hi

Looks like #607742 to me.  Perhaps Adrian Perez can comment on when vuze
will be updated.

~Niels

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJNge9BAAoJEAVLu599gGRCXlIP/02f9pX0QUjQQT91jm7qCDo0
JY0d337CrUIhN6OHn8Q5VDk5rGXH1I9BnyIjUBal2pN4MHfXQB0ecfQkB5V6L5A9
fqKublOjK2oSaw+cPnLBQK0EKHX9VF/2+lS3OkMfS+b4CSV56w7VcpkYAig0x5Lz
pZ4gPWnnaDjUWx6SO8pm4wUgLhJeZcI10sxMta6TTKZ5MmYCo9d1trmNjOlla4X4
EcrbCHxWf4DEJflAta0n1cWogbdcZmdoly61X0W/0IoVYUTwQzW/DbRs+IvId16V
o0GxnuQE0n900mHsQE6DUfEzvKIpUEomHPxP9ix3einXXsCFN5tz604Su9SoqRg7
KP6gF41D2hGDRixXA91b2LkD/V0sN0aC3MI93MFj6funssoN6IOZlMNSzD8bvHzi
g/AC9wGOBqdOkOoGw3NwygMsTXmgoQ2avQwg71pkgIV7LA0CugXwjUDpCZEONpmO
QQLl7isN1ynfkNdN5DkgiKKBZoPK1Lk2pkI3gkw6R60opPw/O2HjMnzMX9DdOFca
X3sFC0GJY+2jAcjqx5PXi9b57klwLiABJLDIIgmxLmcz5Xvd7sJ30KAwCX+De7XB
SSp+aZQcdeZgLdrUB/SMhkTDo6wTOE65Pq/rtU4gB+UPLzApaezRq2ef+xfkaqjt
zVVUaQm1BgTx75olInA1
=WOHZ
-END PGP SIGNATURE-



__
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#618788: gluegen2: FTBFS on kfreebsd-*: You must specify a valid JAVA_HOME or JAVACMD!

2011-03-18 Thread Niels Thykier
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

# inconsistency between B-D and JAVA_HOME
severity 618788 serious
thanks

On 2011-03-18 14:44, Cyril Brulebois wrote:
 Source: gluegen2
 Version: 2.0-rc2-4
 Severity: important
 User: debian-...@lists.debian.org
 Usertags: kfreebsd
 
 Hi,
 
 your package also FTBFS on kfreebsd-* due to:
 | dpkg-buildpackage: host architecture kfreebsd-amd64
 |  /usr/bin/fakeroot debian/rules clean
 | test -x debian/rules
 | dh_testroot
 | rmdir make
 | rmdir: failed to remove `make': Directory not empty
 | make: [cleanbuilddir] Error 1 (ignored)
 | You must specify a valid JAVA_HOME or JAVACMD!
 | make: *** [testsanity] Error 1
 

This is caused by a B-D on default-jdk when using openjdk-6 has
JAVA_HOME.  If you are using default-jdk, JAVA_HOME should be
/usr/lib/jvm/default-java; alternatively you should B-D on openjdk-6-jdk
and not default-jdk.
  The reason is that default-jdk may not provide openjdk-6-jdk forever
(e.g. when we migrate to java7).

 Full build logs:
   https://buildd.debian.org/status/package.php?p=gluegen2suite=experimental
 
 KiBi.
 
 

~Niels
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJNg2Y/AAoJEAVLu599gGRCmAMP/3VWaJOmPlsQAnzvl55YT2e7
RCFjUg9L1IKXnuICr5W68/SN2DWP3KamE6ZSGmU7n4AYmbWZcFYUDHlLDwCeV6oK
FG/kWBAxLzFesknNl/jcNFkwpeCBsNGeANK6e6hkS1E2waAvzVRKe1P5xGB9Go4k
dRZLg+2Xn+PnLfAzpQVt/HGSg//4yU/zMA+TGDdNlJXkQNQ5HqvgGbZplMxuhOQ+
84V5nJ2mxBH6sNMA4BG8ffDnrAL1ZpZpgz0sKjIAyUQeQdENhNr4gyKcZgV6IZGO
b44iR1Kip+mIAbrdFICvGRdnJ/P4rQE++kMaJ6W5n7mIj43MSBHbvz793wSCftdP
dm1U7MKpz2PKTBcMw3Va+t0AByR17y11agEqOefk4ThE+2d7Nw2Sb9LNo+5I70Fm
LCdm4Klx2ZX1MwpLdq0qKuMmpB+nwMXgwmawFh60kJquzL9d/pFfhEnsADZmLbY1
btjBMBx0MjgEY3NWFD6P07scyILLwg3hUkkwnJ5ERsznfAjTKqL61eNAPHo9k7e+
/dYFbBCGti6DIIqSA8TXYJPOsNcBzKbRyNOfj7As2xOWW0lSnn6AtWAbLOiGxELW
c50xHBJNNz2wvTFp7jsJLmmDf62pZsnJyVr3YFOkRjd5VFpYxrbiIVzohbX4S8o+
SX5L6HD4ektCOVg+8ToG
=zjWo
-END PGP SIGNATURE-



__
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.


[SCM] UNNAMED PROJECT branch, master, updated. 0.31-58-g54d5dbd

2011-03-20 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  54d5dbd09bd131717d06e219c951169d8efc2bca (commit)
   via  e8a615e3e0767dd3a69c52516d4dcd81d3649d9d (commit)
   via  0c0f34fc594bd61964af0a83de5aa41fe856cb40 (commit)
   via  a61ba8636021e1e9a94f897e84ed981b528be751 (commit)
   via  60a029166df4c0e42fa55e814783a4e208e72aff (commit)
  from  cca85591cfe04e192b5dfd99f683868da0681abc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 54d5dbd09bd131717d06e219c951169d8efc2bca
Author: Niels Thykier ni...@thykier.net
Date:   Sun Mar 20 17:47:01 2011 +0100

Fixed a typo in jh_compilefeatures

commit e8a615e3e0767dd3a69c52516d4dcd81d3649d9d
Author: Niels Thykier ni...@thykier.net
Date:   Sun Mar 20 17:44:14 2011 +0100

Renamed subs for case consistency

commit 0c0f34fc594bd61964af0a83de5aa41fe856cb40
Author: Niels Thykier ni...@thykier.net
Date:   Sun Mar 20 17:41:38 2011 +0100

Removed useless interpolization, s/die/error and renamed a sub

commit a61ba8636021e1e9a94f897e84ed981b528be751
Author: Niels Thykier ni...@thykier.net
Date:   Sun Mar 20 17:29:03 2011 +0100

Fixed typo in jh_generateorbitdir

commit 60a029166df4c0e42fa55e814783a4e208e72aff
Author: Niels Thykier ni...@thykier.net
Date:   Sun Mar 20 17:27:02 2011 +0100

Migrate jh_generatorbitdir to the perl manifest handler

---

Summary of changes:
 debian/changelog|2 +
 jh_compilefeatures  |2 +-
 jh_generateorbitdir |  101 +--
 jh_installeclipse   |8 ++--
 4 files changed, 48 insertions(+), 65 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8d2927f..159b046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ javatools (0.33) unreleased; urgency=low
   * Made jh_installlibs respect its --tmpdir option. Previously it was
 silently ignored.
   * Added missing B-D-I on perl (for pod2man).
+  * Migrated jh_generateorbitdir to the perl Manifest handler.
+  * Fixed typo in jh_generateorbitdir and in jh_compilefeatures.
 
  -- Matthew Johnson mj...@debian.org  Sat, 12 Mar 2011 12:58:50 +
 
diff --git a/jh_compilefeatures b/jh_compilefeatures
index 5f7c585..b3e79eb 100755
--- a/jh_compilefeatures
+++ b/jh_compilefeatures
@@ -178,7 +178,7 @@ sub compile{
 my @deps = ();
 DEP_LOOP: foreach my $d (@_){
# Check if we just built this feature.
-   foreach my $s qw(. .zip .ZIP) {
+   foreach my $s ('', '.zip', '.ZIP') {
my $zip = $pdebdir/$d$s;
if( -e $zip ){
install_zipped_feature($zip, $pdebdir/build/SDK);
diff --git a/jh_generateorbitdir b/jh_generateorbitdir
index 6f6f8e6..22c0a40 100755
--- a/jh_generateorbitdir
+++ b/jh_generateorbitdir
@@ -7,8 +7,12 @@ jh_generateorbitdir - Creates and populates an orbit dir used 
by pde-build for t
 =cut
 
 use strict;
+use warnings;
+
+use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
 use Debian::Debhelper::Dh_Lib;
 use Debian::Javahelper::Eclipse;
+use Debian::Javahelper::Manifest( qw(MAIN_SECTION) );
 
 =head1 SYNOPSIS
 
@@ -91,35 +95,38 @@ $SIG{'INT'} = \sighandler;
 $SIG{'TERM'} = \sighandler;
 
 if( ! $dh{NO_ACT}){
-open(ORBIT_CACHE, , $cachefile) or error($cachefile: $!);
+open(ORBIT_CACHE, '', $cachefile) or error($cachefile: $!);
 }
 
-doit(mkdir, -p, $orbitdir);
+doit('mkdir', '-p', $orbitdir);
 
-foreach my $jar (findJars(@orbitdeps)){
-my $fields = readFields($jar, EOB_SYM_NAME, EOB_BUNDLE_VERSION);
-my $symName = $fields-{${\EOB_SYM_NAME}};
-my $version = $fields-{${\EOB_BUNDLE_VERSION}};
-if($dh{NO_ACT} ){
-   $symName = 'bundle-name';
-   $version = 'bundle-version';
-}
-error($jar did not have any OSGi metadata) unless(defined($symName)  
defined($version));
+foreach my $jar (find_jars(@orbitdeps)){
+my $manifest = read_manifest($jar);
+my $msect = $mainfest-get_section(MAIN_SECTION);
+my $symName = $msect-get_value(${\EOB_SYM_NAME}, 1);
+my $version = $msect-get_value(${\EOB_BUNDLE_VERSION}, 1);
+error($jar did not have any OSGi metadata)
+unless(defined($symName)  defined($version));
 if( -l $orbitdir/${symName}_${version}.jar){
my $ltarget = readlink($orbitdir/${symName}_${version}.jar);
if(defined($ltarget)){
#Use target
-   print ORBIT_CACHE $ltarget, $symName, $version\n 
unless($dh{NO_ACT});
+   print ORBIT_CACHE $ltarget, $symName, $version\n
+unless($dh{NO_ACT});
} else {
-   warning(Cannot determine target of 
$orbitdir

Re: Preserving jre/lib/security/cacerts

2011-03-21 Thread Niels Thykier
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 2011-03-21 11:23, Tomas Salfischberger wrote:
 L.S,
 
 I just noticed that Ubuntu replaces JDK_HOME/jre/lib/security/cacerts
 with a symlink to /etc/java-6-sun/security/cacerts, this allows for
 installing updated Java packages without overwriting the cacerts file
 and losing any user-installed certificates. Is there a reason it is not
 done this way in Debian? Or might this be a good feature-request?
 
 Best regards,
 
 Tomas Salfischberger
 
 P.S. I'm not subscribed to pkg-java-maintainers, please CC me in replies.
 
 __
 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.
 

Hey

As far as I can tell we do this with at least sun-java6 (in
sid/testing); but not openjdk-6 (which points to
/etc/ssl/certs/java/cacerts).  Is Ubuntu really using
/etc/java-6-sun/security/cacerts for openjdk-6 as well?

~Niels

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJNhzvKAAoJEAVLu599gGRCKE4P/Azwlm619IpO3kfJOWmU+/Kc
SNXBsUekm99ZEGR9plZHwqp2/+Uc/HpXe7VXX0d/pHfgYDtD+WAy8p7jAP8UU8j+
+lAoR08VGuQ0uXKQj79TknCJk6JJAILLKnrH+usDHknQ4pQxYeS5gs7kxHvvhF4X
CsGniJoGzvQR35HPwlATTlpfxfE3IP1Vb7uTA/qJ0x1X0gI1f+kj++SdUV9cGn/c
r2gF88DmOusgGis+OeedHRlL0g1txCxsSiQhKnHMbmTx7pPmG23Ix0Yulp6Q1U6T
pReSP2tSL8nYZObdMsiAWAQdiiqdLR41gVNtgjjUEPjCZd0gupswL9B5NsuZgX6V
Z0LSqxsAs+oQIubx3Ebz52MExAuOMxFHx5qKg252ylCgl7ipja7mW5gOjT7BmkRx
xw0y1n+rvEaozaEISw0Cr54T8cybOrDQiw3Abcb5CHG/3iugE54uoEyfyABMswLo
yfkIRxiWEKaIQnoZLrXQbsHXDkrvacCupysB4lEB6l9kwJDqqgSAYQmR827jEuPi
JNi2y3ejavDaf91GdK5qorSyAuYxDyBCEqKwfx0keyw32oCkrcXSNyYQlgbqCdcE
3zc+/wa49onDwIubd+ndKFLd/SZx9+RaXYdJ4cEuT/1L8EAHKWaWnRFep6Bf2WaI
TM4PehhBU7SvrBuZ7moq
=xJah
-END PGP SIGNATURE-

__
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.


[SCM] UNNAMED PROJECT branch, master, updated. 0.31-59-gd126440

2011-03-24 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  d126440360591f34ddb4354c62b761e6d91d4515 (commit)
  from  54d5dbd09bd131717d06e219c951169d8efc2bca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit d126440360591f34ddb4354c62b761e6d91d4515
Author: Niels Thykier ni...@thykier.net
Date:   Thu Mar 24 21:36:47 2011 +0100

Fixed a couple of issues/dev-regressions in jh_generateorbitdir

---

Summary of changes:
 jh_generateorbitdir |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/jh_generateorbitdir b/jh_generateorbitdir
index 22c0a40..620a913 100755
--- a/jh_generateorbitdir
+++ b/jh_generateorbitdir
@@ -12,6 +12,7 @@ use warnings;
 use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
 use Debian::Debhelper::Dh_Lib;
 use Debian::Javahelper::Eclipse;
+use Debian::Javahelper::Java;
 use Debian::Javahelper::Manifest( qw(MAIN_SECTION) );
 
 =head1 SYNOPSIS
@@ -102,7 +103,7 @@ doit('mkdir', '-p', $orbitdir);
 
 foreach my $jar (find_jars(@orbitdeps)){
 my $manifest = read_manifest($jar);
-my $msect = $mainfest-get_section(MAIN_SECTION);
+my $msect = $manifest-get_section(MAIN_SECTION);
 my $symName = $msect-get_value(${\EOB_SYM_NAME}, 1);
 my $version = $msect-get_value(${\EOB_BUNDLE_VERSION}, 1);
 error($jar did not have any OSGi metadata)


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


Re: RFS: yui-builder

2011-03-26 Thread Niels Thykier
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 2011-03-26 19:44, Michael Gilbert wrote:
 Hi,
 
 I've packaged yui-builder to help solve bug #512915 in yui.  Would
 anyone be so kind as to review and sponsor the upload?
 http://mentors.debian.net/debian/pool/main/y/yui-builder
 
 Thanks,
 Mike
 
 
 __
 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.
 

Also forwarding this to debian-java@l.d.o

~Niels
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJNjjbHAAoJEAVLu599gGRCiH8P/i5L4ikv19nKWiPUxdCLrOv5
I/oBBV7bn3ZE7kgYvdj3jeK62Xj1GUzs3UQ4Laerli+i7EmfSE5jKGRRyQLjKWYU
vP9zt8gG1+oZ9OnAQfQBeTbIXvYv//mBjTaaBAr+Ywhz1XixbwNZ4YtCfgEbi3jA
w5IPXYTzhxuPm3Z2uLMqjNYPRvMvVadkNdLoLm7VS9RY5vVkK4Ljc6q8fgeyMreV
ktWZ0FoDwVagYgZvG3pZSlhJzfwJw+Ju5fNfddRivd5FubC0lUX+z7e9jPpgb6md
s3XY89r3f/iZ5KKXIbtABJtTn0PAeGyby5H4Bk1AMtGfkWAeKXK5Dt0xn4Hgqsf4
JE0YKAFKDF5Gk7wCE0GRKN5ln9Q60ZMRS1G5b6o2htFI6u1siiYWhAMxYSa3lxoc
CN2DfkYsra+2IIyi/hB6dXYgnzrWIFgX9Ro3ZkzshB+6kdtLtv3VyJC8vYKL7Mez
+nNhFdyLBe6SR1gCUXPZ84T8ASWQHs6i2ZPpKvNsu32OPFL0q3vquzuDXtKdZfiR
0MajiU37V69JNzhu3SFAaoCLs1k+P8eJ2CpPKtAN8sA5jy4ua3FULxZ+PBXCNUgz
Akkd5bVBWkiU9/Nqw6nMA5EpfaZP8VhnPVVt68sfpqDkfkhKHNH7BXEib/YfBIIe
r4EtDzZVtf+aNkv/D8T9
=bsUr
-END PGP SIGNATURE-

__
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#593670: Announce of the upcoming NMU for the hadoop package

2011-03-29 Thread Niels Thykier
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 2011-03-29 07:45, Christian PERRIER wrote:
 Dear maintainer of hadoop and Debian translators,
 
 Some days ago, I sent a notice to the maintainer of the hadoop Debian
 package, mentioning the status of at least one old po-debconf translation 
 update in the BTS.
 
 I announced the intent to build and possibly upload a non-maintainer upload
 for this package in order to fix this long-time pending localization
 bug as well as all other pending translations.
 
 The package maintainer agreed for the NMU or did not respond in four
 days, so I will proceed with the NMU.
 

Hi,

Thomas did send a reply[1] about this NMU to you suggesting that it
would be a waste of your time to update the translations (for reasons
mentioned in the original email).  It is possible he did so only as a
list reply (I cannot see the headers of this email in the archive and I
cannot remember the original email).

~Niels

[1]
http://lists.alioth.debian.org/pipermail/pkg-java-maintainers/2011-March/030863.html

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJNkXhpAAoJEAVLu599gGRCEFkP/jvmLJJ0XsuS2h3tiNLsPGR7
UioQ7oYOMyKbq5P0mO/o7Yma1lWrZgnFKDk7uABkj1Ph/wRrtBPw6wX95irQUfUb
yYonEHhTg8kWCFPKyfWj2+KxJbDOEWFkQPutj+nD2dyj9iuNcUVr9O+SHKNFEDwd
o55HnrCfbPUCgDkWvWMxq7+bQgQdac/04zbklWSYHVHbcMplbC4KuB76DW7LQYHD
piCrT2T+dcKn+Oa7Vqavjh83oB/wdUs47IaRNuVIjLtfuc7hTmF/g0BERQeEftNS
Q4TVPwNT/JR9gJ5eP4nw2eQPojcs8PKr0ZWN/LQY10e78cRt7al++pQ9Lf4y88LX
ezhRgrqrmDA2p50KnkKV6oaiz+SkqWrmf3lDvuyqdyFkVClT8qq2e/PmJPmC2Yfj
Ts5GyK9bT7U3q0exYkqGXTDcZV5ZVX/KK3Wzs0FwM1OFW4uFagQuVxrzy27m8J9/
23wmZUExpAlg4F3i+dSBmqNBuFYQlz8BzlzttAKokXbU626M9Z5Tn7PWZ0CiFR3S
Udh77NsZGOsg8xtvfJi6Z2Xhyc1kKxYEsXY+YyRK+aqhikIHZc7wnLnQRweFXLnH
2tAtpV8Qdn5vHT3GM6iZQa+TA1pWKdu7p6KS6ycBnHyC3Tl2zvtT46EhBDtoAbIF
A5662plDrdHRmTIvDgcM
=cwHR
-END PGP SIGNATURE-



__
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.


[SCM] UNNAMED PROJECT branch, master, updated. 0.31-60-g3c490bb

2011-04-09 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  3c490bbf3f5866e894f5099bf9fa765f7e45545b (commit)
  from  d126440360591f34ddb4354c62b761e6d91d4515 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 3c490bbf3f5866e894f5099bf9fa765f7e45545b
Author: Niels Thykier ni...@thykier.net
Date:   Sat Apr 9 23:01:28 2011 +0200

Adding closes now there is a bug for it

---

Summary of changes:
 debian/changelog |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 159b046..18075ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ javatools (0.33) unreleased; urgency=low
   * Put the JDK dependency in Build-Depends of the control files
 generated by jh_makepkg, since it is needed by the clean rule.
   * Made cdbs run jh_installlibs before jh_manifest and jh_classpath.
+(Closes: #621857)
   * Added missing depends on findutils for javahelper.
   * Converted tutorial into markdown format.
   * jh_installlibs now properly picks up the version of native packages.


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


Bug#621857: dh sequencing isn't the same as cdbs sequencing

2011-04-09 Thread Niels Thykier
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 2011-04-09 16:38, Vincent Fourmond wrote:
 Package: javahelper
 Version: 0.32
 Severity: normal
 
   Hello,
 

Hi :)

   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.

   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 ;-)...


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.

   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:
 [...]

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).

~Niels

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJNoMkTAAoJEAVLu599gGRCpGcQAJv6S6LQGDy8kevMsHJVZanz
FnEZ4T/GddZtak5ebk4g92YYq3+S5TWQ9GNcNOVyzuHN8i5QT2z3IAW/AltB6/5A
VVizmzOyNGIlAKGCHQIMXFAnoR63ue2w00652ON4nl25p6HpzyK3X+dHq6BZ4Cx9
LM1ANn04peOHBNUfDjEsCK/I8Pt5N55Y12uU7YTu0kiYfbL4lpmrvYd+P8/o5Bgj
8k0ql/inZ2Xbk/Pvzd9lF3MLqLbBA9So7hsDLBjoYfVEeBbLbSqt/NFI7xBlWwfT
cVGAial29DWIx1ReQ0cvp8xAzDSFHa69T2wA14XvgpgHgZ01vI8Z+z3QpqwBUcS4
nGANwm4MAorgFL1IYrD98OC8dlvOP763syJy0LHtW25Bl2/ZGfko+R0bCE94Amb2
vLJHF2CrZCE+XiByrxGhjNMBcGXOPpwBr++sGr/ky79LiCrZEAPpdkqgvAGjo2PM
An3Y18vafrjzF/B6li/twWqF1SUFNVma24VGsdZJ9u0V3T0Nr8RNOmoO7SmbgdWm
VK05SH4ySbQT0gMReBzicS7pbHQ9R7sdgxm/VL5II4mfGxMbfY8vL2CqUTaZanwJ
csGYkRmhzzwD7BOECObrWLsZIxhdncuqifYRW5Y6Mu+PTF5R2FLsDUmZc0tPX2vv
IcVk0kq7XQU5XyfJMHis
=KlBP
-END PGP SIGNATURE-



__
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.


[SCM] UNNAMED PROJECT branch, master, updated. 0.31-61-g616bd5d

2011-04-16 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  616bd5d77db6fd3f3d51ee8057feaf5c83e99eca (commit)
  from  3c490bbf3f5866e894f5099bf9fa765f7e45545b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 616bd5d77db6fd3f3d51ee8057feaf5c83e99eca
Author: Niels Thykier ni...@thykier.net
Date:   Sat Apr 16 09:47:42 2011 +0200

Correct path for jh_classpath when it is not given a jar arg

---

Summary of changes:
 jh_classpath |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/jh_classpath b/jh_classpath
index 8757a12..7141718 100755
--- a/jh_classpath
+++ b/jh_classpath
@@ -32,6 +32,9 @@ if [ $ARGC == 0 ]; then
for p in `findpackages`; do
if [ -f debian/$p.classpath ]; then
cat debian/$p.classpath | while read jar cpath; do
+   if [ ! -f $jar ] ; then
+jar=debian/$p/$jar
+fi
if [ -n $VERBOSE ]; then
echo Setting classpath on $jar to 
$cpath
fi
@@ -43,6 +46,9 @@ if [ $ARGC == 0 ]; then
done
elif [ -f debian/classpath ]; then
cat debian/classpath | while read jar cpath; do
+   if [ ! -f $jar ] ; then
+jar=debian/$p/$jar
+fi
if [ -n $VERBOSE ]; then
echo Setting classpath on $jar to 
$cpath
fi


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, master, updated. 0.31-62-gc5116b9

2011-04-16 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  c5116b9667ffe5d8a2217301c11e42bc173a763b (commit)
  from  616bd5d77db6fd3f3d51ee8057feaf5c83e99eca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit c5116b9667ffe5d8a2217301c11e42bc173a763b
Author: Niels Thykier ni...@thykier.net
Date:   Sat Apr 16 09:53:24 2011 +0200

Updated tutorial to reflect the sequence change

---

Summary of changes:
 tutorial.txt |   14 --
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/tutorial.txt b/tutorial.txt
index 1c25a6d..d34a1b6 100644
--- a/tutorial.txt
+++ b/tutorial.txt
@@ -130,6 +130,11 @@ indented below each one a list of manifest elements to set:
  Main-Class: com.jcraft.weirdx.WeirdX
  Debian-Java-Home: /usr/lib/jvm/default-java
 
+Note: Prior to javahelper 0.32 (0.33 if you used cdbs), `jh_manifest` would
+be run before `jh_installlibs`.  In these versions the jars were usually
+referred to by their location in the build directories rather than their
+install location.
+
 jh_classpath
 
 
@@ -142,8 +147,13 @@ Alternatively, it can read classpaths from a 
debian/classpath or
 debian/package.classpath file. This should be one jar per line
 specifying the jar followed by it's space-separated classpath:
 
-src/bar.jar /usr/share/java/quux.jar
-src/foo.jar /usr/share/java/bar.jar /usr/share/java/baz.jar
+usr/share/java/bar.jar /usr/share/java/quux.jar
+usr/share/java/foo.jar /usr/share/java/bar.jar /usr/share/java/baz.jar
+
+Note: Prior to javahelper 0.32 (0.33 if you used cdbs), `jh_classpath` would
+be run before `jh_installlibs`.  In these versions the jars were usually
+referred to by their location in the build directories rather than their
+install location.
 
 jh_exec
 ---


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, master, updated. 0.31-65-g10eda07

2011-04-16 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  10eda07c40d8f857360a15fdeadf847b01994785 (commit)
  from  06bfd192ff2c7d640cf81d13dd06d2303ec8c54b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 10eda07c40d8f857360a15fdeadf847b01994785
Author: Niels Thykier ni...@thykier.net
Date:   Sat Apr 16 10:16:22 2011 +0200

Added a runtests target to run the tests without building the pkg

---

Summary of changes:
 debian/rules |   10 +++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 983ae36..74a6c82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,10 @@ MOD_PATH:=lib/Debian/Javahelper
 %:
dh $@
 
-override_dh_auto_build:
-   sed 's,%JAVATOOLS_VERSION%,${VERSION},'  jh_lib.sh.in  jh_lib.sh
+jh_lib.sh: jh_lib.sh.in
+   sed 's,%JAVATOOLS_VERSION%,${VERSION},'  $  $@
+
+override_dh_auto_build: jh_lib.sh
mkdir tmp tmp.jarwrapper
# javahelper pod-based manpages
$(POD2MAN) jh_installeclipse tmp/jh_installeclipse.1
@@ -30,9 +32,11 @@ override_dh_auto_build:
markdown --html4tags tutorial.txt | \
cat tutorial-header.html - tutorial-footer.html  tutorial.html
 
-override_dh_auto_test:
+runtests: jh_lib.sh
cd tests  ./tests.sh
 
+override_dh_auto_test: runtests
+
 override_dh_auto_clean:
rm -f jh_lib.sh tutorial.html
rm -fr tmp tmp.jarwrapper


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, master, updated. 0.31-66-gc5cd36a

2011-04-16 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  c5cd36a7c0549a562eda61aa20aaa2d5af170dcb (commit)
  from  10eda07c40d8f857360a15fdeadf847b01994785 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit c5cd36a7c0549a562eda61aa20aaa2d5af170dcb
Author: Niels Thykier ni...@thykier.net
Date:   Sat Apr 16 10:42:58 2011 +0200

Made jh_manifest guess based on first package as well

---

Summary of changes:
 debian/changelog |2 ++
 jh_classpath |   12 ++--
 jh_manifest  |4 
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 04fc672..c1a41ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ javatools (0.33) unreleased; urgency=low
   * Fixed typo in jh_generateorbitdir and in jh_compilefeatures.
   * Fixed jh_classpath, which was horribly broken after the 0.32 upload.
 - It now adds debian/pkg automatically if it appears to be needed.
+  * Made jh_manifest check the package dir if given a jar file, if said
+jar file does not exist.
   * Updated file suggestions for jh_classpath and added a note about
 the sequence change in the tutorial.
 
diff --git a/jh_classpath b/jh_classpath
index 010f5a1..6dad090 100755
--- a/jh_classpath
+++ b/jh_classpath
@@ -39,9 +39,9 @@ if [ $ARGC == 0 ]; then
echo Setting classpath on $jar to 
$cpath
fi
if [ -n $NOACT ]; then
-   echo Would run jh_manifest 
--classpath=$cpath $jar
+   echo Would run jh_manifest -p$p 
--classpath=$cpath $jar
else
-   jh_manifest --classpath=$cpath $jar
+   jh_manifest -p$p --classpath=$cpath 
$jar
fi
done
elif [ -f debian/classpath ]; then
@@ -53,9 +53,9 @@ if [ $ARGC == 0 ]; then
echo Setting classpath on $jar to 
$cpath
fi
if [ -n $NOACT ]; then
-   echo Would run jh_manifest 
--classpath=$cpath $jar
+   echo Would run jh_manifest -p$p 
--classpath=$cpath $jar
else
-   jh_manifest --classpath=$cpath $jar
+   jh_manifest -p$p --classpath=$cpath 
$jar
fi
done
fi
@@ -81,9 +81,9 @@ else
echo Setting classpath on $jar to $cpath
fi
if [ -n $NOACT ]; then
-   echo Would run jh_manifest --classpath=$cpath 
$jar
+   echo Would run jh_manifest -p$p 
--classpath=$cpath $jar
else
-   jh_manifest --classpath=$cpath $jar
+   jh_manifest -p$p --classpath=$cpath $jar
fi
else
echo Cannot find $jar: skipping
diff --git a/jh_manifest b/jh_manifest
index b25657f..b9c0ad2 100755
--- a/jh_manifest
+++ b/jh_manifest
@@ -111,7 +111,11 @@ if(!$cp  ($ENV{'CLASSPATH'}//'') ne ''){
 }
 
 if(@ARGV){
+my $pkg = $dh{FIRSTPACKAGE};
+my $dir = tmpdir($pkg);
 foreach my $jar (@ARGV){
+# Look for it in $dir if it does not exist directly.
+$jar = $dir/$jar unless -f $jar;
 update_jar($jar, undef);
 }
 inhibit_log();


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


Bug#621857: dh sequencing isn't the same as cdbs sequencing

2011-04-16 Thread Niels Thykier
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 2011-04-10 01:02, Vincent Fourmond wrote:
 
   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 :-)...
 

Certainly :)

 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 noticed that jh_classpath failed to add the debian/$p, so jh_classpath
is mostly broken in 0.32 - but apparently no one uses it with the dh
sequence since we do not have any RC bugs on it... fun.

   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 ?
 

Come to think of it... I am not even sure what I meant with the last
sentence any more either.

 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
 

:)

~Niels

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJNqVWfAAoJEAVLu599gGRCktAQAJ/1fe21kwVnBb3wZEaVL6Fv
bRHvB9eYcrPgbbvMqBjqHXdIhtnDPLzd/8do62jA3zX4HWRATE4UlonCHx6uXXIu
alIzI8sDITglJ3JRNIW4oN/XYztmzXtFp68NKzJQ4b4lDR6k140/pkt3R6zj1Ue3
wwPmuHBqigpmwYXAy0MeEVZJLAy4dDGi+kW4D8EJYBVSYEoBOMnG16OPvWnJki+l
T7XgyMAktrVYPxZkGDirRXh/WyRKPwKv3T4dyu7ZXjmI0hj2EjJonfFj12M9mOuS
zbg0cnVQeddZ9ZmyBH4XtDIfNeb9+31QLecxgMP+zmSzydw8YfFEGpAXuUaoO8L/
kYgPxu/bakk/XRxgJc0imzL11d7bO8yOSDHIjVg9am2bjIlJteTiFe2FtWiGXQDG
l9paJiUbBICeEirgaQwVbJwFvNz7tB3sCzACmFxSe1tsl51+V3touBAeaj2F5VAp
mvslBnwkjvXV0GboZBN9ClAYu5UdqkRmmx3BoDJxvit0RAMUR/4ujIo0NPD679oI
fSHSeZ+tbiroFRYBoOwjtkdFwcIp6LJ1nE7OdcHlQhoo3r6SVBkM5h2EJjIeyXBZ
Faqd4x26VWQYCZYykyQkV9jBjpST+laLwndHx5HrDUZt8G4qOldnMzENWu/+amIM
fs2Kj3ESc/v+ykqY17yW
=5ubM
-END PGP SIGNATURE-



__
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.


[SCM] UNNAMED PROJECT branch, master, updated. 0.31-67-g73088bc

2011-04-16 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  73088bcaf0de319723236978faa3eb29bb8bc490 (commit)
  from  c5cd36a7c0549a562eda61aa20aaa2d5af170dcb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 73088bcaf0de319723236978faa3eb29bb8bc490
Author: Niels Thykier ni...@thykier.net
Date:   Sat Apr 16 21:25:38 2011 +0200

Updated jh_makepkg to add java:Recommends and separate lib-doc pkg

---

Summary of changes:
 debian/changelog |4 
 jh_makepkg   |   30 +++---
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c1a41ae..696e453 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,10 @@ javatools (0.33) unreleased; urgency=low
 jar file does not exist.
   * Updated file suggestions for jh_classpath and added a note about
 the sequence change in the tutorial.
+  * Updated jh_makepkg:
+- It now creates a separate doc package for the javadoc if making
+  a library package.
+- It now adds ${java:Recommends} to all binary packages added.
 
  -- Matthew Johnson mj...@debian.org  Sat, 12 Mar 2011 12:58:50 +
 
diff --git a/jh_makepkg b/jh_makepkg
index acec058..0a6c0e9 100755
--- a/jh_makepkg
+++ b/jh_makepkg
@@ -6,7 +6,7 @@
 #gcj, sun
 
 COMPAT=7
-STANDARDS=3.9.1
+STANDARDS=3.9.2
 
 set -e
 
@@ -284,17 +284,33 @@ Source: $SRCPACKAGE
 Section: ${CONTRIB}$SECTION
 Priority: optional
 Maintainer: $DEBFULLNAME $DEBEMAIL
-Build-Depends: debhelper ( $COMPAT), $COMPILER, javahelper (= 
$JAVATOOLS_VERSION) $DEPENDS
+Build-Depends: debhelper (= $COMPAT), $COMPILER, javahelper (= 
$JAVATOOLS_VERSION) $DEPENDS
 Standards-Version: $STANDARDS
 Homepage: homepage
 
 Package: $BINPACKAGE
 Architecture: all
 Depends: \${java:Depends}, \${misc:Depends}
+Recommends: \${java:Recommends}
 Description: Short Description
  Long Description
 END
 
+if [ $TYPE = lib ] ; then
+# add doc package template
+cat  debian/control END
+Package: $BINPACKAGE-doc
+Architecture: all
+Depends: \${java:Depends}, \${misc:Depends}
+Recommends: \${java:Recommends}
+Description: Short Description - doc
+ Long Description
+ .
+ This package contains the Javadoc API
+END
+
+fi
+
 cat  debian/copyright END
 This package was Debianised by $DEBFULLNAME $DEBEMAIL on `date`
 
@@ -358,11 +374,11 @@ END
;;
lib)
   echo $SRCPACKAGE.jar  debian/$BINPACKAGE.jlibs
-   if [ $BUILD = byhand ]; then
-   touch debian/$BINPACKAGE.javadoc
-   else
-   echo javadoc build dir here  
debian/$BINPACKAGE.javadoc
-   fi
+  if [ $BUILD = byhand ]; then
+ echo internal  debian/$BINPACKAGE-doc.javadoc
+  else
+ echo javadoc build dir here  debian/$BINPACKAGE-doc.javadoc
+  fi
;;
 esac
 


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, master, updated. 0.31-68-g0c9a189

2011-04-17 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  0c9a1898e9d7f35a5b804b2b95cb379695a6ee98 (commit)
  from  73088bcaf0de319723236978faa3eb29bb8bc490 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 0c9a1898e9d7f35a5b804b2b95cb379695a6ee98
Author: Martin Quinson mquin...@debian.org
Date:   Sun Apr 17 09:39:53 2011 +0200

Make jh_makepkg use a DEP-5 copyright template

Signed-off-by: Niels Thykier ni...@thykier.net

---

Summary of changes:
 debian/changelog |3 +++
 jh_makepkg   |   31 ++-
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 696e453..5bf70e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,9 @@ javatools (0.33) unreleased; urgency=low
 - It now creates a separate doc package for the javadoc if making
   a library package.
 - It now adds ${java:Recommends} to all binary packages added.
+  * Replaced old copyright template with a DEP-5 version.  Thanks to
+Martin Quinson for the suggestion and the template.
+(Closes: #623035)
 
  -- Matthew Johnson mj...@debian.org  Sat, 12 Mar 2011 12:58:50 +
 
diff --git a/jh_makepkg b/jh_makepkg
index 0a6c0e9..3a80721 100755
--- a/jh_makepkg
+++ b/jh_makepkg
@@ -278,6 +278,7 @@ case $COMP in
;;
 esac
 
+YEAR=$(date +%Y)
 mkdir -p debian
 cat  debian/control END
 Source: $SRCPACKAGE
@@ -312,19 +313,23 @@ END
 fi
 
 cat  debian/copyright END
-This package was Debianised by $DEBFULLNAME $DEBEMAIL on `date`
-
-This package was downloaded from homepage.
-
-Upstream Author: ... 
-
-Copyright ...
-
-Insert Licence statement
-
-The packaging is Copyright `date +%Y` $DEBFULLNAME $DEBEMAIL and is licenced
-under the terms of the BSD licence. On Debian systems the BSD licence can be
-found in /usr/share/common-licenses/BSD.
+Format: [URI OF THE FORMAT SPECIFICATION, SUCH AS 
http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=filerev=REVISION]
+Upstream-Name: [THE NAME UPSTREAM USES FOR THE SOFTWARE]
+Upstream-contact: [THE PREFERRED ADDRESS(ES) TO REACH THE UPSTREAM PROJECT]
+Source: [AN EXPLANATION FROM WHERE THE UPSTREAM SOURCE CAME FROM. TYPICALLY AN 
URL]
+[OTHER FIELDS]
+
+Files: *
+Copyright: Copyright $YEAR John Doe j...@example.com
+License: [STANDARD ABBREVIATION -- SEE Short names SECTION OF SPECIFICATION]
+ [LICENSE TEXT]
+
+Files: debian/*
+Copyright: Copyright $YEAR $DEBFULLNAME $DEBEMAIL
+License: [STANDARD ABBREVIATION]
+ [LICENSE TEXT]
+
+[OTHER FILE PARAGRAPHS]
 END
 
 echo $COMPAT  debian/compat


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, master, updated. 0.31-71-ge3cbc50

2011-04-17 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  e3cbc5068e7967f5a7fe6e1b8d6c4e45fa103596 (commit)
   via  330b3cbd2c2a7f6efe5abc67a2b86380eaac39fc (commit)
   via  fea8565a7ce33bc920eb820dec3fffddffc8aa72 (commit)
  from  0c9a1898e9d7f35a5b804b2b95cb379695a6ee98 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit e3cbc5068e7967f5a7fe6e1b8d6c4e45fa103596
Author: Niels Thykier ni...@thykier.net
Date:   Sun Apr 17 11:44:34 2011 +0200

Set dist to unstable and release

commit 330b3cbd2c2a7f6efe5abc67a2b86380eaac39fc
Author: Niels Thykier ni...@thykier.net
Date:   Sun Apr 17 11:39:15 2011 +0200

Bumped S-V to 3.9.2 - no changes

commit fea8565a7ce33bc920eb820dec3fffddffc8aa72
Author: Niels Thykier ni...@thykier.net
Date:   Sun Apr 17 09:49:44 2011 +0200

Removed findutils from Depends - it is Essential

---

Summary of changes:
 debian/changelog |7 +++
 debian/control   |4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5bf70e8..37327b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-javatools (0.33) unreleased; urgency=low
+javatools (0.33) unstable; urgency=low
 
   [ Matthew Johnson ]
   * Fixed some bugs in jh_makepkg (Closes: #593351)
   * Support epochs in jh_installibs version mangling (Closes: #617897)
 
   [ Niels Thykier ]
-  * Bumped Standards-Version 3.9.1 - no changes required.
+  * Bumped Standards-Version 3.9.2 - no changes required.
 - Also bumped S-V in jh_makepkg.
   * Removed DMUA flag; no longer needed.
   * Removed -5/--sun5 option from jh_makepkg.
@@ -14,7 +14,6 @@ javatools (0.33) unreleased; urgency=low
 generated by jh_makepkg, since it is needed by the clean rule.
   * Made cdbs run jh_installlibs before jh_manifest and jh_classpath.
 (Closes: #621857)
-  * Added missing depends on findutils for javahelper.
   * Converted tutorial into markdown format.
   * jh_installlibs now properly picks up the version of native packages.
 (Closes: #612404)
@@ -37,7 +36,7 @@ javatools (0.33) unreleased; urgency=low
 Martin Quinson for the suggestion and the template.
 (Closes: #623035)
 
- -- Matthew Johnson mj...@debian.org  Sat, 12 Mar 2011 12:58:50 +
+ -- Niels Thykier ni...@thykier.net  Sun, 17 Apr 2011 11:39:48 +0200
 
 javatools (0.32) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e612318..ef81788 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers 
pkg-java-maintain...@lists.alioth.debian.or
 Uploaders: Matthew Johnson mj...@debian.org, Niels Thykier 
ni...@thykier.net
 Build-Depends: debhelper (= 7.0.50~)
 Build-Depends-Indep: default-jdk, libarchive-zip-perl (= 1.20), markdown, perl
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Section: java
 Vcs-Git: git://git.debian.org/git/pkg-java/javatools.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/javatools.git
@@ -24,7 +24,7 @@ Package: javahelper
 Architecture: all
 Depends: ${misc:Depends}, debhelper, devscripts,
  bsdmainutils, dpkg-dev, dctrl-tools,
- findutils, libarchive-zip-perl (= 1.20)
+ libarchive-zip-perl (= 1.20)
 Suggests: cvs,
   gawk,
   tofrodos,


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT annotated tag, 0.33, created. 0.33

2011-04-17 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The annotated tag, 0.33 has been created
at  0cab15310f60156c6cc332b2ffdb4e762be9bbfc (tag)
   tagging  e3cbc5068e7967f5a7fe6e1b8d6c4e45fa103596 (commit)
  replaces  0.31
 tagged by  Niels Thykier
on  Sun Apr 17 11:51:57 2011 +0200

- Log -
Release into unstable

Benjamin Drung (1):
  Add fetch-eclipse-source script.

Martin Quinson (1):
  Make jh_makepkg use a DEP-5 copyright template

Matthew Johnson (11):
  fix for 586783
  jh_build add -link on all packages you depend on
  fix jh_build documentation
  aoeu
  remove zip/unzip suggests, they should really be in ant or pde-build, 
release
  remove fastjar references
  remove fastjar references
  Merge branch 'master' of ssh://mjj29@alioth/git/pkg-java/javatools
  fix some bugs in jh_makepkg (Closes: #593351)
  support epochs in version mangling as well
  changelog

Niels Thykier (58):
  Fixed quoting issue in jh_compilefeatures.
  Added Java module to scan javadocs.
  Renamed installZippedFeature to install_zipped_feature - fits naming 
convention of other perl modules.
  Updated changelog.
  Added fetch-eclipse-source to d/copyright, bumped S-V, added missing 
suggests and s/jh_libs/jh_installlibs/ in the description.
  Added manpage for fetch-eclipse-source.
  Updated jh_depends handling of the --jvm argument.
  Made jh_depends create (= ${source:Version}) depends rather than
  Correct dependency generation.
  Corrected package of Java.pm. Added helper script to assist jh_depends
  Updated changelog.
  Stopped scan_javadocs from following symlinks.
  Fixed a formatting issue and added missing entry in the changelog.
  Added modules manifest handling.
  Rewrote jh_manifest, removed all depends on python.
  Fixed whitespace and made the new manifest deflated.
  Corrected tests.
  Added versioned depends on libarchive-zip-perl.
  Added documentation for the new modules and fixed two minor issues.
  Removed irrelevant changelog entry.
  Allowed read and write of Name attributes longer than 72 by letting
  Updated d/changelog and documentation.
  Added some brackets.
  Fixed warning for non-existent jars.
  jh_scanjavadoc: ignore links that do not lead to a package-list.
  Fixed a number of hidden bugs in jh_manifest and Java.pm
  Reordered the javahelper sequence so that jh_installlibs is now run
  Fixed synopsis line of jh_manifest manpage
  Refactored the source to allow tests to be run as a part of the build
  Bumped S-V and removed DMUA flag
  Removed -5/--sun5 option from jh_makepkg
  jh_makepkg now uses gcj-jdk as B-D and puts JDKs in B-D
  Reordered cdbs sequence to run jh_installlibs earlier
  Update  usage in jh_build.
  Added missing B-D-I for running the test suite
  Skip tests if fastjar is the only thing we can find
  Added missing depends on findutils for javahelper
  Converted tutorial to markdown format
  jh_installlibs now properly picks up the version of native packages
  Made jh_installlibs respect its --tmpdir option
  Added missing B-D-I on perl
  Migrate jh_generatorbitdir to the perl manifest handler
  Fixed typo in jh_generateorbitdir
  Removed useless interpolization, s/die/error and renamed a sub
  Renamed subs for case consistency
  Fixed a typo in jh_compilefeatures
  Fixed a couple of issues/dev-regressions in jh_generateorbitdir
  Adding closes now there is a bug for it
  Correct path for jh_classpath when it is not given a jar arg
  Updated tutorial to reflect the sequence change
  Use first package for jh_classpath with jar args
  Updated the changelog to reflect my recent changes
  Added a runtests target to run the tests without building the pkg
  Made jh_manifest guess based on first package as well
  Updated jh_makepkg to add java:Recommends and separate lib-doc pkg
  Removed findutils from Depends - it is Essential
  Bumped S-V to 3.9.2 - no changes
  Set dist to unstable and release

---


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, master, updated. 0.33-1-g4b3112f

2011-04-29 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  4b3112fdca0ffd0ee5f37e2314acf938371ede1b (commit)
  from  e3cbc5068e7967f5a7fe6e1b8d6c4e45fa103596 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 4b3112fdca0ffd0ee5f37e2314acf938371ede1b
Author: Niels Thykier ni...@thykier.net
Date:   Fri Apr 29 08:42:35 2011 +0200

Fixed a regression where jh_installlibs might install into /

Introduced in 0.33 (commit: a7b20a13)

---

Summary of changes:
 debian/changelog |8 
 jh_installlibs   |   11 +--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 37327b1..93cc4b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+javatools (0.34) UNRELEASED; urgency=low
+
+  * Fixed a regression in 0.33 that in some cases would make
+jh_installlibs install in to the system root and not the package
+root.  (Closes: #624503)
+
+ -- Niels Thykier ni...@thykier.net  Fri, 29 Apr 2011 08:41:18 +0200
+
 javatools (0.33) unstable; urgency=low
 
   [ Matthew Johnson ]
diff --git a/jh_installlibs b/jh_installlibs
index 6bfd697..f5e95af 100755
--- a/jh_installlibs
+++ b/jh_installlibs
@@ -53,8 +53,9 @@ function processjar()
fi
 
if [ -n `getarg n no-act` ]; then
-   echo install -m 644 $from 
debian/$p/usr/share/java/${to%.jar}-${VERSION}.jar
-   echo ln -sf ${to%.jar}-${VERSION}.jar 
debian/$p/usr/share/java/$to
+   echo mkdir -p $PACKAGEDIR/usr/share/java
+   echo install -m 644 $from 
$PACKAGEDIR/usr/share/java/${to%.jar}-${VERSION}.jar
+   echo ln -sf ${to%.jar}-${VERSION}.jar 
$PACKAGEDIR/usr/share/java/$to
else
if [ -n $VERBOSE ]; then
echo Installing library $j into package $p
@@ -68,6 +69,12 @@ function processjar()
 if [ $ARGC != 0 ] ; then

p=`firstpackage`
+   PACKAGEDIR=`getarg P tmpdir`
+   if [ -z $PACKAGEDIR ]; then
+  PACKAGEDIR=`pwd`/debian/$p
+   else
+  PACKAGEDIR=`readlink -f $PACKAGEDIR`
+   fi
 
for (( i=0; i  $ARGC; i++ )); do
   j=${ARGV[i]}


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, master, updated. 0.33-2-g505b399

2011-04-29 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  505b399631433a51782703c58b1f8bdd518b40dd (commit)
  from  4b3112fdca0ffd0ee5f37e2314acf938371ede1b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 505b399631433a51782703c58b1f8bdd518b40dd
Author: Niels Thykier ni...@thykier.net
Date:   Fri Apr 29 19:02:43 2011 +0200

Removed the -O option from jh_build, its longer form still works

---

Summary of changes:
 debian/changelog |3 +++
 jh_build |2 +-
 jh_build.1   |2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93cc4b5..efac41a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ javatools (0.34) UNRELEASED; urgency=low
   * Fixed a regression in 0.33 that in some cases would make
 jh_installlibs install in to the system root and not the package
 root.  (Closes: #624503)
+  * Removed the -O option from jh_build since it clashed with a
+common debhelper option.  The longer form (--javadoc-opts) is
+still available and should be used instead.
 
  -- Niels Thykier ni...@thykier.net  Fri, 29 Apr 2011 08:41:18 +0200
 
diff --git a/jh_build b/jh_build
index 8c8edda..3509956 100755
--- a/jh_build
+++ b/jh_build
@@ -18,7 +18,7 @@ syntax()
echo -e \t--clean: clean the build tree
echo -e \t-N --no-javadoc: Disable building javadoc
echo -e \t-J --javadoc: Enable building javadoc
-   echo -e \t-Ojavadoc-opts --javadoc-opts=javadoc-opts: Options to 
javadoc
+   echo -e \t--javadoc-opts=javadoc-opts: Options to javadoc
echo -e Environment Variables:
echo -e \tJAVA_HOME: path to the JDK to use
echo -e \tCLASSPATH: classpath to compile with and set in the manifest
diff --git a/jh_build.1 b/jh_build.1
index 281356e..f559a91 100644
--- a/jh_build.1
+++ b/jh_build.1
@@ -22,7 +22,7 @@ Refer to the tutorials in /usr/share/doc/javahelper for more 
detail
 .HP
 \fB\-N\fR \fB\-\-no-javadoc\fR: Don't build javadoc
 .HP
-\fB\-O\fRjavadocc\-opts \fB\-\-javadoc-opts=\fRjavadocc\-opts: Options to 
the Javadoc compiler
+\fB\-\-javadoc-opts=\fRjavadocc\-opts: Options to the Javadoc compiler
 .HP
 \fB\-\-clean\fR: clean the build tree
 .SS Environment Variables:


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, master, updated. 0.33-3-g220d8e7

2011-04-29 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  220d8e7e1b6689c7278c6cdefa8cb1c38dc3d5d1 (commit)
  from  505b399631433a51782703c58b1f8bdd518b40dd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 220d8e7e1b6689c7278c6cdefa8cb1c38dc3d5d1
Author: Niels Thykier ni...@thykier.net
Date:   Fri Apr 29 19:14:19 2011 +0200

Made all jh_lib.sh based tools ignored -O

---

Summary of changes:
 debian/changelog |4 
 jh_lib.sh.in |3 +++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index efac41a..7e1ed36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ javatools (0.34) UNRELEASED; urgency=low
   * Removed the -O option from jh_build since it clashed with a
 common debhelper option.  The longer form (--javadoc-opts) is
 still available and should be used instead.
+  * Made all jh_lib.sh-based tools ignore the -O option, which is
+used by dh in some cases.  If you have been using -O with
+jh_build please switch to --javadoc-opts instead.
+(Closes: #623506, #624388)
 
  -- Niels Thykier ni...@thykier.net  Fri, 29 Apr 2011 08:41:18 +0200
 
diff --git a/jh_lib.sh.in b/jh_lib.sh.in
index acd5022..79fd3a9 100644
--- a/jh_lib.sh.in
+++ b/jh_lib.sh.in
@@ -20,6 +20,9 @@ parseargs()
   elif [ --with = $1 ]; then
debhelper=true
shift
+  elif [ -O = ${1:0:2} ]; then
+  # -O from debhelper - we ignore that
+  :
   elif [ - = ${1:1:1} ]; then
   # long opt
  optn=`sed 's/^--\([^=]*\)\(=.*\)*$/\1/;s/-/_/g'  $1`


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, master, updated. 0.33-4-gcbff0ca

2011-05-01 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  cbff0ca7d8844f4c16580b1ae028464eedc543e0 (commit)
  from  220d8e7e1b6689c7278c6cdefa8cb1c38dc3d5d1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit cbff0ca7d8844f4c16580b1ae028464eedc543e0
Author: Niels Thykier ni...@thykier.net
Date:   Fri Apr 29 19:15:16 2011 +0200

Set dist to unstable and release

---

Summary of changes:
 debian/changelog |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7e1ed36..eb81c95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-javatools (0.34) UNRELEASED; urgency=low
+javatools (0.34) unstable; urgency=low
 
   * Fixed a regression in 0.33 that in some cases would make
 jh_installlibs install in to the system root and not the package
@@ -11,7 +11,7 @@ javatools (0.34) UNRELEASED; urgency=low
 jh_build please switch to --javadoc-opts instead.
 (Closes: #623506, #624388)
 
- -- Niels Thykier ni...@thykier.net  Fri, 29 Apr 2011 08:41:18 +0200
+ -- Niels Thykier ni...@thykier.net  Fri, 29 Apr 2011 19:14:56 +0200
 
 javatools (0.33) unstable; urgency=low
 


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT annotated tag, 0.34, created. 0.34

2011-05-01 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The annotated tag, 0.34 has been created
at  ca0a673d48478ba28beac2b784fdb0805b462a45 (tag)
   tagging  cbff0ca7d8844f4c16580b1ae028464eedc543e0 (commit)
  replaces  0.33
 tagged by  Niels Thykier
on  Fri Apr 29 19:15:57 2011 +0200

- Log -
Release into unstable

Niels Thykier (4):
  Fixed a regression where jh_installlibs might install into /
  Removed the -O option from jh_build, its longer form still works
  Made all jh_lib.sh based tools ignored -O
  Set dist to unstable and release

---


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[pkg-java] r13657 - trunk/ant/debian

2011-05-06 Thread Niels Thykier
Author: nthykier
Date: 2011-05-06 07:33:16 + (Fri, 06 May 2011)
New Revision: 13657

Modified:
   trunk/ant/debian/changelog
   trunk/ant/debian/rules
Log:
Added missing mh_clean

Modified: trunk/ant/debian/changelog
===
--- trunk/ant/debian/changelog  2011-05-06 05:35:33 UTC (rev 13656)
+++ trunk/ant/debian/changelog  2011-05-06 07:33:16 UTC (rev 13657)
@@ -1,11 +1,16 @@
 ant (1.8.2-1) unstable; urgency=low
 
+  [ James Page ]
   * New upstream release (Closes: #613914).
 - Fix FTBFS for jug with ant 1.8.1 (Closes: #610320).
   * Bumped Standards-Version to 3.9.2, no changes.
   * Removed ant-nodeps.jar from install as now part of ant core. 
   * Added myself to Uploaders.
 
+  [ Niels Thykier ]
+  * Added missing mh_clean, thanks to Miguel Landaeta for spotting
+this.
+
  -- James Page james.p...@canonical.com  Wed, 04 May 2011 15:16:42 +0100
 
 ant (1.8.1-1) experimental; urgency=low

Modified: trunk/ant/debian/rules
===
--- trunk/ant/debian/rules  2011-05-06 05:35:33 UTC (rev 13656)
+++ trunk/ant/debian/rules  2011-05-06 07:33:16 UTC (rev 13657)
@@ -104,6 +104,7 @@
-rm -rf bin bootstrap build lib/*.jar
-rm -f stamp-build-ant
-rm -rf debian/tmp
+   mh_clean
 
 get-orig-source: 
-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download 
--rename --repack


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[pkg-java] r13658 - trunk/ant/debian

2011-05-06 Thread Niels Thykier
Author: nthykier
Date: 2011-05-06 07:56:00 + (Fri, 06 May 2011)
New Revision: 13658

Modified:
   trunk/ant/debian/ant.1
   trunk/ant/debian/changelog
Log:
Fixed a typo in the manpage

Modified: trunk/ant/debian/ant.1
===
--- trunk/ant/debian/ant.1  2011-05-06 07:33:16 UTC (rev 13657)
+++ trunk/ant/debian/ant.1  2011-05-06 07:56:00 UTC (rev 13658)
@@ -54,7 +54,7 @@
 use the given file to output log to
 .TP
 \fB\-logger\fR \fIclassname\fR
-use the given class to perform loggin
+use the given class to perform logging
 .TP
 \fB\-listener\fR \fIclassname\fR
 add an instance of the given class as a project listener

Modified: trunk/ant/debian/changelog
===
--- trunk/ant/debian/changelog  2011-05-06 07:33:16 UTC (rev 13657)
+++ trunk/ant/debian/changelog  2011-05-06 07:56:00 UTC (rev 13658)
@@ -10,6 +10,7 @@
   [ Niels Thykier ]
   * Added missing mh_clean, thanks to Miguel Landaeta for spotting
 this.
+  * Fixed a typo in the ant manpage.
 
  -- James Page james.p...@canonical.com  Wed, 04 May 2011 15:16:42 +0100
 


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[pkg-java] r13659 - trunk/ant/debian

2011-05-06 Thread Niels Thykier
Author: nthykier
Date: 2011-05-06 08:04:18 + (Fri, 06 May 2011)
New Revision: 13659

Removed:
   trunk/ant/debian/ant-doc.dirs
Modified:
   trunk/ant/debian/changelog
   trunk/ant/debian/compat
   trunk/ant/debian/control
Log:
Minor clean up and bumped dh compat to 7

Deleted: trunk/ant/debian/ant-doc.dirs
===
--- trunk/ant/debian/ant-doc.dirs   2011-05-06 07:56:00 UTC (rev 13658)
+++ trunk/ant/debian/ant-doc.dirs   2011-05-06 08:04:18 UTC (rev 13659)
@@ -1 +0,0 @@
-usr/share/linda/overrides

Modified: trunk/ant/debian/changelog
===
--- trunk/ant/debian/changelog  2011-05-06 07:56:00 UTC (rev 13658)
+++ trunk/ant/debian/changelog  2011-05-06 08:04:18 UTC (rev 13659)
@@ -11,6 +11,10 @@
   * Added missing mh_clean, thanks to Miguel Landaeta for spotting
 this.
   * Fixed a typo in the ant manpage.
+  * Made short descriptions unique.
+  * Bumped debhelper compat to 7.
+  * Removed empty linda-override dir from ant-doc.
+  * Removed redundant Priority fields in d/control.
 
  -- James Page james.p...@canonical.com  Wed, 04 May 2011 15:16:42 +0100
 

Modified: trunk/ant/debian/compat
===
--- trunk/ant/debian/compat 2011-05-06 07:56:00 UTC (rev 13658)
+++ trunk/ant/debian/compat 2011-05-06 08:04:18 UTC (rev 13659)
@@ -1 +1 @@
-6
+7

Modified: trunk/ant/debian/control
===
--- trunk/ant/debian/control2011-05-06 07:56:00 UTC (rev 13658)
+++ trunk/ant/debian/control2011-05-06 08:04:18 UTC (rev 13659)
@@ -5,7 +5,7 @@
 Uploaders: Michael Koch konque...@gmx.de, Matthias Klose d...@debian.org,
  Ludovic Claude ludovic.cla...@laposte.net, Torsten Werner 
twer...@debian.org,
  James Page james.p...@canonical.com
-Build-Depends: cdbs (= 0.4.8), debhelper (= 6), default-jdk, 
maven-repo-helper ( 1.0),
+Build-Depends: cdbs (= 0.4.8), debhelper (= 7), default-jdk, 
maven-repo-helper ( 1.0),
  libxerces2-java, libbsf-java (= 2.3.0rc1), liboro-java, libxalan2-java (= 
2.4.0), junit, antlr,
  liblog4j1.2-java, libregexp-java, libbcel-java (= 5.0), 
libcommons-logging-java, libjdepend-java,
  libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, 
libjsch-java, libjaxp1.3-java,
@@ -17,7 +17,6 @@
 
 Package: ant
 Architecture: all
-Priority: optional
 Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless | 
java5-runtime-headless |
  java6-runtime-headless, libxerces2-java
 Recommends: ant-optional
@@ -32,9 +31,8 @@
 
 Package: ant-gcj
 Architecture: any
-Priority: optional
 Depends: ant, ${misc:Depends}, ${shlibs:Depends}
-Description: Java based build tool like make
+Description: Java based build tool like make (GCJ)
  A system independent (i.e. not shell based) build tool that uses XML
  files as Makefiles.
  .
@@ -42,7 +40,6 @@
 
 Package: ant-optional
 Architecture: all
-Priority: optional
 Depends: ${misc:Depends}, ant (= ${source:Version})
 Suggests: libbsf-java, liboro-java, libxalan2-java (= 2.4.0-1), 
libjaxp1.3-java, junit, liblog4j1.2-java, libregexp-java, jython, antlr, 
libbcel-java (= 5.0), libcommons-logging-java, libjdepend-java, 
libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, 
libjsch-java, javacc, ant-optional-gcj
 Conflicts: libant1.6-java
@@ -53,9 +50,8 @@
 
 Package: ant-optional-gcj
 Architecture: any
-Priority: optional
 Depends: ant-optional, ${misc:Depends}, ${shlibs:Depends}
-Description: Java based build tool like make - API documentation and manual
+Description: Java based build tool like make - optional libraries (GCJ)
  A system independent (i.e. not shell based) build tool that uses XML
  files as Makefiles. This package contains the optional tasks libraries
  compiled natively.
@@ -63,7 +59,6 @@
 Package: ant-doc
 Architecture: all
 Section: doc
-Priority: optional
 Depends: ${misc:Depends}
 Suggests: ant
 Description: Java based build tool like make - API documentation and manual


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[pkg-java] r13660 - tags/ant/1.8.2-1

2011-05-06 Thread Niels Thykier
Author: nthykier
Date: 2011-05-06 08:12:54 + (Fri, 06 May 2011)
New Revision: 13660

Added:
   tags/ant/1.8.2-1/ant/
Log:
Tag for 1.8.2-1 upload


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] lwjgl - Lightweight Java Game Library branch, master, updated. upstream/2.5+dfsg-34-g326d9b7

2011-05-08 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project lwjgl - Lightweight Java Game Library.

The branch, master has been updated
   via  326d9b7927e9f1d804a70f8de298a918223a77a5 (commit)
  from  8e15984941d592bbfe790520801a18f19f542094 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 326d9b7927e9f1d804a70f8de298a918223a77a5
Author: Niels Thykier ni...@thykier.net
Date:   Sun May 8 23:03:03 2011 +0200

Bump Standards-Version to 3.9.2 - no changes required and set dist

---

Summary of changes:
 debian/changelog |8 ++--
 debian/control   |2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e4e939..03c109f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
-lwjgl (2.7.1+dfsg-1) UNRELEASED; urgency=low
+lwjgl (2.7.1+dfsg-1) unstable; urgency=low
 
+  [ Michael Gilbert ]
   * new upstream release:
 - refresh debian patches.
   * add myself as an uploader.
   * don't build-depend on sun-java-6
   * use jh_clean
 
- -- Michael Gilbert michael.s.gilb...@gmail.com  Sun, 03 Apr 2011 16:50:25 
-0400
+  [ Niels Thykier ]
+  * Bumped Standards-Version to 3.9.2 - no changes required.
+
+ -- Michael Gilbert michael.s.gilb...@gmail.com  Sun, 08 May 2011 22:50:00 
+0100
 
 lwjgl (2.5+dfsg-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 9c924c8..e1f00fc 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  libxcursor-dev,
  libxt-dev
 Build-Depends-Indep: default-jdk-doc
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-java/lwjgl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/lwjgl.git
 Homepage: http://lwjgl.org/


hooks/post-receive
-- 
lwjgl - Lightweight Java Game Library

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] lwjgl - Lightweight Java Game Library tag, debian/2.7.1+dfsg-1, created. upstream/2.5+dfsg-34-g326d9b7

2011-05-08 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project lwjgl - Lightweight Java Game Library.

The tag, debian/2.7.1+dfsg-1 has been created
at  326d9b7927e9f1d804a70f8de298a918223a77a5 (commit)

- Log -
commit 326d9b7927e9f1d804a70f8de298a918223a77a5
Author: Niels Thykier ni...@thykier.net
Date:   Sun May 8 23:03:03 2011 +0200

Bump Standards-Version to 3.9.2 - no changes required and set dist
---


hooks/post-receive
-- 
lwjgl - Lightweight Java Game Library

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.5.2-9-6-g2f5f7b8

2011-05-10 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project eclipse - Powerful IDE written in java - Debian package..

The branch, master has been updated
   via  2f5f7b8a4e4427bc152385662a78f9a8c2dc8abd (commit)
  from  89903042da3838e25f6a69f8bf5136271c36890f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 2f5f7b8a4e4427bc152385662a78f9a8c2dc8abd
Author: Niels Thykier ni...@thykier.net
Date:   Sat May 7 22:09:12 2011 +0200

Release into unstable

---

Summary of changes:
 debian/changelog  |8 +-
 debian/control|2 +-
 debian/eclipse-cvs.lintian-overrides  |2 +
 debian/eclipse-jdt.lintian-overrides  |2 +
 debian/eclipse-pde.lintian-overrides  |2 +
 debian/eclipse-platform-data.lintian-overrides|1 +
 debian/eclipse-platform.lintian-overrides |2 +
 debian/eclipse-plugins-cvs.lintian-overrides  |2 +
 debian/eclipse-rcp.lintian-overrides  |2 +
 debian/patches/bp-pdebuild-fixes.patch|   25 +
 debian/patches/series |1 +
 patches/eclipse-pde.build-add-package-build.patch |4 +-
 12 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 42e7eac..45ff6f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-eclipse (3.5.2-10) UNRELEASED; urgency=low
+eclipse (3.5.2-10) unstable; urgency=low
 
   [ Benjamin Drung ]
   * debian/extra/eclipse: Actually, don't export UBUNTU_MENUPROXY=0 here
@@ -9,8 +9,12 @@ eclipse (3.5.2-10) UNRELEASED; urgency=low
   * Bump ant and lucene2 (Build-)Depends. (Closes: #624213)
   * Backported patch from upstream to improve the ant 1.8.2 support in
 eclipse.
+  * Added lintian-overrides for codeless-jar and jar-no-in-usr-share,
+as they are mostly false-positives.
+  * Backported a fix to the pdebuild script from eclipse-build.
+  * Bumped Standards-Version to 3.9.2 - no changes required.
 
- -- Benjamin Drung bdr...@debian.org  Sat, 26 Mar 2011 19:28:21 +0100
+ -- Niels Thykier ni...@thykier.net  Sat, 07 May 2011 22:08:35 +0200
 
 eclipse (3.5.2-9) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index cd8472d..24708fb 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Build-Depends: ant (= 1.8.2),
unzip,
xulrunner-dev (= 1.9.1.3-2),
zip
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 DM-Upload-Allowed: yes
 Vcs-Git: git://git.debian.org/git/pkg-java/eclipse.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/eclipse.git
diff --git a/debian/eclipse-cvs.lintian-overrides 
b/debian/eclipse-cvs.lintian-overrides
new file mode 100644
index 000..f5463eb
--- /dev/null
+++ b/debian/eclipse-cvs.lintian-overrides
@@ -0,0 +1,2 @@
+jar-not-in-usr-share
+codeless-jar
diff --git a/debian/eclipse-jdt.lintian-overrides 
b/debian/eclipse-jdt.lintian-overrides
new file mode 100644
index 000..f5463eb
--- /dev/null
+++ b/debian/eclipse-jdt.lintian-overrides
@@ -0,0 +1,2 @@
+jar-not-in-usr-share
+codeless-jar
diff --git a/debian/eclipse-pde.lintian-overrides 
b/debian/eclipse-pde.lintian-overrides
new file mode 100644
index 000..f5463eb
--- /dev/null
+++ b/debian/eclipse-pde.lintian-overrides
@@ -0,0 +1,2 @@
+jar-not-in-usr-share
+codeless-jar
diff --git a/debian/eclipse-platform-data.lintian-overrides 
b/debian/eclipse-platform-data.lintian-overrides
new file mode 100644
index 000..8d0a4a3
--- /dev/null
+++ b/debian/eclipse-platform-data.lintian-overrides
@@ -0,0 +1 @@
+codeless-jar usr/share/eclipse/plugins/org.eclipse.core.boot_*.jar
diff --git a/debian/eclipse-platform.lintian-overrides 
b/debian/eclipse-platform.lintian-overrides
new file mode 100644
index 000..f5463eb
--- /dev/null
+++ b/debian/eclipse-platform.lintian-overrides
@@ -0,0 +1,2 @@
+jar-not-in-usr-share
+codeless-jar
diff --git a/debian/eclipse-plugins-cvs.lintian-overrides 
b/debian/eclipse-plugins-cvs.lintian-overrides
new file mode 100644
index 000..f5463eb
--- /dev/null
+++ b/debian/eclipse-plugins-cvs.lintian-overrides
@@ -0,0 +1,2 @@
+jar-not-in-usr-share
+codeless-jar
diff --git a/debian/eclipse-rcp.lintian-overrides 
b/debian/eclipse-rcp.lintian-overrides
new file mode 100644
index 000..f5463eb
--- /dev/null
+++ b/debian/eclipse-rcp.lintian-overrides
@@ -0,0 +1,2 @@
+jar-not-in-usr-share
+codeless-jar
diff --git a/debian/patches/bp-pdebuild-fixes.patch 
b/debian/patches/bp-pdebuild-fixes.patch
new file mode 100644
index 000..9d09998

[SCM] eclipse - Powerful IDE written in java - Debian package. annotated tag, debian/3.5.2-10, created. debian/3.5.2-10

2011-05-10 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project eclipse - Powerful IDE written in java - Debian package..

The annotated tag, debian/3.5.2-10 has been created
at  19e605672cb199bb00f87de9c55dbee6d61c8316 (tag)
   tagging  2f5f7b8a4e4427bc152385662a78f9a8c2dc8abd (commit)
  replaces  debian/3.5.2-9
 tagged by  Niels Thykier
on  Tue May 10 18:28:10 2011 +0200

- Log -
Release into unstable

Benjamin Drung (3):
  debian/extra/eclipse: Actually, don't export UBUNTU_MENUPROXY=0 here 
because that affects launched applications too.  Instead, it is blacklisted by 
appmenu-gtk.
  Update debian/changelog.
  Update my email address.

Niels Thykier (3):
  Bumped (Build-)Depends for ant and lucene2
  Backported patch to improve ant 1.8.2 support
  Release into unstable

---


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


Bug#626305: liblucene2-java in squeeze misses many bugfixes, especially SOLR-822, please backport from wheezy

2011-05-11 Thread Niels Thykier
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 2011-05-11 00:08, Ferdinando wrote:
 Hi Niels,
 
 Bumping the upstream version of lucene2 might require a rebuild of
 eclipse in Squeeze as well with a small change.  It is trivial to do, if
 you plan on doing this backport please keep me in the loop.
 
 both liblucene2-java and solr-tomcat did need no modification to be 
 backported 
 to squeeze. I hope that I did no mistake (at least it works for us) but I am 
 not experienced enough to push the packages upstream. I can't see any 
 dependency of eclipse to liblucene2-java though, is it nested?
 
 Ciao, Ferdinando
 
 

Hi,

The reason why you cannot see the dependency is probably that you looked
at the binary package eclipse.  The package actually depending on
liblucene2-java is eclipse-platform, which is (also) built from a source
package called eclipse. :)

The reason why we need to modify eclipse is because we got some
non-trivial with plugins not being loaded in eclipse if some
dependencies where upgraded.  This lead to #587657, which started out
with a problem sat4j, but we later learned lucene2 produced a similar
effect (e.g. see message #125).
  The issue is particularly annoying as it is non-trivial to debug why
this happens, because eclipse silently degrades itself in most cases and
the rest it says something like Cannot open editor
org.eclipse.cdt.editor.CEdtior, class not found.  Neither helps the
user to realise they have to manually fix a file that is out of date.

~Niels

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJNyjWKAAoJEAVLu599gGRC+1AP/3w/Oi5N7x8ftcDa0JH80vZc
pbfSQXfLCyynV2pbPtuzSThripOSaJcivJovEgS8B5fZsblihKRNI96EZWyGJIYA
76BGJ2ZMmz3HbVk/C8dl/3BBLgOL221kvGkmZeTpcKptJMN67l3SO96afWNNarvT
J/R20B/nP61+mSRgrMiib4iBI2wVoJVIgbBICDrZfB8RyGBSef2l2UTfiidihEkN
2c96vXB/wK4KFPHzUuU9gx1LwhEFfQS3qD3k7bDf+KVNzTSF3QRAs0lgm9lc/FbM
VjbK62R9uwF/LGrzcXeJZRN+9RtqZeXJuSztQrdRQ0Q1Mskp/+B1f1gYvPan01Hg
5FfYNF6xKhe2XKRkAs6YE6Zaf9+sAFsGlbFJPgBB3+F2wak9lkWNDstRqTC3ZCyR
gzXG+rKBZ4KAxtmM2HUELoguZJ6eoJ6xL8P+8EFLW/1YB1ekxQucHYS8q+LKBS/I
cQXKEP79SsnXuUiK6ADFccZrH/Z0oRCiD3488c3/QTS4erWWbNOQJSgqMZL4qwRT
SDLhCgh6gaGz0NQSMM8ifeXODfUGrVFy+1IWlN1tY/d/jZVcDGD6t9Z0BM9mX964
jIm8nE5XLwapXglKbP4eaMTfRQg/jy1Kv1GmiMKhEzmYzeV0CLVf6Y3R5jFetKBt
ybzB5uDWhiheNvLE9ArV
=t/CZ
-END PGP SIGNATURE-



__
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#626305: liblucene2-java in squeeze misses many bugfixes, especially SOLR-822, please backport from wheezy

2011-05-11 Thread Niels Thykier
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 2011-05-11 10:16, Ferdinando wrote:
 Hi Niels,
 
 [...]
 
 thanks for the detailed explanation. I fear that backporting a complex 
 package 
 as eclipse-platform is out of scope for me at the moment, sorry.
 
 Thanks for maintaining lucene in Debian!
 
 Ciao, Ferdinando
 

Hah, I am the maintainer of eclipse - I just posted here to remind the
lucene2 maintainer of a possible complication of backporting lucene2.

~Niels


-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJNykjWAAoJEAVLu599gGRCkAgP/iBqDlfFBF7bs3URJlBOn9P0
iVSTT4VKYWZNsylpPNV9QrdGXHP0YfcaCOu3pPyNIw+Pw5wqwRQyKF+UnTy9ueXV
UO2W0D0t9tA6EqXsvcx2YJ7BsCnx+mKns4835b6/Z/k3+gaJeQo8jZvzmGahJqeW
vFNY3WEOU0tavyJ0eXg5mukiyq+EfuUKnw0AdxJow+rYkuH5ej+RD2U06haKhJgl
MXGQRq5oPclBeMTDZdNuqTt1wGKFpMnFWXasGOHwFtWZrc5sSMLfsEtq7Cw//uRL
gCuEMioTx8g67pHSD+Y5MFzyx7ysbH/bhtazecakI7CQEKqv4gO9T805n/5KjgAj
/xKz5hbr3kHyagkE4+n8Y49CUtgmPAYcKEKwdak70qfoFk1XP7HlBqPNIc5QPBY9
hKqWke93pckX09FPjmgIwy3mZAfRGhW4XbVjSU9GQZER22a9QvqVJFhYHSxcavuR
4qwIERjKDYjca1Gcj6ThoBZ8D5PoNhxsSUo6AN/fDBTOpX/GmDCXdZD0VEns3KFN
pfKanJGVxNk1kEtHxsDNxrz5QIrDDFD5jD0hslkFk5MNqN0ADejZBEXxx4kVcIWB
pqGFez/hOsScgCtC3uo98mNZLBel3dZpBCG8C4WWmTCDvKihOJ4E6B+HNKTO8nXh
wELn3bPBDbQR+P10XRlh
=P191
-END PGP SIGNATURE-



__
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.


[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-208-g01c9c67

2011-05-11 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project eclipse - Powerful IDE written in java - Debian package..

The branch, master-3.6 has been updated
   via  01c9c672e475ad61a614b0b273473a752a0a444d (commit)
  from  b4c9881e977b67aefc2cf7e0ec917cd5098959ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 01c9c672e475ad61a614b0b273473a752a0a444d
Author: Niels Thykier ni...@thykier.net
Date:   Wed May 11 12:36:41 2011 +0200

Imported use of mh_clean and the NEWS from the master branch

---

Summary of changes:
 debian/NEWS  |   15 ---
 debian/changelog |3 +++
 debian/eclipse-platform.NEWS |   39 +++
 debian/rules |2 +-
 4 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
deleted file mode 100644
index bc09e60..000
--- a/debian/NEWS
+++ /dev/null
@@ -1,15 +0,0 @@
-eclipse (3.5.2-1) unstable; urgency=low
-
-  In previous versions of eclipse ( 3.5), it would extract shared
-  libraries to users ~/.eclipse. This has been fixed in the 3.5
-  series, but means that eclipse will have issues starting if you are
-  upgrading from an eclipse older than 3.5. Removing or renaming
-  ~/.eclipse fixes this at the cost of losing personal configuration.
-
-  In 3.5 all the choose a suitable JVM code has been removed and
-  instead eclipse now respect alternatives. Old configuration files
-  for this purpose (including the user file ~/.eclipse/eclipserc) is
-  now obsolete and will be silently ignored.
-
- -- Debian Orbital Alignment Team 
pkg-java-maintainers@lists.alioth.debian.org  Thu, 18 Mar 2010 12:13:51 +0100
-
diff --git a/debian/changelog b/debian/changelog
index 09ab23e..3ca15bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ eclipse (3.6.2-1) UNRELEASED; urgency=low
   * Updated debian/copyright.
   * Bumped B-D on icu4j.
   * Added B-D to build swt with webkit support.
+  * Use mh_clean to clean up after the maven-repo-helper.
+  * Pulled the eclipse-platform.NEWS from the master branch and removed the
+old NEWS file.
 
   [ Andres Mejia ]
   * Numerous changes to eclipse packaging just to get eclipse building using
diff --git a/debian/eclipse-platform.NEWS b/debian/eclipse-platform.NEWS
new file mode 100644
index 000..22d3289
--- /dev/null
+++ b/debian/eclipse-platform.NEWS
@@ -0,0 +1,39 @@
+eclipse-platform (3.5.2-6) unstable; urgency=low
+
+  The upgrade of eclipse may cause plugins to silently disappear.
+  The exact reason has yet to be determined and we are looking for
+  an automatic solution for this problem.
+  
+  There are two known workarounds; one is two completely remove
+  ~/.eclipse and re-install all user plugins. The other is to
+  manually merge bundles.info from ~/.eclipse with the
+  bundles.info from /usr/lib/eclipse. This solution is slightly
+  more complicated, but appears to restore user installed plugins
+  without having to reinstall them.
+  
+  For more information on how to merge the bundles.info files,
+  you may want to have a look at #587657[1].
+  
+  Note: this issue may also affect plugins installed via packages
+  from repositories (such as the packages eclipse-emf and
+  eclipse-rse).
+  
+  [1] http://bugs.debian.org/587657
+
+ -- Niels Thykier ni...@thykier.net  Mon, 13 Sep 2010 20:06:13 +0200
+
+eclipse-platform (3.5.2-1) unstable; urgency=low
+
+  In previous versions of eclipse ( 3.5), it would extract shared
+  libraries to users ~/.eclipse. This has been fixed in the 3.5
+  series, but means that eclipse will have issues starting if you are
+  upgrading from an eclipse older than 3.5. Removing or renaming
+  ~/.eclipse fixes this at the cost of losing personal configuration.
+
+  In 3.5 all the choose a suitable JVM code has been removed and
+  instead eclipse now respect alternatives. Old configuration files
+  for this purpose (including the user file ~/.eclipse/eclipserc) is
+  now obsolete and will be silently ignored.
+
+ -- Debian Orbital Alignment Team 
pkg-java-maintainers@lists.alioth.debian.org  Thu, 18 Mar 2010 12:13:51 +0100
+
diff --git a/debian/rules b/debian/rules
index 4501ff3..b20ad90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
ant distclean
-   rm -fr debian/.mh/
+   mh_clean
test ! -d eclipse/plugins/org.apache.ant_1.8.2.v20101227-1145 || \
mv eclipse/plugins/org.apache.ant_1.8.2.v20101227-1145 \
eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145


hooks/post-receive
-- 
eclipse

[pkg-java] r13686 - trunk/rsyntaxtextarea/debian

2011-05-12 Thread Niels Thykier
Author: nthykier
Date: 2011-05-12 14:23:26 + (Thu, 12 May 2011)
New Revision: 13686

Modified:
   trunk/rsyntaxtextarea/debian/changelog
Log:
Marked which version was the first in Debian


Modified: trunk/rsyntaxtextarea/debian/changelog
===
--- trunk/rsyntaxtextarea/debian/changelog  2011-05-11 20:30:01 UTC (rev 
13685)
+++ trunk/rsyntaxtextarea/debian/changelog  2011-05-12 14:23:26 UTC (rev 
13686)
@@ -1,6 +1,7 @@
 rsyntaxtextarea (1.5.1-1) unstable; urgency=low
 
   * New upstream release.
+- First upload to Debian.  (Closes: #613585)
   * Move default-jdk-doc to Recommends in d/control.
   * Update d/watch and d/orig-tar.sh files to sf.net.
   * Clean d/copyright.
@@ -9,6 +10,6 @@
 
 rsyntaxtextarea (1.5.0-1) unstable; urgency=low
 
-  * Initial release. (Closes: #613585)
+  * Initial release.
 
  -- Vladimir Kotov vladi...@kotov.lv  Wed, 16 Mar 2011 00:21:43 +0200


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[pkg-java] r13687 - tags/rsyntaxtextarea

2011-05-12 Thread Niels Thykier
Author: nthykier
Date: 2011-05-12 14:28:30 + (Thu, 12 May 2011)
New Revision: 13687

Added:
   tags/rsyntaxtextarea/1.5.1.1-1/
Log:
Tag for 1.5.1.1-1 upload


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, master, updated. 0.34-1-g52baa4d

2011-05-14 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  52baa4d629a133f9763e7c7d485cfdc0735e654a (commit)
  from  cbff0ca7d8844f4c16580b1ae028464eedc543e0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 52baa4d629a133f9763e7c7d485cfdc0735e654a
Author: Niels Thykier ni...@thykier.net
Date:   Sat May 14 10:38:12 2011 +0200

Made jh_manifest always follow symlinks

---

Summary of changes:
 debian/changelog |7 +++
 jh_manifest  |7 +++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb81c95..a88054a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+javatools (0.35) UNRELEASED; urgency=low
+
+  * Made jh_manifest always follow symlinks even if they are passed
+via command line.  (Closes: #626329)
+
+ -- Niels Thykier ni...@thykier.net  Sat, 14 May 2011 10:35:48 +0200
+
 javatools (0.34) unstable; urgency=low
 
   * Fixed a regression in 0.33 that in some cases would make
diff --git a/jh_manifest b/jh_manifest
index b9c0ad2..2834a73 100755
--- a/jh_manifest
+++ b/jh_manifest
@@ -116,6 +116,13 @@ if(@ARGV){
 foreach my $jar (@ARGV){
 # Look for it in $dir if it does not exist directly.
 $jar = $dir/$jar unless -f $jar;
+if ( -l $jar ){
+# Follow links
+my $dest = Cwd::abs_path($jar);
+error(Cannot resolve link $jar: $!) unless $dest;
+$jar = $dest;
+}
+error(Cannot update $jar: it does not exist.) unless -f $jar;
 update_jar($jar, undef);
 }
 inhibit_log();


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, master, updated. 0.34-2-g1b90795

2011-05-14 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  1b9079521b94acb0b5698610c861181b9c6d2b1b (commit)
  from  52baa4d629a133f9763e7c7d485cfdc0735e654a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 1b9079521b94acb0b5698610c861181b9c6d2b1b
Author: Niels Thykier ni...@thykier.net
Date:   Sat May 14 10:59:19 2011 +0200

Made jh_manifest error out on missing jars; improved --no-act

---

Summary of changes:
 debian/changelog |5 +
 jh_manifest  |   47 ---
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a88054a..a240ea9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ javatools (0.35) UNRELEASED; urgency=low
 
   * Made jh_manifest always follow symlinks even if they are passed
 via command line.  (Closes: #626329)
+  * Made jh_manifest fail if there are jar files it cannot find,
+unless the jar has been excluded.  This may cause packages to
+FTBFS instead of silently not shipping a jar file.
+(Closes: #626327)
+  * Improved support for --no-act in jh_manifest.
 
  -- Niels Thykier ni...@thykier.net  Sat, 14 May 2011 10:35:48 +0200
 
diff --git a/jh_manifest b/jh_manifest
index 2834a73..6d368b2 100755
--- a/jh_manifest
+++ b/jh_manifest
@@ -113,17 +113,31 @@ if(!$cp  ($ENV{'CLASSPATH'}//'') ne ''){
 if(@ARGV){
 my $pkg = $dh{FIRSTPACKAGE};
 my $dir = tmpdir($pkg);
+verbose_print('Assuming targets exists due to --no-act') if $dh{NO_ACT};
 foreach my $jar (@ARGV){
+my $orig = $jar;
+my $target = $jar;
+my $link = 0;
+# strip any leading / or ./ - it looks better and it
+# does not accidentally install a system install jar instead.
+$target =~ s@^\.?/+@@og;
 # Look for it in $dir if it does not exist directly.
-$jar = $dir/$jar unless -f $jar;
+$target = $dir/$target unless -f $target;
 if ( -l $jar ){
 # Follow links
-my $dest = Cwd::abs_path($jar);
-error(Cannot resolve link $jar: $!) unless $dest;
-$jar = $dest;
+my $dest = Cwd::abs_path($target);
+error(Cannot resolve link $target: $!) unless $dest;
+$target = $dest;
+$link = 1;
 }
-error(Cannot update $jar: it does not exist.) unless -f $jar;
-update_jar($jar, undef);
+# 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};
 }
 inhibit_log();
 # behave like the old jh_manifest.
@@ -180,7 +194,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 delete($files-{$lp});
 delete($manifests-{$link});
 verbose_print(Updating symlinked $path (using manifest for $link));
-update_jar($path, $manifest);
+update_jar($path, $manifest) unless $dh{NO_ACT};
 }
 foreach my $jar (keys(%$files)){
 my $lp = $jar;
@@ -188,11 +202,22 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 $lp =~ s@^\Q$fulldir\E/*@@;
 $manifest = $manifests-{$lp};
 delete($manifests-{$lp});
-update_jar($dir/$lp, $manifest);
+update_jar($dir/$lp, $manifest) unless $dh{NO_ACT};
 }
-foreach my $unused (keys(%$manifests)){
-# complain - unless it has been ignored of course.
-warning(No jar in $package matching $unused) 
unless(excludefile($unused));
+if (keys(%$manifests)  !$dh{NO_ACT}) {
+# skip this with no-act, since other tools might be running in no-act
+# mode as well, so this might be a lot of false-positives.
+my $count = 0;
+foreach my $unused (keys(%$manifests)){
+unless(excludefile($unused)){
+warning(No jar in $package matching $unused.);
+$count++;
+} else {
+verbose_print(Ignoring unused entry for $unused in 
$package.);
+}
+}
+# Fail if there is at least one unignored unused manifest.
+exit 1 if $count;
 }
 }
 


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg

[SCM] UNNAMED PROJECT branch, master, updated. 0.34-3-gaea5dbd

2011-05-14 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  aea5dbd98c12821d082a5087ec740119f78f2a33 (commit)
  from  1b9079521b94acb0b5698610c861181b9c6d2b1b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit aea5dbd98c12821d082a5087ec740119f78f2a33
Author: Niels Thykier ni...@thykier.net
Date:   Sat May 14 11:19:13 2011 +0200

Made jh_depends ignore links as it will process the target anyway

---

Summary of changes:
 debian/changelog |3 +++
 jh_depends   |4 +++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a240ea9..9884093 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ javatools (0.35) UNRELEASED; urgency=low
 FTBFS instead of silently not shipping a jar file.
 (Closes: #626327)
   * Improved support for --no-act in jh_manifest.
+  * Made jh_depends ignore links to jars as these most likely points
+to real jar files that it will end up processing any way.
+(Closes: #610817)
 
  -- Niels Thykier ni...@thykier.net  Sat, 14 May 2011 10:35:48 +0200
 
diff --git a/jh_depends b/jh_depends
index 1bce83c..c191afe 100755
--- a/jh_depends
+++ b/jh_depends
@@ -113,7 +113,9 @@ for p in $PACKAGES; do
   echo Searching $PACKAGEDIR for $p
fi
 
-   JARS=`find $PACKAGEDIR -name '*.jar'`
+   # Assume all links to jars points to real jars, so we do not
+   #  have to process links... hopefully.
+   JARS=`find $PACKAGEDIR -type f -a -name '*.jar'`
 
if [ -n $VERBOSE ]; then
   echo Searching $JARS


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, master, updated. 0.34-4-g728e8e1

2011-05-14 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  728e8e1564e64c99b478ba92540b3b76302dc8b7 (commit)
  from  aea5dbd98c12821d082a5087ec740119f78f2a33 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 728e8e1564e64c99b478ba92540b3b76302dc8b7
Author: Niels Thykier ni...@thykier.net
Date:   Sat May 14 17:30:29 2011 +0200

Release into unstable

---

Summary of changes:
 debian/changelog |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9884093..130ffbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-javatools (0.35) UNRELEASED; urgency=low
+javatools (0.35) unstable; urgency=low
 
   * Made jh_manifest always follow symlinks even if they are passed
 via command line.  (Closes: #626329)
@@ -11,7 +11,7 @@ javatools (0.35) UNRELEASED; urgency=low
 to real jar files that it will end up processing any way.
 (Closes: #610817)
 
- -- Niels Thykier ni...@thykier.net  Sat, 14 May 2011 10:35:48 +0200
+ -- Niels Thykier ni...@thykier.net  Sat, 14 May 2011 17:27:59 +0200
 
 javatools (0.34) unstable; urgency=low
 


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT annotated tag, 0.35, created. 0.35

2011-05-14 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The annotated tag, 0.35 has been created
at  dbd57d3f3fa1e1a9403fe7a22a7a728b021f9227 (tag)
   tagging  728e8e1564e64c99b478ba92540b3b76302dc8b7 (commit)
  replaces  0.34
 tagged by  Niels Thykier
on  Sat May 14 17:30:59 2011 +0200

- Log -
Release into unstable

Niels Thykier (4):
  Made jh_manifest always follow symlinks
  Made jh_manifest error out on missing jars; improved --no-act
  Made jh_depends ignore links as it will process the target anyway
  Release into unstable

---


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


Bug#627110: ant: FTBFS on s390

2011-05-17 Thread Niels Thykier
Package: ant
Version: 1.8.2-1
Severity: serious
Tags: help
Justification: FTBFS

Hey

As the title suggests, ant does not do too well on s390[1].  I had ant
given back a couple of days and it gave exactly the same error, so I
doubt it is a temporary issue.  By the looks of it, my best guess is
that openjdk-6 chokes here.

Patch, fix or just a workaround appreciated.

Thanks,
~Niels

[1] https://buildd.debian.org/status/package.php?p=ant




__
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.


[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-215-g833f4e6

2011-05-18 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project eclipse - Powerful IDE written in java - Debian package..

The branch, master-3.6 has been updated
   via  833f4e68f171c395f0724e83c604020675b95224 (commit)
   via  1573105a5334412fe8754281dc04337e9397d5bd (commit)
   via  b3e46fce37da8f279a1231eb1c399b9fc9685be5 (commit)
   via  d0947cc4dbe9046f31303dd490b8de1800e81943 (commit)
  from  1303aaed109bda5eef317459e2e8a5f495264504 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 833f4e68f171c395f0724e83c604020675b95224
Author: Niels Thykier ni...@thykier.net
Date:   Wed May 18 15:35:51 2011 +0200

Made eclipse binNMUable again

commit 1573105a5334412fe8754281dc04337e9397d5bd
Author: Niels Thykier ni...@thykier.net
Date:   Tue May 17 20:49:02 2011 +0200

Improved handling of SWT JNI

It is now removed from the SWT bundle and we install the JNI
in a predefined location with SWT being patched to look for
it there to avoid it being extracted to $HOME.

commit b3e46fce37da8f279a1231eb1c399b9fc9685be5
Author: Niels Thykier ni...@thykier.net
Date:   Tue May 17 16:53:32 2011 +0200

Made eclipse-plugin-cvs an architecture all package

commit d0947cc4dbe9046f31303dd490b8de1800e81943
Author: Niels Thykier ni...@thykier.net
Date:   Tue May 17 16:51:01 2011 +0200

Reduced eclipse-plugin-cvs to a suggest for eclipse-jdt

---

Summary of changes:
 debian/changelog  |4 
 debian/control|7 +++
 debian/extra/repack_jars.sh   |   15 +++
 debian/patches/debian-load-internal-swt.patch |   19 +++
 debian/patches/series |1 +
 debian/rules  |   25 -
 6 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3ca15bd..fde1a34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,10 @@ eclipse (3.6.2-1) UNRELEASED; urgency=low
   * Use mh_clean to clean up after the maven-repo-helper.
   * Pulled the eclipse-platform.NEWS from the master branch and removed the
 old NEWS file.
+  * Reduced eclipse-plugins-cvs to a Suggests for eclipse-jdt.  (LP: #657286)
+  * Made eclipse-plugin-cvs an architecture all package.
+  * Made SWT load its JNI from well defined location to prevent occasional
+extraction to ~/.eclipse.
 
   [ Andres Mejia ]
   * Numerous changes to eclipse packaging just to get eclipse building using
diff --git a/debian/control b/debian/control
index 4018ea8..0d6a7b7 100644
--- a/debian/control
+++ b/debian/control
@@ -71,13 +71,12 @@ Package: eclipse-jdt
 Architecture: any
 Depends: default-jre | java5-runtime | java6-runtime,
  eclipse-platform (= ${binary:Version}),
- eclipse-plugin-cvs (= ${binary:Version}),
  junit (= 3.8.2-4),
  junit4 (= 4.7-3),
  libhamcrest-java (= 1.1-8~),
  ${misc:Depends}
 Recommends: default-jdk | sun-java6-jdk
-Suggests: eclipse
+Suggests: eclipse, eclipse-plugin-cvs (= ${source:Version})
 Replaces: eclipse-jdt-gcj
 Description: Eclipse Java Development Tools (JDT)
  The Eclipse Platform is an open and extensible platform for anything and yet
@@ -191,9 +190,9 @@ Description: Eclipse platform without plug-ins to develop 
any language (data)
  This package contains the architecture-independent data files.
 
 Package: eclipse-plugin-cvs
-Architecture: any
+Architecture: all
 Depends: default-jre | java5-runtime | java6-runtime,
- eclipse-platform (= ${binary:Version}),
+ eclipse-platform (= ${source:Version}),
  ${misc:Depends}
 Replaces: eclipse-cvs
 Description: Eclipse Team Integration (CVS support)
diff --git a/debian/extra/repack_jars.sh b/debian/extra/repack_jars.sh
new file mode 100755
index 000..1ba2837
--- /dev/null
+++ b/debian/extra/repack_jars.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+PLUGINS=$1
+
+
+for P in $PLUGINS/org.eclipse.swt.gtk.*.jar ; do
+if echo $P | grep -q .source_ ; then
+   # skip source jars.
+   continue
+fi
+zip -d $P *.so *.xpt
+done
+
diff --git a/debian/patches/debian-load-internal-swt.patch 
b/debian/patches/debian-load-internal-swt.patch
new file mode 100644
index 000..43d92dc
--- /dev/null
+++ b/debian/patches/debian-load-internal-swt.patch
@@ -0,0 +1,19 @@
+Description: Make eclipse load the internal SWT from a special location.
+ This together with the removal of .so files from the bundle prevents eclipse
+ from extracting SWT to the users HOME directory.
+ .
+ This patch

[pkg-java] r13697 - trunk/ant/debian

2011-05-19 Thread Niels Thykier
Author: nthykier
Date: 2011-05-19 11:30:31 + (Thu, 19 May 2011)
New Revision: 13697

Modified:
   trunk/ant/debian/changelog
   trunk/ant/debian/rules
Log:
Skip javadoc building when building with -B

Modified: trunk/ant/debian/changelog
===
--- trunk/ant/debian/changelog  2011-05-19 04:21:29 UTC (rev 13696)
+++ trunk/ant/debian/changelog  2011-05-19 11:30:31 UTC (rev 13697)
@@ -1,3 +1,11 @@
+ant (1.8.2-2) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Skip javadoc building if we are not building architecture all
+packages.  (Closes: #627110)
+
+ -- Niels Thykier ni...@thykier.net  Thu, 19 May 2011 13:08:21 +0200
+
 ant (1.8.2-1) unstable; urgency=low
 
   [ James Page ]

Modified: trunk/ant/debian/rules
===
--- trunk/ant/debian/rules  2011-05-19 04:21:29 UTC (rev 13696)
+++ trunk/ant/debian/rules  2011-05-19 11:30:31 UTC (rev 13697)
@@ -40,11 +40,19 @@
# remove -SNAPSHOT from the versions in the Maven poms
perl -p -i -e 's/-SNAPSHOT//g' `find src/etc/poms/ -name pom.xml`
# the rest
-   /bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.4 
-Dant.build.javac.target=1.4 -Dbuild.classpath=${CLASSPATH} -propertyfile 
debian/ant.properties jars javadocs
+   /bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.4 
-Dant.build.javac.target=1.4 -Dbuild.classpath=${CLASSPATH} -propertyfile 
debian/ant.properties jars
ln -sf /usr/share/java/xml-apis.jar $(DEB_BUILDDIR)/lib/xml-apis.jar
ln -sf /usr/share/java/xercesImpl.jar $(DEB_BUILDDIR)/lib/xercesImpl.jar
touch stamp-build-ant
 
+build-ant-doc: stamp-build-ant-doc
+stamp-build-ant-doc:
+   /bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.4 
-Dant.build.javac.target=1.4 -Dbuild.classpath=${CLASSPATH} -propertyfile 
debian/ant.properties javadocs
+   touch $@
+
+install/ant-doc:: build-ant-doc
+   -rm -f docs/manual/LICENSE
+
 install/ant:: build-ant
dh_install -pant
mh_installpoms -pant --set-version=$(VERSION)
@@ -96,9 +104,6 @@
dh_nativejava -pant-optional-gcj
 endif
 
-install/ant-doc::
-   -rm -f docs/manual/LICENSE
-
 clean::
-rm -f gjdoc_rawcomment.cache
-rm -rf bin bootstrap build lib/*.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] r13698 - trunk/ant/debian

2011-05-19 Thread Niels Thykier
Author: nthykier
Date: 2011-05-19 11:31:48 + (Thu, 19 May 2011)
New Revision: 13698

Modified:
   trunk/ant/debian/changelog
Log:
Set dist and release into unstable

Modified: trunk/ant/debian/changelog
===
--- trunk/ant/debian/changelog  2011-05-19 11:30:31 UTC (rev 13697)
+++ trunk/ant/debian/changelog  2011-05-19 11:31:48 UTC (rev 13698)
@@ -1,10 +1,10 @@
-ant (1.8.2-2) UNRELEASED; urgency=low
+ant (1.8.2-2) unstable; urgency=low
 
   * Team upload.
   * Skip javadoc building if we are not building architecture all
 packages.  (Closes: #627110)
 
- -- Niels Thykier ni...@thykier.net  Thu, 19 May 2011 13:08:21 +0200
+ -- Niels Thykier ni...@thykier.net  Thu, 19 May 2011 13:28:47 +0200
 
 ant (1.8.2-1) unstable; urgency=low
 


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[pkg-java] r13699 - tags/ant

2011-05-19 Thread Niels Thykier
Author: nthykier
Date: 2011-05-19 11:39:13 + (Thu, 19 May 2011)
New Revision: 13699

Added:
   tags/ant/1.8.2-2/
Log:
Tag for 1.8.2-2 upload


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, master, updated. 0.35-1-g9722981

2011-05-25 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  97229816284e473df8524ec40e4d00e35d1f703d (commit)
  from  728e8e1564e64c99b478ba92540b3b76302dc8b7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 97229816284e473df8524ec40e4d00e35d1f703d
Author: Niels Thykier ni...@thykier.net
Date:   Wed May 25 10:44:09 2011 +0200

Really made jh_manifest follow symlinks this time

---

Summary of changes:
 debian/changelog |7 +++
 jh_manifest  |5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 130ffbe..1d81a02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+javatools (0.36) UNRELEASED; urgency=low
+
+  * Made jh_manifest always follow symlinks - the fix for this in
+0.35 was incomplete.  (Closes: #626329)
+
+ -- Niels Thykier ni...@thykier.net  Wed, 25 May 2011 10:43:07 +0200
+
 javatools (0.35) unstable; urgency=low
 
   * Made jh_manifest always follow symlinks even if they are passed
diff --git a/jh_manifest b/jh_manifest
index 6d368b2..dac99c6 100755
--- a/jh_manifest
+++ b/jh_manifest
@@ -137,7 +137,7 @@ if(@ARGV){
 } else {
 verbose_print(Updating $target);
 }
-update_jar($jar, undef) unless $dh{NO_ACT};
+update_jar($target, undef) unless $dh{NO_ACT};
 }
 inhibit_log();
 # behave like the old jh_manifest.
@@ -188,7 +188,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 my $manifest = $manifests-{$link};
 my $lp = $path;
 next unless(defined($manifest));
-error(Cannot modify $link - it is a broken symlink or not possible to 
resolve,) unless( defined($path)  -e $path );
+error(Cannot modify $link - it is a broken symlink or not possible to 
resolve,)
+unless( defined($path)  -e $path );
 $lp =~ s@^\Q$fulldir\E/*@@;
 error(Conflicting manifests for $link (link) and $path,) 
if(exists($manifests-{$lp}));
 delete($files-{$lp});


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-218-g81cf81d

2011-05-27 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project eclipse - Powerful IDE written in java - Debian package..

The branch, master-3.6 has been updated
   via  81cf81d814ccb916c3389daf0585a692fd4e045f (commit)
   via  78aec30451f2d297a8603e967b95c034983d99c4 (commit)
   via  772857a338f41ea878bdc9460bd1f569b59cd4dd (commit)
  from  833f4e68f171c395f0724e83c604020675b95224 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 81cf81d814ccb916c3389daf0585a692fd4e045f
Author: Niels Thykier ni...@thykier.net
Date:   Fri May 27 21:46:26 2011 +0200

Released to experimental

commit 78aec30451f2d297a8603e967b95c034983d99c4
Author: Niels Thykier ni...@thykier.net
Date:   Fri May 27 00:37:34 2011 +0200

Refreshed ant-1.8.2 support patch

commit 772857a338f41ea878bdc9460bd1f569b59cd4dd
Author: Niels Thykier ni...@thykier.net
Date:   Fri May 27 00:31:49 2011 +0200

Fix FTBFS on i386.

* debian/patches/gnomeproxy-makefile.patch: Set Java include path for
  libgnomeproxy.
* debian/patches/gnomeproxy-pkg-config.patch: Use pkg-config to find
  include files and libraries for libgnomeproxy.  (LP: #749218)

Conflicts:

debian/changelog
debian/patches/series

---

Summary of changes:
 debian/changelog   |6 +-
 debian/patches/bp-ant-1.8.2-support.patch  |2 +-
 debian/patches/gnomeproxy-pkg-config.patch |   22 ++
 debian/patches/series  |1 +
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fde1a34..54b3b63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,8 @@
-eclipse (3.6.2-1) UNRELEASED; urgency=low
+eclipse (3.6.2~exp-1) experimental; urgency=low
+
+  [ Anders Kaseorg ]
+  * debian/patches/gnomeproxy-pkg-config.patch: Use pkg-config to find
+include files and libraries for libgnomeproxy.  (LP: #749218)
 
   [ Benjamin Drung ]
   * New upstream version (Closes: #587742, LP: #604390).
diff --git a/debian/patches/bp-ant-1.8.2-support.patch 
b/debian/patches/bp-ant-1.8.2-support.patch
index 838e4a9..f7d51f3 100644
--- a/debian/patches/bp-ant-1.8.2-support.patch
+++ b/debian/patches/bp-ant-1.8.2-support.patch
@@ -17,7 +17,7 @@ diff --git a/eclipse-build/build.xml b/eclipse-build/build.xml
 index 6dc9b5d..85f3442 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -315,6 +315,7 @@
+@@ -317,6 +317,7 @@
!-- end eclipse-build-only patches --
!-- back-ported patches --
patch 
patchfile=${basedir}/patches/bz319476-compile-jar-in-jar-loader.patch 
dir=${buildDirectory}/plugins/org.eclipse.jdt.ui strip=0 /
diff --git a/debian/patches/gnomeproxy-pkg-config.patch 
b/debian/patches/gnomeproxy-pkg-config.patch
new file mode 100644
index 000..c08ef16
--- /dev/null
+++ b/debian/patches/gnomeproxy-pkg-config.patch
@@ -0,0 +1,22 @@
+Description: Use pkg-config to find include files and libraries for 
libgnomeproxy
+Author: Anders Kaseorg ande...@mit.edu
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/749218
+Last-Update: 2011-05-19
+
+diff --git a/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile 
b/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile
+index 0aa0cbe..ff2a54c 100644
+--- a/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile
 b/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile
+@@ -20,10 +20,10 @@ LIB_NAME_FULL = libgnomeproxy-1.0.0.so
+ 
+ OS_TYPE = linux
+ JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
+-INCLUDE = -I/usr/include/gconf/2/ -I/usr/include/orbit-2.0/ 
-I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/
++INCLUDE =  $(shell pkg-config --cflags gconf-2.0 glib-2.0)
+ COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32
+ 
+-LIBS := -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0
++LIBS :=  $(shell pkg-config --libs gconf-2.0 glib-2.0)
+ LINKER_FLAGS= -m32
+ 
+ all: link
diff --git a/debian/patches/series b/debian/patches/series
index 68b4809..18a1645 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ eclipse-build-generatedScripts.patch
 generate-metadata-and-extract-swt-libraries.patch
 bp-ant-1.8.2-support.patch
 debian-load-internal-swt.patch
+gnomeproxy-pkg-config.patch


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] eclipse - Powerful IDE written in java - Debian package. annotated tag, debian/3.6.2-exp-1, created. debian/3.6.2-exp-1

2011-05-27 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project eclipse - Powerful IDE written in java - Debian package..

The annotated tag, debian/3.6.2-exp-1 has been created
at  03b2602c90b9da589559f16486b0efe555faccdf (tag)
   tagging  81cf81d814ccb916c3389daf0585a692fd4e045f (commit)
  replaces  eclipse-ppa/maverick
 tagged by  Niels Thykier
on  Fri May 27 21:47:26 2011 +0200

- Log -
Released into experimental

Adnan Hodzic (17):
  fix bashism
  fix bashism - including patch
  fixes bashisms
  final bashisms fixes
  renamed the patch and added DEP-3 header
  added fix-bashism patch
  edited dep-3 header
  added fix-bashism.patch to changelo
  updated my last changelog
  updated my last changelog 2
  updated my last changelog 3
  updated my last changelog 4
  added fix-bashism.patch to changelo
  updated my last changelog
  updated my last changelog 2
  updated my last changelog 3
  updated my last changelog 4

Andres Mejia (9):
  Numerous changes to eclipse packaging just to get eclipse building using 
sbuild.
  Install swt*.jar symlinks in eclipse-platform package.
  Add myself as Uploader.
  Bump to Standards-Version 3.9.2.
  Update changelog.
  Include needed dependency on libswt-gtk-3.6-jni for eclipse-rcp.
  Update eclipse script for new upstream release.
  Fix generation of metadata needed to be able to install third party 
plugins.
  Update changelog.

Benjamin Drung (151):
  Import a post-RC4 release of eclipse 3.6.0 (eclipse-3.6.0-src.tar.bz2).
  Import eclipse-build 3.6 branch (revision 25021).
  Unapply patches.
  Merge branch 'upstream-3.6'
  Revert Merge branch 'upstream-3.6'
  Reapply patches.
  Remove patches that are applied upstream.
  Refresh patches.
  Drop backported bp-hover-visability.patch.
  Apply and refresh patches.
  Prepare debian/changelog.
  Remove unneeded .orig file.
  Remove binaries.
  Merge branch 'upstream-3.6' into master-3.6
  Drop backported patch.
  Add git-buildpackage config file.
  Import eclipse-build 3.6 branch (revision 25024).
  Import a newer post-RC4 release of eclipse 3.6.0 
(eclipse-3.6.0-src.tar.bz2).
  Merge branch 'upstream-3.6' into master-3.6
  Determine build architecture automatically.
  Merge branch 'master' into master-3.6
  Refresh patches.
  Update debian/gbp.conf.
  Add update-dependency.patch.
  Update update-dependency.patch.
  Extract org.eclipse.osgi.services source zip.
  Merge branch 'upstream-3.6' into master-3.6
  Add regenerateBootstrapFiles.patch.
  Regenerate eclipse-build-generatedScripts.tar.bz2.
  Add patch to not overwrite JAVA_HOME.
  Add Bug link to java-home.patch.
  Correct LP link.
  Merge branch 'master' into master-3.6
  Replace tab by space.
  Bump Standards-Version to 3.9.0 (no changes required).
  eclipse-platform: Do not suggest eclipse-pde, because it's recommended 
already.
  Convert versioned Conflicts into Breaks.
  Release 3.5.2-4 to Debian unstable.
  Fix pattern matching to detect correct architecture.
  Release 3.5.2-5 to Debian unstable.
  Merge version 3.5.2-5 from branch 'master' into master-3.6
  Import eclipse-build 3.6 branch (revision 25131).
  Merge branch 'upstream-3.6' into master-3.6
  Update debian/changelog.
  Add refresh-patches.patch, rearrange order of patches, and refresh them.
  Drop removed plugins.
  Install new plugins.
  Sort .install files.
  Call dh_install with --list-missing parameter.
  Remove additional backslash.
  Add new plugins (they are part of Eclipse Classic).
  Remove only subdirectories of metadata.
  Refresh symlink-system-files.patch.
  Drop uname workaround.
  Remove osgi.util src.zip.
  Merge branch 'upstream-3.6' into master-3.6
  Import eclipse-build 3.6 branch (revision 25179).
  Unapply all patches.
  Merge branch 'upstream-3.6' into master-3.6
  Drop all patches that are accepted upstream.
  Drop backported fix-tooltip-color.patch.
  Update lucene.patch.
  Import eclipse-build 3.6 branch (revision 25239).
  Drop build-arch.patch and regenerateBootstrapFiles.patch.
  Merge branch 'upstream-3.6' into master-3.6
  Refresh patches.
  Import eclipse-build 3.6 branch (revision 25246).
  Merge branch 'upstream-3.6' into master-3.6
  Drop lucene.patch.
  Refresh patches.
  Drop fix-shell-script-perm.patch. It doesn't produce lintian warning any 
more.
  Disable logging.
  Update patch header.
  patch header: Change Author to From to support gbp-pq.
  Update disable-logging.patch.
  Move metadata

[pkg-java] r13723 - tags

2011-05-30 Thread Niels Thykier
Author: nthykier
Date: 2011-05-30 14:59:30 + (Mon, 30 May 2011)
New Revision: 13723

Added:
   tags/jug/
Log:
Made jug tags dir


___
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] r13724 - tags/jug

2011-05-30 Thread Niels Thykier
Author: nthykier
Date: 2011-05-30 14:59:53 + (Mon, 30 May 2011)
New Revision: 13724

Added:
   tags/jug/2.0.0-2/
Log:
Tag for 2.0.0-2 upload


___
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#628380: cantlr depends on gij, not available anymore in unstable

2011-05-30 Thread Niels Thykier
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 2011-05-30 20:50, tony mancill wrote:
 Niels,
 
 Building from the trunk of the packaging repo works fine - any concerns with 
 me
 bumping the standards versions and uploading to address this bug?
 
 Thanks,
 tony
 

Hey,

Nope, not at all... I just did the default-jdk-builddep changes while I
remembered it. :)  So by all means go ahead and do an upload.

~Niels

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJN4+m3AAoJEAVLu599gGRCSqoP/14Mqcq43ptKs4cW8lBVkpqJ
mFOGwHZa4AGQo5B/AOoK95fVWrJVewearbufjy/OginQfYwChKJeiHHGr0BSo9HW
edePVfJydh7stIl5h24sW8AaqOXW/bZgYWQtEj9tUY3/PwEfRfqfCu0nF4heOafv
W7dDzrTqjWqUfXK4ScYMk4rGzlh5qi2Aw0a6r0pob7qn5ci4O64t3cnh948NRwUv
XgFGeDT619Uk8n7S+/OGsLjmckzjRWgBCH1m40tIwjuZ/+iU/FICyq0ENqzJQ0Ww
5leCYIqSdJcOw2JEhX9uPMJgzP+xFgJygNIPlFe679nbjz90jZ4eC4tVjSp8O3lM
eWsrFSEzQYdSLGyXk8wpphH0l5Sct1MGRDW+Byg26acfIks+4t5dqjSg2e6etjCY
EKGbSRRXKD2e8rSHStZzLQ+u7kYFVSrDCfYImCYvdo04P0OzR9LMo7mSueN2LsEO
4VDqv9UdjeQBgv2k5VJAWwF7vFCM0m1liWXvVrt35QA2NPIcSY+VeI2EXm4cs2AE
W+mSaatPAODszvQIz8y+h2b5VwReRTclZVuKQJQ6AMS9d8LkKFuWPr4QeS00NJAc
a+nC+E/EWHXY6xYpG3svSPNwZq1rEBVavOPaB1VnOGRcjxofFNiR/JWsmDBmm1F0
R64FanfhKM9VL4Pi012F
=ZnPd
-END PGP SIGNATURE-



__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.


[SCM] UNNAMED PROJECT branch, master, updated. 0.35-2-gfef097b

2011-06-04 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  fef097bd65c67f40858ecb6baa0ef6b8b0cd6cea (commit)
  from  97229816284e473df8524ec40e4d00e35d1f703d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit fef097bd65c67f40858ecb6baa0ef6b8b0cd6cea
Author: Niels Thykier ni...@thykier.net
Date:   Sat Jun 4 13:19:45 2011 +0200

Do not strip leading / unconditionally in jh_manifest

Occasionally it is given the absolute path to a jar and that
should still work.

---

Summary of changes:
 jh_manifest|   10 ++
 tests/tests.sh |1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/jh_manifest b/jh_manifest
index dac99c6..55aca49 100755
--- a/jh_manifest
+++ b/jh_manifest
@@ -118,11 +118,13 @@ if(@ARGV){
 my $orig = $jar;
 my $target = $jar;
 my $link = 0;
-# strip any leading / or ./ - it looks better and it
-# does not accidentally install a system install jar instead.
-$target =~ s@^\.?/+@@og;
 # Look for it in $dir if it does not exist directly.
-$target = $dir/$target unless -f $target;
+unless (-f $target) {
+# strip any leading / or ./ - it looks better and it
+# does not accidentally install a system install jar instead.
+$target =~ s@^\.?/+@@og;
+$target = $dir/$target;
+}
 if ( -l $jar ){
 # Follow links
 my $dest = Cwd::abs_path($target);
diff --git a/tests/tests.sh b/tests/tests.sh
index 6f87db7..28f9669 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -21,6 +21,7 @@ fi
 run_jh_manifest()
 {
 cd ..
+echo Running: perl -I./lib ./jh_manifest \$@\
 perl -I./lib ./jh_manifest $@
 cd $_DIR
 }


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, master, updated. 0.35-3-gdb436ca

2011-06-04 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  db436cabe9de6176ad8851b7423463c31f26b1d2 (commit)
  from  fef097bd65c67f40858ecb6baa0ef6b8b0cd6cea (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit db436cabe9de6176ad8851b7423463c31f26b1d2
Author: Niels Thykier ni...@thykier.net
Date:   Sat Jun 4 13:31:28 2011 +0200

Release into unstable

---

Summary of changes:
 debian/changelog |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d81a02..4e6e267 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-javatools (0.36) UNRELEASED; urgency=low
+javatools (0.36) unstable; urgency=low
 
   * Made jh_manifest always follow symlinks - the fix for this in
 0.35 was incomplete.  (Closes: #626329)
 
- -- Niels Thykier ni...@thykier.net  Wed, 25 May 2011 10:43:07 +0200
+ -- Niels Thykier ni...@thykier.net  Sat, 04 Jun 2011 13:30:53 +0200
 
 javatools (0.35) unstable; urgency=low
 


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT annotated tag, 0.36, created. 0.36

2011-06-04 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The annotated tag, 0.36 has been created
at  8870dde65a3d71bc11ec572b541c2e30310aacbc (tag)
   tagging  db436cabe9de6176ad8851b7423463c31f26b1d2 (commit)
  replaces  0.35
 tagged by  Niels Thykier
on  Sat Jun 4 13:33:09 2011 +0200

- Log -
Release into unstable

Niels Thykier (3):
  Really made jh_manifest follow symlinks this time
  Do not strip leading / unconditionally in jh_manifest
  Release into unstable

---


hooks/post-receive
-- 
UNNAMED PROJECT

___
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#631061: eclipse: Fails to FTBFS against iceweasel 4.0 or 5.0

2011-06-19 Thread Niels Thykier
Package: eclipse
Version: 3.6.2-1
Severity: serious
Tags: wheezy experimental sid
User: pkg-mozilla-maintain...@lists.alioth.debian.org
Usertags: xulrunner-2.0

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Hi,

Since the release team started filing bugs for this, I assume it would be good
to add eclipse to the tracking. :)

~Niels



-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJN/ksaAAoJEAVLu599gGRCCmYP/jDxj+pSOAb/F7holxUSP/hC
xRPhjkBYhgQgiU9cGIK9VnZMLalpQyMx0Vj68fEWLPQIgOM/6GwHC3nYIM9yPuLA
pYvIgsOAvm32RAljfEEjbX+nUqTA0MTEZ+EVsNaOBtaeRngq1Qoi5oJHLfalrKVa
c6Oy9nG+9QbnQ84UKISq1jeomZvH39gnDI4N+6An+3om4rsWY26dfp4VS/cVbJ51
PKlazsk5IKhQL5EqMAZOaPZDolrOrg3qyrfbMXw3KdpNw2WKvREBkoEPa8dUopkH
wS8xY9EDrj8rzc9YzwlVIRb1WHZO2vV27BJBC6MDsNo+lJP+LDoRKyxJXSidFmjV
0W1aBPVWbx6LSuGjBtmomSYQ2ceVOpTY6NCpJjvrUS4kN/vquU1VnganOWFqPL+0
At9BUC1e0fzZnV4bhEnGLNcL4ptSnBx6ykbtRPbJOi1ssAbunFpczZ1K9cVGLghg
svBHcr+3nI0hwMuj+MlI37l+uXbZrJDHSRTjWeGDVc6NNojxNnguIeCqbTRUQ23Q
sqPOriuL9XPfGZQXEouwdv1gYZZq/Ab9u3XoFyh56bKcNXUvxMSVEpCuuuIZA1W0
jfPe+UHH9Pk5gxnqxwQ7v7izrGFt4eNZSRGTwA0TwNgHGIfEk6XOWE/Nf7cmo6aR
XZgZQGUQ2FXo8fpXUOBL
=LzON
-END PGP SIGNATURE-



__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.


[SCM] UNNAMED PROJECT branch, jh-symbols, created. 0.36-1-ge0ca16c

2011-07-01 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, jh-symbols has been created
at  e0ca16cc77b6b3db2c9443660ecae7e824e42a75 (commit)

- Log -
commit e0ca16cc77b6b3db2c9443660ecae7e824e42a75
Author: Niels Thykier ni...@thykier.net
Date:   Fri Jul 1 23:25:21 2011 +0200

Added src for the prototype Javahelper symbols file handler

No build system is included for it yet.

---


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, jh-symbols, updated. 0.36-2-ge85be8e

2011-07-01 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, jh-symbols has been updated
   via  e85be8e8d68a6fb28d4210cc893c65e815e4c830 (commit)
  from  e0ca16cc77b6b3db2c9443660ecae7e824e42a75 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit e85be8e8d68a6fb28d4210cc893c65e815e4c830
Author: Niels Thykier ni...@thykier.net
Date:   Fri Jul 1 23:43:49 2011 +0200

Added build support to the code for symbols handling

---

Summary of changes:
 debian/control |4 ++--
 debian/javahelper.install  |1 +
 debian/javahelper.manifest |3 +++
 debian/rules   |9 +
 jh_build   |3 ++-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index ef81788..c6f139e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
 Uploaders: Matthew Johnson mj...@debian.org, Niels Thykier 
ni...@thykier.net
 Build-Depends: debhelper (= 7.0.50~)
-Build-Depends-Indep: default-jdk, libarchive-zip-perl (= 1.20), markdown, perl
+Build-Depends-Indep: default-jdk, libarchive-zip-perl (= 1.20), libbcel-java, 
markdown, perl
 Standards-Version: 3.9.2
 Section: java
 Vcs-Git: git://git.debian.org/git/pkg-java/javatools.git
@@ -24,7 +24,7 @@ Package: javahelper
 Architecture: all
 Depends: ${misc:Depends}, debhelper, devscripts,
  bsdmainutils, dpkg-dev, dctrl-tools,
- libarchive-zip-perl (= 1.20)
+ libarchive-zip-perl (= 1.20), libbcel-java
 Suggests: cvs,
   gawk,
   tofrodos,
diff --git a/debian/javahelper.install b/debian/javahelper.install
index 3ac2d20..6ea6e3c 100644
--- a/debian/javahelper.install
+++ b/debian/javahelper.install
@@ -17,6 +17,7 @@ jh_compilefeatures /usr/bin
 jh_lib.sh /usr/share/javahelper
 # Internal helper command - not ready for /usr/bin
 jh_scanjavadoc /usr/share/javahelper
+tmp/jh-symbols.jar /usr/share/javahelper
 java-vars.mk /usr/share/javahelper
 java-arch.sh /usr/share/javahelper
 javahelper.mk /usr/share/cdbs/1/class
diff --git a/debian/javahelper.manifest b/debian/javahelper.manifest
new file mode 100644
index 000..4cf0baa
--- /dev/null
+++ b/debian/javahelper.manifest
@@ -0,0 +1,3 @@
+usr/share/javahelper/jh-symbols.jar:
+ Class-Path: /usr/share/java/bcel.jar
+ Main-Class: org.debian.javahelper.symbols.Main
diff --git a/debian/rules b/debian/rules
index 74a6c82..676f04d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,9 @@ POD2MAN=pod2man --stderr --utf8 -c Javahelper -r $(VERSION)
 
 MOD_PATH:=lib/Debian/Javahelper
 
+export JAVAHELPER_DIR:=$(CURDIR)
+export CLASSPATH:=/usr/share/java/bcel.jar
+
 %:
dh $@
 
@@ -14,6 +17,7 @@ jh_lib.sh: jh_lib.sh.in
 
 override_dh_auto_build: jh_lib.sh
mkdir tmp tmp.jarwrapper
+   ./jh_build --no-javadoc tmp/jh-symbols.jar src/
# javahelper pod-based manpages
$(POD2MAN) jh_installeclipse tmp/jh_installeclipse.1
$(POD2MAN) jh_generateorbitdir tmp/jh_generateorbitdir.1
@@ -35,8 +39,13 @@ override_dh_auto_build: jh_lib.sh
 runtests: jh_lib.sh
cd tests  ./tests.sh
 
+override_dh_install:
+   dh_install
+   perl -Ilib jh_manifest -pjavahelper
+
 override_dh_auto_test: runtests
 
 override_dh_auto_clean:
+   [ ! -e jh_lib.sh ] || ./jh_build --clean
rm -f jh_lib.sh tutorial.html
rm -fr tmp tmp.jarwrapper
diff --git a/jh_build b/jh_build
index 3509956..a024313 100755
--- a/jh_build
+++ b/jh_build
@@ -1,9 +1,10 @@
 #!/bin/bash --
 
 EXECDIRS=bin usr/bin usr/games
+[ -z $JAVAHELPER_DIR ]  JAVAHELPER_DIR=/usr/share/javahelper
 
 set -e
-. /usr/share/javahelper/jh_lib.sh
+. $JAVAHELPER_DIR/jh_lib.sh
 
 syntax()
 {


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


Re: Processed: eclipse-cdt: still not fixed

2011-07-03 Thread Niels Thykier

submitter 574611 infini...@gmx.com
thanks

On 2011-07-02 23:12, Debian Bug Tracking System wrote:
 Processing commands for cont...@bugs.debian.org:
 
 unarchive 574611
 Bug #574611 {Done: Niels Thykier ni...@thykier.net} [eclipse-cdt] 
 eclipse-cdt: Does not show up anywhere in Eclipse
 Unarchived Bug 574611
 reopen 574611
 Bug #574611 {Done: Niels Thykier ni...@thykier.net} [eclipse-cdt] 
 eclipse-cdt: Does not show up anywhere in Eclipse
 'reopen' may be inappropriate when a bug has been closed with a version;
 you may need to use 'found' to remove fixed versions.
 found 574611 6.0.2-1
 Bug #574611 [eclipse-cdt] eclipse-cdt: Does not show up anywhere in Eclipse
 Bug Marked as found in versions eclipse-cdt/6.0.2-1.
 thanks
 Stopping processing here.
 
 Please contact me if you need assistance.

Hey,

Are you perhaps suffering from #587657?  If not, please include the
version of eclipse-cdt and eclipse-platform.

~Niels


__
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#632620: relies on package/usr/share/doc

2011-07-04 Thread Niels Thykier
On 2011-07-04 08:59, Rene Engelhard wrote:
 Package: javahelper
 Version: 0.36.1
 Severity: serious
 iJustification: policy 12.3
 
 Hi.
 
 From 
 https://buildd.debian.org/status/fetch.php?pkg=libreofficearch=armelver=1%3A3.3.3-4stamp=1309760289:
 
 [...]
 jh_depends -a -Xlibreoffice-gcj -Xure
 find: 
 `/build/buildd-libreoffice_3.3.3-4-armel-Mz0jMT/libreoffice-3.3.3/debian/libreoffice-base-core/usr/share/doc':
  No such file or directory
 make: *** [debian/stampdir/binary-arch] Error 1
 dpkg-buildpackage: error: fakeroot debian/rules binary-arch gave error exit 
 status 2
 
 Why does javahelper look in /usr/share/doc/? And why does it fail
 if it doesn't exist because it's just not built? (see my other bug).
 

Most likely, this is the part that tries to calculate dependencies on
javadocs.  Anyhow, fixing this assumption is a good idea. :)

 Policy 12.3 (http://www.debian.org/doc/debian-policy/ch-docs.html):
 
 12.3 Additional documentation
 
 Any additional documentation that comes with the package may be installed at 
 the discretion of the package maintainer. Plain text documentation should be 
 installed in the directory /usr/share/doc/package, where package is the name 
 of the package, and compressed with gzip -9 unless it is small.
 [...]
 Packages must not require the existence of any files in /usr/share/doc/ in 
 order to function [105]. Any files that are referenced by programs but are 
 also useful as stand alone documentation should be installed under 
 /usr/share/package/ with symbolic links from /usr/share/doc/package. 
 [...]
 
 
 Regards,
 
 Rene
 
  [...]




__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.


[SCM] UNNAMED PROJECT branch, jh-symbols, updated. 0.36-4-g27acb14

2011-07-05 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, jh-symbols has been updated
   via  27acb14876246d175f39dd3e3a5b3a139caa18d8 (commit)
   via  90f24c7a0b11cd5607cc8542d04d2cf42181b334 (commit)
  from  e85be8e8d68a6fb28d4210cc893c65e815e4c830 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 27acb14876246d175f39dd3e3a5b3a139caa18d8
Author: Niels Thykier ni...@thykier.net
Date:   Tue Jul 5 12:17:27 2011 +0200

Created a IDifferenceMaker to diff two symbol containers

Useful for determining if symbols have been added or removed.

commit 90f24c7a0b11cd5607cc8542d04d2cf42181b334
Author: Niels Thykier ni...@thykier.net
Date:   Tue Jul 5 12:16:55 2011 +0200

Made anonymous classes private

---

Summary of changes:
 src/org/debian/javahelper/symbols/Factory.java |   11 ++
 .../javahelper/symbols/IDifferenceMaker.java   |9 ++
 .../javahelper/symbols/ISymbolCheckResult.java |6 +
 .../debian/javahelper/symbols/ISymbolChecker.java  |   13 +++
 .../javahelper/symbols/ISymbolContainer.java   |1 +
 src/org/debian/javahelper/symbols/ISymbolDiff.java |   61 +++
 src/org/debian/javahelper/symbols/Main.java|   58 +++
 .../symbols/internal/BCELLibraryParser.java|9 +-
 .../symbols/internal/EmptySymbolContainer.java |   19 
 .../symbols/internal/SimpleSymbolDifference.java   |   54 ++
 .../internal/SymbolContainerDifference.java|   63 +++
 .../javahelper/symbols/internal/SymbolDiffer.java  |  109 
 12 files changed, 410 insertions(+), 3 deletions(-)

diff --git a/src/org/debian/javahelper/symbols/Factory.java 
b/src/org/debian/javahelper/symbols/Factory.java
index b2cc186..30189b4 100644
--- a/src/org/debian/javahelper/symbols/Factory.java
+++ b/src/org/debian/javahelper/symbols/Factory.java
@@ -2,6 +2,7 @@ package org.debian.javahelper.symbols;
 
 import org.debian.javahelper.symbols.internal.BCELLibraryParser;
 import org.debian.javahelper.symbols.internal.SymbolData;
+import org.debian.javahelper.symbols.internal.SymbolDiffer;
 
 /**
  * Factory class to create instances of {@link ILibrarySymbolData}
@@ -23,6 +24,11 @@ public abstract class Factory {
public abstract ILibrarySymbolData createSymbolData();
 
/**
+* @return A new {@link IDifferenceMaker}
+*/
+   public abstract IDifferenceMaker createDifferenceMaker();
+
+   /**
 * @return A new Factory
 */
public static final Factory newInstance(){
@@ -36,6 +42,11 @@ public abstract class Factory {
public ILibrarySymbolData createSymbolData(){
return new SymbolData();
}
+
+   @Override
+   public IDifferenceMaker createDifferenceMaker() {
+   return new SymbolDiffer();
+   }
};
}
 }
diff --git a/src/org/debian/javahelper/symbols/IDifferenceMaker.java 
b/src/org/debian/javahelper/symbols/IDifferenceMaker.java
new file mode 100644
index 000..53cdab4
--- /dev/null
+++ b/src/org/debian/javahelper/symbols/IDifferenceMaker.java
@@ -0,0 +1,9 @@
+package org.debian.javahelper.symbols;
+
+import org.debian.javahelper.symbols.internal.EmptySymbolContainer;
+
+public interface IDifferenceMaker {
+   public static final ISymbolContainer EMPTY_SYMBOL_CONTAINER = new 
EmptySymbolContainer();
+
+   public ISymbolDiff diff(ISymbolContainer oldCon, ISymbolContainer 
newCon);
+}
diff --git a/src/org/debian/javahelper/symbols/ISymbolCheckResult.java 
b/src/org/debian/javahelper/symbols/ISymbolCheckResult.java
new file mode 100644
index 000..08de84a
--- /dev/null
+++ b/src/org/debian/javahelper/symbols/ISymbolCheckResult.java
@@ -0,0 +1,6 @@
+package org.debian.javahelper.symbols;
+
+public interface ISymbolCheckResult {
+
+
+}
diff --git a/src/org/debian/javahelper/symbols/ISymbolChecker.java 
b/src/org/debian/javahelper/symbols/ISymbolChecker.java
new file mode 100644
index 000..e1ba6cd
--- /dev/null
+++ b/src/org/debian/javahelper/symbols/ISymbolChecker.java
@@ -0,0 +1,13 @@
+package org.debian.javahelper.symbols;
+
+public interface ISymbolChecker {
+
+   /**
+* Compare the old data set (oData) to a new data set (nData)
+* 
+* @param oData The old / original data set
+* @param nData The new data set
+* @return The result
+*/
+   public ISymbolCheckResult analyse(ILibrarySymbolData oData, 
ILibrarySymbolData nData);
+}
diff --git

[SCM] UNNAMED PROJECT branch, master, updated. 0.36-5-g5df7ff5

2011-07-06 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, master has been updated
   via  5df7ff57bf0d547551af0c8b72d5950e75c49987 (commit)
   via  3d4f70184f999de6c3f9d7c2081d6af3158f7468 (commit)
  from  e811a2154dfcd85ce8c9ce93356dc4d9adf14712 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 5df7ff57bf0d547551af0c8b72d5950e75c49987
Author: Niels Thykier ni...@thykier.net
Date:   Wed Jul 6 14:53:19 2011 +0200

Release 0.37 into unstable

commit 3d4f70184f999de6c3f9d7c2081d6af3158f7468
Author: Matthew Johnson mj...@debian.org
Date:   Wed Jul 6 10:19:43 2011 +0100

fix for #591874

---

Summary of changes:
 debian/changelog |9 +++--
 jh_build |4 
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93f5a99..9b7708c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-javatools (0.37) UNRELEASED; urgency=low
+javatools (0.37) unstable; urgency=low
 
+  [ Niels Thykier ]
   * Do not assume that $pkg/usr/share/doc is present when jh_depends
 runs.  (Closes: #632620)
   * Applied changes from NMU.
@@ -7,7 +8,11 @@ javatools (0.37) UNRELEASED; urgency=low
   * Added support for -s/--same-arch in jh_lib and related shell
 scripts.  (Closes: #632619)
 
- -- Niels Thykier ni...@thykier.net  Mon, 04 Jul 2011 09:17:23 +0200
+  [ Matthew Johnson ]
+  * Default to -source 1.5 in jh_build unless specified in the extra
+args (Closes: #591874)
+
+ -- Niels Thykier ni...@thykier.net  Wed, 06 Jul 2011 14:53:12 +0200
 
 javatools (0.36) unstable; urgency=low
 
diff --git a/jh_build b/jh_build
index 3509956..8fb495f 100755
--- a/jh_build
+++ b/jh_build
@@ -51,6 +51,10 @@ fi
 JH_JAVAC_OPTS=`getarg o javacopts`
 JH_JAVADOC_OPTS=`getarg O javadoc-opts`
 
+if ! grep -- -source  $JH_JAVAC_OPTS /dev/null; then
+   JH_JAVAC_OPTS=-source 1.5 $JH_JAVAC_OPTS
+fi
+
 function dobuild()
 {
 


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, jh-symbols, updated. 0.36-5-g33af870

2011-07-06 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, jh-symbols has been updated
   via  33af870ae42bf1a5f0300e08ce93509782d45c21 (commit)
  from  27acb14876246d175f39dd3e3a5b3a139caa18d8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 33af870ae42bf1a5f0300e08ce93509782d45c21
Author: Niels Thykier ni...@thykier.net
Date:   Wed Jul 6 14:34:29 2011 +0200

FIXME: Committed temporary changes

---

Summary of changes:
 .../debian/javahelper/symbols/IClassSymbol.java|8 ++-
 src/org/debian/javahelper/symbols/ISymbolDiff.java |   32 ---
 src/org/debian/javahelper/symbols/Main.java|   60 +
 .../symbols/internal/BCELLibraryParser.java|   15 +++-
 .../javahelper/symbols/internal/ClassSymbol.java   |   18 -
 .../symbols/internal/SimpleSymbolDifference.java   |   32 +--
 .../internal/SymbolContainerDifference.java|4 +-
 .../javahelper/symbols/internal/SymbolData.java|   52 ++-
 .../javahelper/symbols/internal/SymbolDiffer.java  |   92 +++
 9 files changed, 245 insertions(+), 68 deletions(-)

diff --git a/src/org/debian/javahelper/symbols/IClassSymbol.java 
b/src/org/debian/javahelper/symbols/IClassSymbol.java
index 398ea6b..0bd182c 100644
--- a/src/org/debian/javahelper/symbols/IClassSymbol.java
+++ b/src/org/debian/javahelper/symbols/IClassSymbol.java
@@ -1,11 +1,17 @@
 package org.debian.javahelper.symbols;
 
+import java.util.List;
+
 /**
- * Presents a Class symbol, which can contain other symbols.
+ * Presents a Class symbol (or Interface), which can contain other symbols.
  * 
  * @author Niels Thykier
  *
  */
 public interface IClassSymbol extends ISymbol, ISymbolContainer{
 
+   public static final String UNKNOWN_CLASS_NAME = ?;
+
+   public String getParentClassName();
+   public ListString getImplementedInterfaceNames();
 }
diff --git a/src/org/debian/javahelper/symbols/ISymbolDiff.java 
b/src/org/debian/javahelper/symbols/ISymbolDiff.java
index 770412c..cfd1c4f 100644
--- a/src/org/debian/javahelper/symbols/ISymbolDiff.java
+++ b/src/org/debian/javahelper/symbols/ISymbolDiff.java
@@ -7,21 +7,22 @@ public interface ISymbolDiff {
public SymbolDiffStatus getDiffStatus();
 
/**
-* Returns the symbol being diffed if any (see return).  The symbol
-* data may refer to the new or the old version or even just a proxy
-* symbol (implementation defined).
-*   If the real symbol being diffed implements {@link IClassSymbol},
-* then the value returned here must also implement
-* {@link IClassSymbol}.
+* Returns the new symbol in the diff if any.
 * 
-*   Note that {@link ISymbol#getVersion()} of the returned symbol is
-* not required to make sense and may throw
-* {@link UnsupportedOperationException}
+* @return The new symbol or codenull/code.  For {@link 
SymbolDiffStatus#REMOVED} this
+* is codenull/code, but may also be codenull/code in other 
cases, such as the diff
+* was between two {@link ILibrarySymbolData} (rather than two symbols)
+*/
+   public ISymbol getNewSymbol();
+
+   /**
+* Returns the old symbol in the diff if any.
 * 
-* @return The symbol in consideration; codenull/code if
-* this diff is not between two symbols, but two {@link 
ILibrarySymbolData}.
+* @return The old symbol or codenull/code.  For {@link 
SymbolDiffStatus#ADDED} this
+* is codenull/code, but may also be codenull/code in other 
cases, such as the diff
+* was between two {@link ILibrarySymbolData} (rather than two symbols)
 */
-   public ISymbol getSymbol();
+   public ISymbol getOldSymbol();
 
public ListISymbolDiff getNewSymbols();
public ListISymbolDiff getMissingSymbols();
@@ -52,6 +53,13 @@ public interface ISymbolDiff {
 * the symbol itself has changed (e.g. it received a
 * new sub-symbol or it lost a sub-symbol).
 * 
+* This is also used if a {@link IClassSymbol} has
+* changed its parent-class or which interfaces it has
+* implemented.  In this case, all of its sub-symbols
+* imay/i be {@link #UNCHANGED}, although it is
+* much more likely that some sub-symbols has been
+* added or removed.
+* 
 * Note renaming a symbol will be classified as adding
 * a new symbol and removing an old one rather than

[SCM] UNNAMED PROJECT annotated tag, 0.37, created. 0.37

2011-07-06 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The annotated tag, 0.37 has been created
at  0714d2f47bf1ddd6228d622a14f88726ac28263e (tag)
   tagging  5df7ff57bf0d547551af0c8b72d5950e75c49987 (commit)
  replaces  0.36
 tagged by  Niels Thykier
on  Wed Jul 6 14:56:03 2011 +0200

- Log -
Released 0.37 into unstable

Matthew Johnson (1):
  fix for #591874

Niels Thykier (4):
  Do not rely on $pkg/usr/share/doc being present in jh_depends
  Applied s/gcj/gcj-jdk/ from Doko's NMU
  Added support for -s/--same-arch in jh_lib
  Release 0.37 into unstable

---


hooks/post-receive
-- 
UNNAMED PROJECT

___
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#622141: tomcat-native: Using SSLv2_method

2011-07-06 Thread Niels Thykier
Hey,

Any updates on this?  I see it has been marked pending since April 13th
and upstream has not replied to it on the tracker.

~Niels




__
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#631048: FTBFS against iceweasel 4.0 or 5.0

2011-07-07 Thread Niels Thykier
On 2011-07-07 09:18, Mike Hommey wrote:
 On Thu, Jul 07, 2011 at 09:03:17AM +0200, أحمد المحمودي wrote:
 Hello,

 On Mon, Jul 04, 2011 at 11:51:33AM +0200, Mike Hommey wrote:
 I'm planning on a push to unstable of iceweasel/xulrunner 5.0 on the
 15th of July. Please update your packages by then.
 ---end quoted text---

   If upstream of SWT didn't fix the FTBFS against xulrunner2 by 15th of 
   July, then I will upload swt-gtk with the mozilla build disabled.
 
 As I understand it, swt-gtk uses webkit by default, now, so you should
 probably switch to webkit.
 
 Mike
 
 


From what I have heard, it does use webkit by default, but in 3.6 the
webkit setup had some issues (not sure here though).  I heard the 3.7
support should be better.

As for xulrunner 2.0 support, then I heard that is very unlikely.  For
the eclipse package I am definitely not expecting anything, especially
after I had a chat with a Fedora developer, who tried to do the actual
porting for Fedora.

~Niels




__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[SCM] UNNAMED PROJECT branch, jh-symbols, updated. 0.37-8-gc94a2bd

2011-07-16 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, jh-symbols has been updated
   via  c94a2bd76534fa0b718a762ce5196d98abb1bbd5 (commit)
   via  49dde5064b64d991fbeae0f4125d9c26b32d2824 (commit)
   via  0448c2b5417dbe401cf2a8db4e341837137f2698 (commit)
   via  5df7ff57bf0d547551af0c8b72d5950e75c49987 (commit)
   via  3d4f70184f999de6c3f9d7c2081d6af3158f7468 (commit)
   via  e811a2154dfcd85ce8c9ce93356dc4d9adf14712 (commit)
   via  c550f982f48c856a5b985e652eb963b0afcd41ca (commit)
   via  1557c4938ed019f03bf4c9d02d581f722be37916 (commit)
  from  33af870ae42bf1a5f0300e08ce93509782d45c21 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit c94a2bd76534fa0b718a762ce5196d98abb1bbd5
Author: Niels Thykier ni...@thykier.net
Date:   Sat Jul 16 16:38:57 2011 +0200

Refactored jh-symbol main and added prototype depends calculator

commit 49dde5064b64d991fbeae0f4125d9c26b32d2824
Merge: 33af870 0448c2b
Author: Niels Thykier ni...@thykier.net
Date:   Tue Jul 12 00:43:09 2011 +0200

Merge branch 'master' into jh-symbols

---

Summary of changes:
 debian/changelog   |   22 +++
 debian/control |2 +-
 jh_build   |4 +
 jh_classpath   |3 +-
 jh_depends |   14 ++-
 jh_exec|3 +-
 jh_installjavadoc  |3 +-
 jh_installlibs |3 +-
 jh_lib.sh.in   |2 +-
 jh_makepkg |1 +
 src/org/debian/javahelper/symbols/ISymbol.java |4 +
 src/org/debian/javahelper/symbols/Main.java|  158 ++--
 .../javahelper/symbols/cmd/DependencyProgram.java  |  102 +
 .../debian/javahelper/symbols/cmd/DiffProgram.java |  102 +
 .../javahelper/symbols/cmd/GenerateProgram.java|   41 +
 .../debian/javahelper/symbols/cmd/IProgram.java|   30 
 .../cmd/IllegalProgramArgumentsException.java  |   30 
 .../javahelper/symbols/internal/ClassSymbol.java   |6 +
 .../javahelper/symbols/internal/SimpleSymbol.java  |5 +
 19 files changed, 411 insertions(+), 124 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e6e267..90445f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+javatools (0.38) UNRELEASED; urgency=low
+
+  * Added missing empty line the in d/control generated by jh_makepkg
+
+ -- Niels Thykier ni...@thykier.net  Mon, 11 Jul 2011 15:20:40 +0200
+
+javatools (0.37) unstable; urgency=low
+
+  [ Niels Thykier ]
+  * Do not assume that $pkg/usr/share/doc is present when jh_depends
+runs.  (Closes: #632620)
+  * Applied changes from NMU.
+- depend on gcj-jdk rather than gcj for java-propose-classpath.
+  * Added support for -s/--same-arch in jh_lib and related shell
+scripts.  (Closes: #632619)
+
+  [ Matthew Johnson ]
+  * Default to -source 1.5 in jh_build unless specified in the extra
+args (Closes: #591874)
+
+ -- Niels Thykier ni...@thykier.net  Wed, 06 Jul 2011 14:53:12 +0200
+
 javatools (0.36) unstable; urgency=low
 
   * Made jh_manifest always follow symlinks - the fix for this in
diff --git a/debian/control b/debian/control
index c6f139e..0ebe6db 100644
--- a/debian/control
+++ b/debian/control
@@ -76,7 +76,7 @@ Description: Helper scripts for packaging Java programs
 
 Package: java-propose-classpath
 Architecture: all
-Depends: gcj, javahelper (= ${binary:Version}), fastjar, ${misc:Depends}
+Depends: gcj-jdk, javahelper (= ${binary:Version}), fastjar, ${misc:Depends}
 Description: Helper script to suggest a classpath for jar files
  java-propose-classpath analyzes a set of jar files and the installed
  jars on the system to suggest a correct classpath for use with
diff --git a/jh_build b/jh_build
index a024313..08da232 100755
--- a/jh_build
+++ b/jh_build
@@ -52,6 +52,10 @@ fi
 JH_JAVAC_OPTS=`getarg o javacopts`
 JH_JAVADOC_OPTS=`getarg O javadoc-opts`
 
+if ! grep -- -source  $JH_JAVAC_OPTS /dev/null; then
+   JH_JAVAC_OPTS=-source 1.5 $JH_JAVAC_OPTS
+fi
+
 function dobuild()
 {
 
diff --git a/jh_classpath b/jh_classpath
index 6dad090..3112d2b 100755
--- a/jh_classpath
+++ b/jh_classpath
@@ -12,6 +12,7 @@ syntax()
echo -e \t-V --version: show the version
echo -e \t-i --indep: act on all Arch: all packages
echo -e \t-a --arch: act on all Arch-specific packages
+   echo -e

[SCM] UNNAMED PROJECT branch, jh-symbols, updated. 0.37-9-g07f143f

2011-07-16 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, jh-symbols has been updated
   via  07f143fff0072e75d9e928b619d7c70a74d93d93 (commit)
  from  c94a2bd76534fa0b718a762ce5196d98abb1bbd5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 07f143fff0072e75d9e928b619d7c70a74d93d93
Author: Niels Thykier ni...@thykier.net
Date:   Sat Jul 16 16:43:55 2011 +0200

Resolved compiler issue (file not saved when committed)

---

Summary of changes:
 .../javahelper/symbols/cmd/DependencyProgram.java  |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/org/debian/javahelper/symbols/cmd/DependencyProgram.java 
b/src/org/debian/javahelper/symbols/cmd/DependencyProgram.java
index 6139299..afd2a35 100644
--- a/src/org/debian/javahelper/symbols/cmd/DependencyProgram.java
+++ b/src/org/debian/javahelper/symbols/cmd/DependencyProgram.java
@@ -59,11 +59,11 @@ public class DependencyProgram implements IProgram {
System.out.println(N: 
satisfied-class:  + clname);
}
} else {
-   String fn = s.getFullSymbolName():
-   if(neededSyms.remove(fn) != 
null){
-   System.out.println(N: 
found-symbol:  + fn);
-   neededVer = 
highest(neededVer, s.getVersion());
-   }
+   String fn = s.getFullSymbolName();
+   if(neededSyms.remove(fn) != null){
+   System.out.println(N: 
found-symbol:  + fn);
+   neededVer = highest(neededVer, 
s.getVersion());
+   }
}
}
if(neededVer != null) {


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, jh-symbols, updated. 0.37-11-g13798bc

2011-07-16 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, jh-symbols has been updated
   via  13798bcffea6a8fd35018b7e4d17995615da261b (commit)
   via  273be929892d99b17ad8097b13d9ca30b2f59abe (commit)
  from  07f143fff0072e75d9e928b619d7c70a74d93d93 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 13798bcffea6a8fd35018b7e4d17995615da261b
Merge: 273be92 07f143f
Author: Niels Thykier ni...@thykier.net
Date:   Sat Jul 16 16:48:26 2011 +0200

Merge branch 'jh-symbols' of ssh://git.debian.org/git/pkg-java/javatools 
into jh-symbols

commit 273be929892d99b17ad8097b13d9ca30b2f59abe
Author: Niels Thykier ni...@thykier.net
Date:   Sat Jul 16 16:43:55 2011 +0200

Resolved compiler issue (file not saved when committed)

---

Summary of changes:
 debian/rules |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/rules b/debian/rules
index 676f04d..b698909 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ jh_lib.sh: jh_lib.sh.in
 
 override_dh_auto_build: jh_lib.sh
mkdir tmp tmp.jarwrapper
-   ./jh_build --no-javadoc tmp/jh-symbols.jar src/
+   ./jh_build --main=org.debian.javahelper.symbols.Main --no-javadoc 
tmp/jh-symbols.jar src/
# javahelper pod-based manpages
$(POD2MAN) jh_installeclipse tmp/jh_installeclipse.1
$(POD2MAN) jh_generateorbitdir tmp/jh_generateorbitdir.1


hooks/post-receive
-- 
UNNAMED PROJECT

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] UNNAMED PROJECT branch, jh-symbols, updated. 0.37-12-gb852c25

2011-07-16 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, jh-symbols has been updated
   via  b852c25eb2f2d985a071d844b7bba66d3134b812 (commit)
  from  13798bcffea6a8fd35018b7e4d17995615da261b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit b852c25eb2f2d985a071d844b7bba66d3134b812
Author: Niels Thykier ni...@thykier.net
Date:   Sat Jul 16 17:49:46 2011 +0200

Use dpkg (where needed) to determine needed version

---

Summary of changes:
 src/org/debian/dpkg/internal/PollDpkg.java |   11 
 .../javahelper/symbols/cmd/DependencyProgram.java  |   52 
 2 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/src/org/debian/dpkg/internal/PollDpkg.java 
b/src/org/debian/dpkg/internal/PollDpkg.java
index fbcb765..a286be7 100644
--- a/src/org/debian/dpkg/internal/PollDpkg.java
+++ b/src/org/debian/dpkg/internal/PollDpkg.java
@@ -47,6 +47,17 @@ final public class PollDpkg {
return res;
}
 
+   public static int compareVersion(String v1, String op, String v2) 
throws IOException, InterruptedException{
+   ProcessBuilder b = new ProcessBuilder(new String[]{
+   dpkg,
+   --compare-versions,
+   v1,
+   op,
+   v2
+   });
+   Process p = b.start();
+   return p.waitFor();
+   }
 
 
public static final void main(String ... args) throws Exception{
diff --git a/src/org/debian/javahelper/symbols/cmd/DependencyProgram.java 
b/src/org/debian/javahelper/symbols/cmd/DependencyProgram.java
index afd2a35..6ba44a1 100644
--- a/src/org/debian/javahelper/symbols/cmd/DependencyProgram.java
+++ b/src/org/debian/javahelper/symbols/cmd/DependencyProgram.java
@@ -3,6 +3,7 @@ package org.debian.javahelper.symbols.cmd;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.debian.dpkg.internal.PollDpkg;
 import org.debian.javahelper.symbols.Factory;
 import org.debian.javahelper.symbols.IClassSymbol;
 import org.debian.javahelper.symbols.ILibrarySymbolData;
@@ -10,6 +11,8 @@ import org.debian.javahelper.symbols.ISymbol;
 
 public class DependencyProgram implements IProgram {
 
+   private static boolean doutput = true;
+
public int exec(String[] args) throws IllegalProgramArgumentsException, 
Exception {
Factory fac = Factory.newInstance();
ILibrarySymbolData usagedata = fac.createSymbolData();
@@ -27,7 +30,7 @@ public class DependencyProgram implements IProgram {
MapString, Boolean syms = new HashMapString, 
Boolean();
neededCl.put(cs.getClassName(), syms);
for(ISymbol c : cs.getSymbols()){
-   System.out.println(N: needs-symbol  + 
c.getFullSymbolName());
+   debug(N: needs-symbol  + 
c.getFullSymbolName());
syms.put(c.getName(), Boolean.TRUE);
}
} else {
@@ -36,6 +39,7 @@ public class DependencyProgram implements IProgram {
}
for( ; i  args.length ; i++){
ILibrarySymbolData prov = fac.createSymbolData();
+   MapString, Boolean vMap = new HashMapString, 
Boolean(); // version result cache
String neededVer = null;
prov.read(args[i]);
for(ISymbol s : prov.getSymbols()){
@@ -49,20 +53,23 @@ public class DependencyProgram implements IProgram {
cs = s.asClassSymbol();
for(ISymbol c : cs.getSymbols()){
if(nm.remove(c.getName()) != 
null){
-   System.out.println(N: 
found-class-symbol:  + c.getFullSymbolName());
-   neededVer = 
highest(neededVer, s.getVersion());
+   debug(N: 
found-class-symbol:  + c.getFullSymbolName());
+   neededVer = 
highest(vMap, neededVer, c.getVersion());
+   if(nm.size()  1) {
+   break

Bug#630631: Apparently the same issue

2011-07-21 Thread Niels Thykier
On 2011-07-20 19:44, Andrew Green wrote:
 Hi,
 
 I have a different, but also possibly related, problem with Eclipse
 packages from experimental. Though the package worked for a while, it is
 now unable to access the new p2 update sites (update sites that no
 longer support the old site.xml format, such as the Helios Discovery
 Site). Here is the error:
 
 [...]

Hi,

Could you double check you are not affected by #587657 ?  That bug is
the root of many weird and silent failures.

~Niels




__
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] r13887 - trunk/java-access-bridge/debian

2011-07-29 Thread Niels Thykier
Author: nthykier
Date: 2011-07-29 17:02:56 + (Fri, 29 Jul 2011)
New Revision: 13887

Modified:
   trunk/java-access-bridge/debian/changelog
   trunk/java-access-bridge/debian/compat
   trunk/java-access-bridge/debian/control
Log:
Removed JRE depends, bumped S-V and debheper, release to sid


Modified: trunk/java-access-bridge/debian/changelog
===
--- trunk/java-access-bridge/debian/changelog   2011-07-28 04:28:36 UTC (rev 
13886)
+++ trunk/java-access-bridge/debian/changelog   2011-07-29 17:02:56 UTC (rev 
13887)
@@ -1,3 +1,13 @@
+java-access-bridge (1.26.2-2) unstable; urgency=low
+
+  * Team upload.
+  * Remove unneeded dependency on JRE packages.
+(Closes: #587566, #600664)
+  * Bumped Standards-Versions to 3.9.2 - no changes required.
+  * Bumped debhelper compat to 8.
+
+ -- Niels Thykier ni...@thykier.net  Fri, 29 Jul 2011 18:51:38 +0200
+
 java-access-bridge (1.26.2-1) unstable; urgency=low
 
   * new upstream version

Modified: trunk/java-access-bridge/debian/compat
===
--- trunk/java-access-bridge/debian/compat  2011-07-28 04:28:36 UTC (rev 
13886)
+++ trunk/java-access-bridge/debian/compat  2011-07-29 17:02:56 UTC (rev 
13887)
@@ -1 +1 @@
-5
+8

Modified: trunk/java-access-bridge/debian/control
===
--- trunk/java-access-bridge/debian/control 2011-07-28 04:28:36 UTC (rev 
13886)
+++ trunk/java-access-bridge/debian/control 2011-07-29 17:02:56 UTC (rev 
13887)
@@ -3,15 +3,15 @@
 Priority: optional
 Maintainer: Debian Java maintainers 
pkg-java-maintainers@lists.alioth.debian.org
 Uploaders: Matthias Klose d...@ubuntu.com, Torsten Werner 
twer...@debian.org
-Build-Depends: cdbs, debhelper (= 5), autotools-dev, openjdk-6-jdk, gawk, 
pkg-config, libbonobo2-dev, libatspi-dev, at-spi (= 1.8), x11-utils
-Standards-Version: 3.8.1
+Build-Depends: cdbs, debhelper (= 8), autotools-dev, openjdk-6-jdk, gawk, 
pkg-config, libbonobo2-dev, libatspi-dev, at-spi (= 1.8), x11-utils
+Standards-Version: 3.9.2
 Homepage: http://live.gnome.org/Java%20Access%20Bridge
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/java-access-bridge
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/java-access-bridge/
 
 Package: libaccess-bridge-java
 Architecture: all
-Depends: default-jre-headless | openjdk-6-jre-headless | 
cacao-oj6-jre-headless, ${misc:Depends}
+Depends: ${misc:Depends}
 Recommends: libaccess-bridge-java-jni
 Description: Java Access Bridge for GNOME
  This module contains the Java Access Bridge for GNOME, 


___
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] r13888 - trunk/java-access-bridge/debian

2011-07-29 Thread Niels Thykier
Author: nthykier
Date: 2011-07-29 17:09:59 + (Fri, 29 Jul 2011)
New Revision: 13888

Modified:
   trunk/java-access-bridge/debian/changelog
Log:
Revert dist to UNRELEASED.

Modified: trunk/java-access-bridge/debian/changelog
===
--- trunk/java-access-bridge/debian/changelog   2011-07-29 17:02:56 UTC (rev 
13887)
+++ trunk/java-access-bridge/debian/changelog   2011-07-29 17:09:59 UTC (rev 
13888)
@@ -1,4 +1,4 @@
-java-access-bridge (1.26.2-2) unstable; urgency=low
+java-access-bridge (1.26.2-2) UNRELEASED; urgency=low
 
   * Team upload.
   * Remove unneeded dependency on JRE packages.


___
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] r13889 - trunk/java-access-bridge/debian

2011-07-29 Thread Niels Thykier
Author: nthykier
Date: 2011-07-29 17:22:21 + (Fri, 29 Jul 2011)
New Revision: 13889

Modified:
   trunk/java-access-bridge/debian/changelog
   trunk/java-access-bridge/debian/control
   trunk/java-access-bridge/debian/copyright
Log:
Added missing B-D and did minor clean up; release to sid

Modified: trunk/java-access-bridge/debian/changelog
===
--- trunk/java-access-bridge/debian/changelog   2011-07-29 17:09:59 UTC (rev 
13888)
+++ trunk/java-access-bridge/debian/changelog   2011-07-29 17:22:21 UTC (rev 
13889)
@@ -1,12 +1,17 @@
-java-access-bridge (1.26.2-2) UNRELEASED; urgency=low
+java-access-bridge (1.26.2-2) unstable; urgency=low
 
   * Team upload.
   * Remove unneeded dependency on JRE packages.
 (Closes: #587566, #600664)
   * Bumped Standards-Versions to 3.9.2 - no changes required.
   * Bumped debhelper compat to 8.
+  * Added B-D on libgtk2.0-dev to make it build.
+  * Used the public Vcs-Svn link that does not require an alioth
+account.
+  * Used © instead of (C) in the copyright file.
+  * Made the descriptions unique.
 
- -- Niels Thykier ni...@thykier.net  Fri, 29 Jul 2011 18:51:38 +0200
+ -- Niels Thykier ni...@thykier.net  Fri, 29 Jul 2011 19:19:07 +0200
 
 java-access-bridge (1.26.2-1) unstable; urgency=low
 

Modified: trunk/java-access-bridge/debian/control
===
--- trunk/java-access-bridge/debian/control 2011-07-29 17:09:59 UTC (rev 
13888)
+++ trunk/java-access-bridge/debian/control 2011-07-29 17:22:21 UTC (rev 
13889)
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Debian Java maintainers 
pkg-java-maintainers@lists.alioth.debian.org
 Uploaders: Matthias Klose d...@ubuntu.com, Torsten Werner 
twer...@debian.org
-Build-Depends: cdbs, debhelper (= 8), autotools-dev, openjdk-6-jdk, gawk, 
pkg-config, libbonobo2-dev, libatspi-dev, at-spi (= 1.8), x11-utils
+Build-Depends: cdbs, debhelper (= 8), autotools-dev, openjdk-6-jdk, gawk, 
pkg-config, libbonobo2-dev, libatspi-dev, at-spi (= 1.8), x11-utils, 
libgtk2.0-dev
 Standards-Version: 3.9.2
 Homepage: http://live.gnome.org/Java%20Access%20Bridge
-Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/java-access-bridge
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java-access-bridge
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/java-access-bridge/
 
 Package: libaccess-bridge-java
@@ -29,3 +29,6 @@
  Java Swing apps to the GNOME Accessibility framework,
  specifically the Assistive Technology Service Provider
  Interface (AT-SPI).
+ .
+ This package contains the JNI bindings.
+

Modified: trunk/java-access-bridge/debian/copyright
===
--- trunk/java-access-bridge/debian/copyright   2011-07-29 17:09:59 UTC (rev 
13888)
+++ trunk/java-access-bridge/debian/copyright   2011-07-29 17:22:21 UTC (rev 
13889)
@@ -30,5 +30,5 @@
   Java Access Bridge is licensed under the LGPL v2.
   See `/usr/share/common-licenses/LGPL-2'.
 
-The Debian packaging is (C) 2008, Canonical Ltd and
+The Debian packaging is © 2008, Canonical Ltd and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] UNNAMED PROJECT branch, jh-symbols, updated. 0.37-13-g915286c

2011-07-30 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, jh-symbols has been updated
   via  915286c76e5cdb49983049fbc4bbdb50ff0a30f0 (commit)
  from  b852c25eb2f2d985a071d844b7bba66d3134b812 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 915286c76e5cdb49983049fbc4bbdb50ff0a30f0
Author: Niels Thykier ni...@thykier.net
Date:   Sat Jul 30 12:19:57 2011 +0200

Check base classes and interfaces for missing symbols

---

Summary of changes:
 .../javahelper/symbols/cmd/DependencyProgram.java  |   58 +---
 1 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/src/org/debian/javahelper/symbols/cmd/DependencyProgram.java 
b/src/org/debian/javahelper/symbols/cmd/DependencyProgram.java
index 6ba44a1..caecb00 100644
--- a/src/org/debian/javahelper/symbols/cmd/DependencyProgram.java
+++ b/src/org/debian/javahelper/symbols/cmd/DependencyProgram.java
@@ -51,19 +51,46 @@ public class DependencyProgram implements IProgram {
continue;
}
cs = s.asClassSymbol();
-   for(ISymbol c : cs.getSymbols()){
-   if(nm.remove(c.getName()) != 
null){
-   debug(N: 
found-class-symbol:  + c.getFullSymbolName());
-   neededVer = 
highest(vMap, neededVer, c.getVersion());
-   if(nm.size()  1) {
-   break;
-   }
-   }
-   }
+   neededVer = updateNeededSymbols(cs, nm, 
vMap, neededVer);
if(nm.size()  1) {
neededVer = highest(vMap, 
neededVer, cs.getVersion());
neededCl.remove(clname);
debug(N: satisfied-class:  + 
clname);
+   } else {
+   // We still need symbols for 
this class...
+   // Most likely they will be 
provided by the parent, so lets check
+   String pcl = 
cs.getParentClassName();
+   ISymbol cparent = 
prov.getSymbol(pcl);
+   IClassSymbol csp;
+   for( ; cparent != null ; 
cparent = prov.getSymbol(pcl)){
+   
if(!cparent.isClassSymbol() || cparent.getClassName().startsWith(java/lang/)){
+   break;
+   }
+   csp = 
cparent.asClassSymbol();
+   pcl = 
csp.getParentClassName();
+   neededVer = 
updateNeededSymbols(csp, nm, vMap, neededVer);
+   }
+   if(nm.size()  1) {
+   neededVer = 
highest(vMap, neededVer, cs.getVersion());
+   neededCl.remove(clname);
+   debug(N: 
satisfied-class (via base-class):  + clname);
+   } else {
+   // Check interfaces
+   for(String it : 
cs.getImplementedInterfaceNames()){
+   ISymbol isym = 
prov.getSymbol(it);
+   IClassSymbol 
clsym;
+   if(isym == null 
|| !isym.isClassSymbol() || it.startsWith(java/lang/)){
+   
continue;
+   }
+   clsym

[SCM] UNNAMED PROJECT branch, jh-symbols, updated. 0.37-14-gaee9aff

2011-07-30 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project UNNAMED PROJECT.

The branch, jh-symbols has been updated
   via  aee9affacf59954d6759233cd4dfc7ac151a1fd4 (commit)
  from  915286c76e5cdb49983049fbc4bbdb50ff0a30f0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit aee9affacf59954d6759233cd4dfc7ac151a1fd4
Author: Niels Thykier ni...@thykier.net
Date:   Sat Jul 30 12:26:05 2011 +0200

Optimize {is,as}ClassSymbol for ClassSymbol

---

Summary of changes:
 .../javahelper/symbols/internal/ClassSymbol.java   |   13 +
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/org/debian/javahelper/symbols/internal/ClassSymbol.java 
b/src/org/debian/javahelper/symbols/internal/ClassSymbol.java
index bdcf22b..bad90f9 100644
--- a/src/org/debian/javahelper/symbols/internal/ClassSymbol.java
+++ b/src/org/debian/javahelper/symbols/internal/ClassSymbol.java
@@ -73,4 +73,17 @@ public class ClassSymbol extends SimpleSymbol implements 
IClassSymbol {
public ListString getImplementedInterfaceNames() {
return interfaces;
}
+
+
+   @Override
+   public boolean isClassSymbol() {
+   return true;
+   }
+
+
+   @Override
+   public IClassSymbol asClassSymbol() {
+   return this;
+   }
+
 }


hooks/post-receive
-- 
UNNAMED PROJECT

___
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] r13897 - trunk/tomcat6/debian

2011-07-30 Thread Niels Thykier
Author: nthykier
Date: 2011-07-30 13:40:58 + (Sat, 30 Jul 2011)
New Revision: 13897

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/control
Log:
Removed myself from Uploaders

Modified: trunk/tomcat6/debian/changelog
===
--- trunk/tomcat6/debian/changelog  2011-07-30 12:47:21 UTC (rev 13896)
+++ trunk/tomcat6/debian/changelog  2011-07-30 13:40:58 UTC (rev 13897)
@@ -1,9 +1,13 @@
 tomcat6 (6.0.32-6) UNRELEASED; urgency=low
 
+  [ Tony Mancill ]
   * Team upload.
   * Update Korean debconf translation.  (Closes: #630950, 631482)
 Thanks to si-cheol Ko.
 
+  [ Niels Thykier ]
+  * Removed myself from uploaders.
+
  -- tony mancill tmanc...@debian.org  Thu, 21 Jul 2011 22:12:15 -0700
 
 tomcat6 (6.0.32-5) unstable; urgency=low

Modified: trunk/tomcat6/debian/control
===
--- trunk/tomcat6/debian/control2011-07-30 12:47:21 UTC (rev 13896)
+++ trunk/tomcat6/debian/control2011-07-30 13:40:58 UTC (rev 13897)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
 Uploaders: Torsten Werner twer...@debian.org,
  Ludovic Claude ludovic.cla...@laposte.net, Michael Koch konque...@gmx.de,
- Damien Raude-Morvan draz...@debian.org, Niels Thykier ni...@thykier.net
+ Damien Raude-Morvan draz...@debian.org
 Build-Depends: default-jdk, ant-optional, debhelper (= 7), po-debconf
 Build-Depends-Indep: maven-repo-helper ( 1.0.1), libecj-java
 Standards-Version: 3.9.2


___
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] r13911 - in trunk/lucene2/debian: . patches

2011-08-03 Thread Niels Thykier
Author: nthykier
Date: 2011-08-03 10:49:15 + (Wed, 03 Aug 2011)
New Revision: 13911

Modified:
   trunk/lucene2/debian/changelog
   trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.dpatch
Log:
Fixed the Bundle-SymbolicName of lucene-core.jar

Modified: trunk/lucene2/debian/changelog
===
--- trunk/lucene2/debian/changelog  2011-08-03 05:46:26 UTC (rev 13910)
+++ trunk/lucene2/debian/changelog  2011-08-03 10:49:15 UTC (rev 13911)
@@ -1,3 +1,11 @@
+lucene2 (2.9.4+ds1-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Fixed the Bundle-SymbolicName of the lucene-core.jar.
+(Closes: 631235)
+
+ -- Niels Thykier ni...@thykier.net  Wed, 03 Aug 2011 12:42:12 +0200
+
 lucene2 (2.9.4+ds1-2) unstable; urgency=low
 
   * Team upload.

Modified: trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.dpatch
===
--- trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.dpatch   
2011-08-03 05:46:26 UTC (rev 13910)
+++ trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.dpatch   
2011-08-03 10:49:15 UTC (rev 13911)
@@ -12,7 +12,7 @@
  
property name=junit.includes value=**/Test*.java/
  
-+  property name=OSGi.symbolicname value=org.apache.lucene /
++  property name=OSGi.symbolicname value=org.apache.lucene.core /
 +  pathconvert property=OSGi.exportpackage pathsep=,
 +dirset dir=src/java excludes=org org/apache/
 +mapper
@@ -145,7 +145,7 @@
 +  !-- these can be overridden in the separate contrib
 +   build.xml files -- 
 +  property name=OSGi.requirebundle
-+
value='org.apache.lucene;bundle-version=${version};visibility:=reexport' /
++
value='org.apache.lucene.core;bundle-version=${version};visibility:=reexport' 
/
 +  property name=OSGi.symbolicname 
value=org.apache.lucene.${ant.project.name} /
 +  pathconvert property=OSGi.exportpackage pathsep=,
 +dirset dir=src/java excludes=org org/apache org/apache/lucene/


___
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#636491: asm3: Please upgrade to 3.3.1

2011-08-03 Thread Niels Thykier
Package: asm3
Severity: wishlist

See subject



__
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] r13915 - trunk/lucene2/debian

2011-08-03 Thread Niels Thykier
Author: nthykier
Date: 2011-08-03 13:04:32 + (Wed, 03 Aug 2011)
New Revision: 13915

Modified:
   trunk/lucene2/debian/changelog
   trunk/lucene2/debian/control
   trunk/lucene2/debian/docs
Log:
Drop JRE depends, do not install CHANGES.txt (dup) and bumped S-V

Modified: trunk/lucene2/debian/changelog
===
--- trunk/lucene2/debian/changelog  2011-08-03 12:13:27 UTC (rev 13914)
+++ trunk/lucene2/debian/changelog  2011-08-03 13:04:32 UTC (rev 13915)
@@ -3,6 +3,10 @@
   * Team upload.
   * Fixed the Bundle-SymbolicName of the lucene-core.jar.
 (Closes: 631235)
+  * Dropped JRE dependencies - no longer required by the Java Policy.
+  * Do not install CHANGES.txt - dh_installchangelogs already installs
+this as the upstream changelog.
+  * Bumped Standards-Version to 3.9.2 - no changes required.
 
  -- Niels Thykier ni...@thykier.net  Wed, 03 Aug 2011 12:42:12 +0200
 

Modified: trunk/lucene2/debian/control
===
--- trunk/lucene2/debian/control2011-08-03 12:13:27 UTC (rev 13914)
+++ trunk/lucene2/debian/control2011-08-03 13:04:32 UTC (rev 13915)
@@ -22,12 +22,11 @@
  libcommons-compress-java (= 1.0),
  libicu4j-java (= 3.8.1),
  libjtidy-java (= 7+svn20070309)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 
 Package: liblucene2-java
 Architecture: all
 Depends: ${misc:Depends},
- openjdk-6-jre-headless | java5-runtime-headless,
 Recommends: libcommons-beanutils-java (= 1.7.0),
  libcommons-collections3-java (= 3.1), 
  libcommons-compress-java (= 1.0),

Modified: trunk/lucene2/debian/docs
===
--- trunk/lucene2/debian/docs   2011-08-03 12:13:27 UTC (rev 13914)
+++ trunk/lucene2/debian/docs   2011-08-03 13:04:32 UTC (rev 13915)
@@ -1,4 +1,3 @@
 BUILD.txt
-CHANGES.txt
 NOTICE.txt
 README.txt


___
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] r13916 - trunk/lucene2/debian

2011-08-03 Thread Niels Thykier
Author: nthykier
Date: 2011-08-03 13:06:24 + (Wed, 03 Aug 2011)
New Revision: 13916

Modified:
   trunk/lucene2/debian/changelog
   trunk/lucene2/debian/control
Log:
Release to experimental

Modified: trunk/lucene2/debian/changelog
===
--- trunk/lucene2/debian/changelog  2011-08-03 13:04:32 UTC (rev 13915)
+++ trunk/lucene2/debian/changelog  2011-08-03 13:06:24 UTC (rev 13916)
@@ -1,6 +1,7 @@
-lucene2 (2.9.4+ds1-3) UNRELEASED; urgency=low
+lucene2 (2.9.4+ds1-3) experimental; urgency=low
 
   * Team upload.
+- Upload to experimental to avoid breaking eclipse in sid.
   * Fixed the Bundle-SymbolicName of the lucene-core.jar.
 (Closes: 631235)
   * Dropped JRE dependencies - no longer required by the Java Policy.

Modified: trunk/lucene2/debian/control
===
--- trunk/lucene2/debian/control2011-08-03 13:04:32 UTC (rev 13915)
+++ trunk/lucene2/debian/control2011-08-03 13:06:24 UTC (rev 13916)
@@ -38,7 +38,7 @@
  libjline-java (= 0.9.5), 
  libjtidy-java (= 7+svn20070309),
  libregexp-java (= 1.4)
-Breaks: solr-common ( 1.2.0+ds2-3), eclipse-platform (= 3.5.2-6)
+Breaks: solr-common ( 1.2.0+ds2-3), eclipse-platform (= 3.5.2-11)
 Description: Full-text search engine library for Java(TM)
  Lucene is a full-text search engine for the Java(TM) programming language.
  Lucene is not a complete application, but rather a code library and API


___
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] r13917 - trunk/asm3/debian

2011-08-03 Thread Niels Thykier
Author: nthykier
Date: 2011-08-03 15:40:57 + (Wed, 03 Aug 2011)
New Revision: 13917

Modified:
   trunk/asm3/debian/changelog
   trunk/asm3/debian/compat
   trunk/asm3/debian/control
   trunk/asm3/debian/copyright
   trunk/asm3/debian/rules
Log:
Imported Paul Tagliamonte changes.

Modified: trunk/asm3/debian/changelog
===
--- trunk/asm3/debian/changelog 2011-08-03 13:06:24 UTC (rev 13916)
+++ trunk/asm3/debian/changelog 2011-08-03 15:40:57 UTC (rev 13917)
@@ -1,3 +1,17 @@
+asm3 (3.3.1-1) unstable; urgency=low
+
+  [ Paul Tagliamonte ]
+  * Team upload.
+  * Bumped Standards-Version to 3.9.2, no changes required.
+  * Changed debian/copyright to use DEP5, this should get rid of
+the two existing lintian warnings about copyright.
+
+  [ Niels Thykier ]
+  * Bumped debhelper compat to 7.
+  * Updated clean target to clean up after the maven helpers.
+
+ -- Paul Tagliamonte paul...@ubuntu.com  Wed, 03 Aug 2011 15:07:14 +
+
 asm3 (3.2-4) unstable; urgency=low
 
   * Removed Barry Hawkins from Uploaders; Thanks for your work

Modified: trunk/asm3/debian/compat
===
--- trunk/asm3/debian/compat2011-08-03 13:06:24 UTC (rev 13916)
+++ trunk/asm3/debian/compat2011-08-03 15:40:57 UTC (rev 13917)
@@ -1 +1 @@
-5
+7

Modified: trunk/asm3/debian/control
===
--- trunk/asm3/debian/control   2011-08-03 13:06:24 UTC (rev 13916)
+++ trunk/asm3/debian/control   2011-08-03 15:40:57 UTC (rev 13917)
@@ -6,7 +6,7 @@
  Niels Thykier ni...@thykier.net
 Build-Depends: debhelper (= 7), cdbs, default-jdk
 Build-Depends-Indep: maven-repo-helper, ant (= 1.6.5), 
libow-util-ant-tasks-java (= 1.3-2), javahelper
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/asm3
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/asm3
 Homepage: http://asm.objectweb.org/

Modified: trunk/asm3/debian/copyright
===
--- trunk/asm3/debian/copyright 2011-08-03 13:06:24 UTC (rev 13916)
+++ trunk/asm3/debian/copyright 2011-08-03 15:40:57 UTC (rev 13917)
@@ -1,28 +1,57 @@
-This package was debianized by Marcus Crafter craft...@debian.org on
-Fri, 27 Aug 2004 19:08:25 +0200.
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=filerev=135 
+Name: asm
+Source: http://download.forge.objectweb.org/asm/
 
-It was downloaded from http://asm.objectweb.org/
+Files: *
+Copyright: 2004-2008 Eric Bruneton, Eugene Kuleshov
+License: BSD
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+  3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+  .
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+  THE POSSIBILITY OF SUCH DAMAGE.
 
-Upstream Authors: Eric Bruneton, Eugene Kuleshov
-
-Copyright: (c) 2004-2008 Eric Bruneton, Eugene Kuleshov
-
-License:
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the University nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific

[pkg-java] r13918 - tags/asm3

2011-08-03 Thread Niels Thykier
Author: nthykier
Date: 2011-08-03 15:48:24 + (Wed, 03 Aug 2011)
New Revision: 13918

Added:
   tags/asm3/3.3.1-1/
Log:
Tag for 3.3.1-1 upload


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.6.2-exp-1-36-ga0e4dd8

2011-08-05 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project eclipse - Powerful IDE written in java - Debian package..

The branch, master has been updated
   via  a0e4dd838020f90fc20885e16ec1423b33f2644f (commit)
  from  47db9ac472245e5155af8f9a82db4074f59fe47c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit a0e4dd838020f90fc20885e16ec1423b33f2644f
Author: Niels Thykier ni...@thykier.net
Date:   Fri Aug 5 13:07:16 2011 +0200

Updated the basic control files to 3.7

Patches have *not* been refreshed and this update is based on
builds without using the patches from d/patches.

---

Summary of changes:
 debian/changelog |6 +-
 debian/control   |6 +-
 debian/eclipse-jdt.install   |   66 ---
 debian/eclipse-pde.install   |  207 --
 debian/eclipse-platform-data.install |  106 +-
 debian/eclipse-platform.install  |   13 +--
 debian/eclipse-plugin-cvs.install|6 -
 debian/eclipse-rcp.install   |   25 
 debian/extra/eclipse |2 -
 debian/libequinox-osgi-java.install  |3 -
 debian/rules |   43 ++-
 11 files changed, 221 insertions(+), 262 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 499d0f8..5fd3152 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-eclipse (3.6.2~exp-2) UNRELEASED; urgency=low
+eclipse (3.7~exp-1) UNRELEASED; urgency=low
 
+  [ Andres Mejia ]
   * Update to my @debian.org email.
 
+  [ Niels Thykier ]
+  * New upstream release.
+
  -- Andres Mejia ame...@debian.org  Sun, 17 Jul 2011 13:23:24 -0400
 
 eclipse (3.6.2~exp-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 46e18cc..3d50a25 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Build-Depends: ant (= 1.8.2),
libgnomeui-dev,
libgtk2.0-dev,
libhamcrest-java (= 1.1-8~),
-   libicu4j-4.2-java (= 4.2),
+   libicu4j-4.4-java (= 4.4.2),
libjasper-java,
libjetty-java (= 6.1.24-4~),
libjsch-java (= 0.1.37-3),
@@ -41,10 +41,10 @@ Build-Depends: ant (= 1.8.2),
maven-ant-helper,
maven-repo-helper,
pkg-config,
+   rsync,
sat4j (= 2.2.3),
sat4j ( 2.2.4),
unzip,
-   xulrunner-dev (= 1.9.1.3-2),
zip
 Standards-Version: 3.9.2
 DM-Upload-Allowed: yes
@@ -213,7 +213,7 @@ Package: eclipse-rcp
 Architecture: any
 Depends: default-jre | java5-runtime | java6-runtime,
  libequinox-osgi-java (= ${source:Version}),
- libicu4j-4.2-java (= 4.2),
+ libicu4j-4.4-java (= 4.4.2),
  ${misc:Depends},
  ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}
diff --git a/debian/eclipse-jdt.install b/debian/eclipse-jdt.install
index c7a2250..b22eb00 100644
--- a/debian/eclipse-jdt.install
+++ b/debian/eclipse-jdt.install
@@ -1,41 +1,25 @@
-usr/*/eclipse/features/org.eclipse.jdt.source_*
-usr/*/eclipse/features/org.eclipse.jdt_*
-usr/lib/eclipse/plugins/junit4.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.apt.core.source_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.apt.core_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.apt.pluggable.core.source_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.apt.pluggable.core_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.apt.ui.source_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.apt.ui_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.compiler.apt.source_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.compiler.apt_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.compiler.tool.source_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.compiler.tool_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.core.manipulation.source_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.core.manipulation_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.core.source_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.core_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.debug.source_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.debug.ui.source_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.debug.ui_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.debug_*
-usr/lib/eclipse/plugins/org.eclipse.jdt.doc.isv_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.doc.user_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.junit.core.source_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jdt.junit.core_*.jar
-usr/lib/eclipse/plugins

Bug#631061: Update on eclipse 3.7

2011-08-05 Thread Niels Thykier
Hi

This email is BCC'ed to #631061 and #631382; please consider following
up to d-java@l.d.o as it makes coordination easier.

I have managed to successfully compile eclipse 3.7 using part of the
debian packaging I just pushed to the git repository[1].  There are at
least six issues atm.

  First off, my build did not use any of the patches in d/patches.
Hopefully it means most of them are redundant, but more likely it means
something will break.
  Note: Some of these patches may require
eclipse-build-generatedScripts.tar.bz2 to be updated.  If the build
fails horribly after applying a refreshed patch due to missing classes
or cannot find package, you probably hit one of those cases.

  Secondly, upstream commented out a couple of architecture support
patches in the upstream build.xml.  As I recall the argument was they
did not apply cleanly, so they need to be refreshed as well.

  Third, the eclipse-build-generatedScripts.tar.bz2 in the upstream
git does not work for us.  I have deviced a functional version for
Debian at [2].

  Four, there are some zip/pre-compiled crap in the upstream sources we
need to get removed.  Most of it will probably be fixed with refreshing
the Debian patches and just removing the left overs, but we need to
double check this.

  Five, we need some upstream tarballs (my builds were done with -b).
But we generally need to deal with item four first.

  Six, the upstream branch (merged into master as well) is some older
version of eclipse (I think 3.6.2, but I could be wrong).  This is
trivially fixable once we got some clean tarballs from item five.

If you would like to help with any of those, feel free to claim a task
and work on it.  Alternatively, there are some upstream bugs that we
could really benefit from, if they were fixed (see [3] for more info).

Caveat: If you work on any of these tasks, you must be ready to send a
patch upstream.  Upstream only accepts patches from the original author
and only via their BTS.  It is a part of their IP Cleanness strategy
and they do not make exceptions!


Getting some working sources:

 $ # Fetch eclipse-3.7.0-src.tar.bz2 from
http://download.eclipse.org/technology/linuxtools/eclipse-build/3.7.x_Indigo/
 $ git clone git://anonscm.debian.org/pkg-java/eclipse.git
 $ tar xjf eclipse-3.7.0-src.tar.bz2
 $ git clone \
http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/
e-b
 $ cd e-b/eclipse-build
 $ ln -s ../eclipse-build-config .
 $ ln -s ../eclipse-build-feature .
 $ mv ../../eclipse-3.7.0-src eclipse
 $ cp -r ../../eclipse/debian/ .
 $ # install B-D from d/control and dpkg-buildpackage -us -uc -b
   # should work up to dh_install that will fail due to a missing
   # manpage carried on one of our patches.

Help is much appreciated and questions are welcome, happy hacking.
~Niels

[1] http://git.debian.org/?p=pkg-java/eclipse.git;a=summary
 master branch

[2]
http://people.debian.org/~nthykier/eclipse-build-generatedScripts.tar.bz2

[3] Upstream bugs that needs fixing (eclipse 3.7):
 - Better support for shared read-only installs (#587657)
   - https://bugs.eclipse.org/bugs/show_bug.cgi?id=351485
   - This bug is really a pain; cost two t-p-u for Squeeze
 - Default update site list blank in shared install
   - https://bugs.eclipse.org/bugs/show_bug.cgi?id=249133
   - patches welcome (see comment #25)




__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.


[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.6.2-exp-1-37-g893b82b

2011-08-05 Thread Niels Thykier
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project eclipse - Powerful IDE written in java - Debian package..

The branch, master has been updated
   via  893b82b64c903270bcadab7528685e3e9e1146f1 (commit)
  from  a0e4dd838020f90fc20885e16ec1423b33f2644f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit 893b82b64c903270bcadab7528685e3e9e1146f1
Author: Niels Thykier ni...@thykier.net
Date:   Fri Aug 5 17:03:01 2011 +0200

Fixed the version constrains for sat4j

---

Summary of changes:
 debian/control |8 
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 3d50a25..aa85719 100644
--- a/debian/control
+++ b/debian/control
@@ -42,8 +42,8 @@ Build-Depends: ant (= 1.8.2),
maven-repo-helper,
pkg-config,
rsync,
-   sat4j (= 2.2.3),
-   sat4j ( 2.2.4),
+   sat4j (= 2.3.0),
+   sat4j ( 2.4.0),
unzip,
zip
 Standards-Version: 3.9.2
@@ -134,8 +134,8 @@ Depends: ant (= 1.8.2),
  liblucene2-java (= 2.9.4+ds1),
  liblucene2-java ( 2.9.5),
  libservlet2.5-java (= 6.0.20-8),
- sat4j (= 2.2.3),
- sat4j ( 2.2.4),
+ sat4j (= 2.3.0),
+ sat4j ( 2.4.0),
  ${misc:Depends},
  ${perl:Depends},
  ${shlibs:Depends}


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


  1   2   3   4   5   6   7   8   9   10   >