Re: Bug#703376: javahelper: Remove Maven support from jh_makepkg

2013-04-10 Thread Matthew Johnson
On Tue Apr 09 18:00, Thomas Koch wrote:
 Niels Thykier:
I am planning on a rewrite of jh_makepkg and have therefore not
  applied your patch as-is.
 
 I wasn't aware (forgot) about jh_makepkg and just had a look at it. I don't 
 think we should have 2 dh-make-* style programs in the java team: jh_makepkg 
 and mh_make. It's already enough logic duplication between dh-make, dh-make-
 perl, dh-make-php, dh-make-drupal, gem2deb, python-stdeb, haskell-devscripts, 

Well, mh_make just does maven packages, whereas jh_makepkg (was intended) to
cover all the common options. Perhaps they should be merged, but that's up to
the mh folks. Only having mh_make would be sad, I think.

Matt


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

Bug#634089: jh_manifest causes CRC error

2012-01-07 Thread Matthew Johnson
On Fri Jan 06 13:26, tony mancill wrote:
 Thank you for in-depth look into this bug.  Niels or Matthew, any
 concerns with me preparing an upload?

Go right ahead

Thanks,
Matt

 
 Thanks,
 tony
 
 On 01/05/2012 08:14 PM, Wookey wrote:
  
  This seems to me to be a serious problem blocking all
  java-helper-using packages
  
  So, I took a look at what's going on and found the following:
 
 --snip--
 
  We can fix it by explicitly removing and recreating it:
  
  verbose_print(Updating manifest in $jar);
  $zip-removeMember( 'META-INF/MANIFEST.MF' ) unless($new_manifest);
  $zip-removeMember( 'META-INF/' );
  $mem = $zip-addString($var, 'META-INF/MANIFEST.MF');
  $mem-desiredCompressionMethod(COMPRESSION_DEFLATED);
  $zip-addDirectory( 'META-INF/' );
  # This on the other hand may fail.
  $zip-overwrite() == AZ_OK or error(Writing modified jar ($jar) 
  failed$
  
  which I hope is an acceptable fix. Patch attached.
 




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

Bug#646514: javahelper: jh_repack fails if folders *.jar exist

2011-10-25 Thread Matthew Johnson
On Mon Oct 24 18:46, Andrew Ross wrote:
 
 If a package contains folders whose names match *.jar then jh_repack 
 fails with messages like:
 
 rm: cannot remove `./branding/core/core.jar': Is a directory
 
 The find command should probably be changed to:
 find . -name '*.jar' -type f -print0 | xargs -0 rm -f

I was not expecting anyone to have directories named like that. 

Fair enough, that seems like a sensible change.

Matt


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

[pkg-java] r14934 - trunk

2011-09-17 Thread Matthew Johnson
Author: mjj29
Date: 2011-09-17 12:48:06 + (Sat, 17 Sep 2011)
New Revision: 14934

Added:
   trunk/dbus-java/
Log:
importing dbus-java to be team maintained from pkg-utopia


___
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.31-52-g3ad7d7d

2011-03-12 Thread Matthew Johnson
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  3ad7d7d333a75fbd9d2cb5777931be7577a541b4 (commit)
  from  1e79735d17cb82eafce05161ea56e0f52a1a95fe (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 3ad7d7d333a75fbd9d2cb5777931be7577a541b4
Author: Matthew Johnson mj...@debian.org
Date:   Sat Mar 12 12:58:18 2011 +

support epochs in version mangling as well

---

Summary of changes:
 jh_installlibs |8 +---
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/jh_installlibs b/jh_installlibs
index 251d7ff..6bfd697 100755
--- a/jh_installlibs
+++ b/jh_installlibs
@@ -27,13 +27,7 @@ ARGS=i indep s arch p package P tmpdir v verbose n no-act 
no-mangle upstream-ve
 dh_testdir
 
 FULL_VERSION=`dpkg-parsechangelog  | sed -n '/^Version:/s/^[^:]*: 
\(.*\)$/\1/p'`
-if echo $FULL_VERSION | grep -q -e - ; then
-# version from non-native package
-VERSION=$(echo $FULL_VERSION | sed -n 's/\(.*\)-[^-]*/\1/p')
-else
-# version from native package
-VERSION=$FULL_VERSION
-fi
+VERSION=`echo $FULL_VERSION | sed -n 's/\(.*:\)\?\([^-]*\)\(-.*\)\?/\2/p' `
 VERBOSE=`getarg v verbose`
 DEFAULT_VERSION_MANGLE=.dfsg[0-9]*$
 


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-53-gcca8559

2011-03-12 Thread Matthew Johnson
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  cca85591cfe04e192b5dfd99f683868da0681abc (commit)
  from  3ad7d7d333a75fbd9d2cb5777931be7577a541b4 (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 cca85591cfe04e192b5dfd99f683868da0681abc
Author: Matthew Johnson mj...@debian.org
Date:   Sat Mar 12 13:03:46 2011 +

changelog

---

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

diff --git a/debian/changelog b/debian/changelog
index 0eaa785..8d2927f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 javatools (0.33) unreleased; urgency=low
 
   [ Matthew Johnson ]
-  * fixed some bugs in jh_makepkg (Closes: #593351)
+  * 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.
@@ -20,7 +21,7 @@ javatools (0.33) unreleased; urgency=low
 silently ignored.
   * Added missing B-D-I on perl (for pod2man).
 
- -- Matthew Johnson mj...@debian.org  Sun, 05 Sep 2010 15:56:31 +
+ -- Matthew Johnson mj...@debian.org  Sat, 12 Mar 2011 12:58:50 +
 
 javatools (0.32) 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 branch, master, updated. 0.30-49-ge42fa2b

2010-09-05 Thread Matthew Johnson
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  e42fa2b50a6d29eabfbddbb083cd6084f3b1f1b1 (commit)
  from  ec6b50d93e75ab57d87ae19c83c44d4f9a0cb88d (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 e42fa2b50a6d29eabfbddbb083cd6084f3b1f1b1
Author: Matthew Johnson mj...@debian.org
Date:   Sun Sep 5 15:57:28 2010 +

fix some bugs in jh_makepkg (Closes: #593351)

---

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

diff --git a/debian/changelog b/debian/changelog
index d5ec24b..81939e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+javatools (0.33) unreleased; urgency=low
+
+  * fixed some bugs in jh_makepkg (Closes: #593351)
+
+ -- Matthew Johnson mj...@debian.org  Sun, 05 Sep 2010 15:56:31 +
+
 javatools (0.32) unstable; urgency=low
 
   [ Niels Thykier ]
diff --git a/jh_makepkg b/jh_makepkg
index 1f96f5a..b7fd810 100755
--- a/jh_makepkg
+++ b/jh_makepkg
@@ -45,7 +45,7 @@ syntax()
exit 1
 }
 
-ARGS=p package m maintainer e email v upstream l library a app t ant k 
makefile n none 5 sun5 6 sun6 g gcj o openjdk M maven parseargs $@
+ARGS=p package m maintainer e email v upstream l library a app t ant k 
makefile n none 5 sun5 6 sun6 g gcj o openjdk M maven d default parseargs $@
 
 BUILDDIR=`pwd`
 
@@ -113,7 +113,7 @@ if [ -z $DEBEMAIL ]; then
 fi
 
 if [ -n `getarg m maintainer` ]; then
-   DEBEMAIL=`getarg m maintainer`
+   DEBFULLNAME=`getarg m maintainer`
 fi
 
 if [ -z $DEBFULLNAME ]; then 
@@ -330,7 +330,7 @@ END
 
 echo $COMPAT  debian/compat
 
-EDITOR=true dch --create --package $SRCPACKAGE --newversion ${VERSION}-1 
--distribution unstable --urgency low 
+EDITOR=true DEBFULLNAME=$DEBFULLNAME DEBEMAIL=$DEBEMAIL dch --create 
--package $SRCPACKAGE --newversion ${VERSION}-1 --distribution unstable 
--urgency low 
 
 cat  debian/rules END
 #!/usr/bin/make -f


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#593351: Fixed in git

2010-09-05 Thread Matthew Johnson
tags 593351 pending
thanks

Will be in 0.33

Matt


signature.asc
Description: Digital 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.30-48-gec6b50d

2010-08-08 Thread Matthew Johnson
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  ec6b50d93e75ab57d87ae19c83c44d4f9a0cb88d (commit)
   via  4ae601d5761cc73994cca084096f748f7b7508bc (commit)
   via  9d9df42726c0709455b9e20b213443cd5e0dbb0b (commit)
  from  019fcec6c6e0e9cb09c871672ce2540fd7a2cb0f (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 ec6b50d93e75ab57d87ae19c83c44d4f9a0cb88d
Merge: 4ae601d 019fcec
Author: Matthew Johnson mj...@qadesh.matthew.ath.cx
Date:   Sun Aug 8 20:14:16 2010 +0100

Merge branch 'master' of ssh://mj...@alioth/git/pkg-java/javatools

commit 4ae601d5761cc73994cca084096f748f7b7508bc
Author: Matthew Johnson mj...@qadesh.matthew.ath.cx
Date:   Sun Aug 8 20:13:00 2010 +0100

remove fastjar references

commit 9d9df42726c0709455b9e20b213443cd5e0dbb0b
Author: Matthew Johnson mj...@qadesh.matthew.ath.cx
Date:   Sun Aug 8 20:12:40 2010 +0100

remove fastjar references

---

Summary of changes:
 debian/control |2 +-
 jh_build   |2 +-
 tutorial.html  |2 +-
 tutorial.txt   |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index cc4bd6c..aced9a1 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Description: Run executable Java .jar files
 
 Package: javahelper
 Architecture: all
-Depends: ${misc:Depends}, fastjar, debhelper, devscripts,
+Depends: ${misc:Depends}, debhelper, devscripts,
  bsdmainutils, dpkg-dev, dctrl-tools,
  libarchive-zip-perl (= 1.20)
 Suggests: cvs,
diff --git a/jh_build b/jh_build
index 37b2f76..1ee94b6 100755
--- a/jh_build
+++ b/jh_build
@@ -145,7 +145,7 @@ function dobuild()
 
 JAVAC=${JAVA_HOME}/bin/javac
 JAVADOC=${JAVA_HOME}/bin/javadoc
-JAR=fastjar
+JAR=${JAVA_HOME}/bin/jar
 
 jarfile=${ARGV[0]}
 
diff --git a/tutorial.html b/tutorial.html
index 14d10fe..f434133 100644
--- a/tutorial.html
+++ b/tutorial.html
@@ -488,7 +488,7 @@ Source: salliere
 Section: misc
 Priority: optional
 Maintainer: Matthew Johnson lt;mj...@debian.orggt;
-Build-Depends: debhelper (gt;= 5), default-jdk, fastjar, 
+Build-Depends: debhelper (gt;= 5), default-jdk,
libmatthew-debug-java, libcsv-java,
libitext-java, javahelper
 Standards-Version: 3.7.3
diff --git a/tutorial.txt b/tutorial.txt
index 9cba967..d93fa75 100644
--- a/tutorial.txt
+++ b/tutorial.txt
@@ -467,7 +467,7 @@ Source: salliere
 Section: misc
 Priority: optional
 Maintainer: Matthew Johnson mj...@debian.org
-Build-Depends: debhelper (= 5), default-jdk, fastjar,
+Build-Depends: debhelper (= 5), default-jdk,
libmatthew-debug-java, libcsv-java,
libitext-java, javahelper
 Standards-Version: 3.7.3


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, experimental, created. 0.30-48-gec6b50d

2010-08-08 Thread Matthew Johnson
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, experimental has been created
at  ec6b50d93e75ab57d87ae19c83c44d4f9a0cb88d (commit)

- 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, policy-dc10, created. 0.30-49-g494e0d4

2010-08-08 Thread Matthew Johnson
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, policy-dc10 has been created
at  494e0d41649fbacd9e24d0010545ddb39a0bf176 (commit)

- Log -
commit 494e0d41649fbacd9e24d0010545ddb39a0bf176
Author: Matthew Johnson mj...@qadesh.matthew.ath.cx
Date:   Sun Aug 8 20:26:02 2010 +0100

change symlink handling for sonames

---


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, policy-dc10, updated. 0.30-50-gc04e9ee

2010-08-08 Thread Matthew Johnson
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, policy-dc10 has been updated
   via  c04e9eeb79e8a271041291189be17ddf061e0208 (commit)
  from  494e0d41649fbacd9e24d0010545ddb39a0bf176 (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 c04e9eeb79e8a271041291189be17ddf061e0208
Author: Matthew Johnson mj...@debian.org
Date:   Sun Aug 8 20:55:25 2010 +0100

fix the postinst stuff after testing it

---

Summary of changes:
 jh_build |8 
 jh_postinst  |4 ++--
 postinst-javalib |2 +-
 prerm-javalib|4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jh_build b/jh_build
index 1ee94b6..1bd0e1f 100755
--- a/jh_build
+++ b/jh_build
@@ -130,15 +130,15 @@ function dobuild()
(
cd debian/_jh_build.$ext;
if [ -z `getarg q quiet` ]; then
-   echo $JAR -c -f $jarpath -m ../_jh_manifest.$ext *   
+   echo $JAR cfm $jarpath ../_jh_manifest.$ext *   
fi
-   $JAR -c -f $jarpath -m ../_jh_manifest.$ext *
+   $JAR cfm $jarpath ../_jh_manifest.$ext *
)
if [ -n $JH_JAR_EXTRA ]; then
if [ -z `getarg q quiet` ]; then
-   echo $JAR -u -f $jarpath -@
+   echo $JAR uf $jarpath -@
fi
-   echo $JH_JAR_EXTRA | sed 's/ /\n/g' | $JAR -u -f $jarpath 
-@ 
+   echo $JH_JAR_EXTRA | sed 's/ /\n/g' | $JAR uf $jarpath -@ 
fi
 
 }
diff --git a/jh_postinst b/jh_postinst
index 2a9339d..78d33c4 100755
--- a/jh_postinst
+++ b/jh_postinst
@@ -31,10 +31,10 @@ linklib()
PACKAGE=${ARGV[4]}
 
echo # Automatically added by javahelper  
debian/$PACKAGE.postinst.debhelper
-   sed s%#SOURCE#%$SOURCE%;s%#TARGET#%$TARGET%;s%#SONAME#%$SONAME% 
/usr/share/debhelper/autoscripts/postinst-javalib  
debian/$PACKAGE.postinst.debhelper
+   sed s%#SOURCE#%$SOURCE%g;s%#TARGET#%$TARGET%g;s%#SONAME#%$SONAME%g 
/usr/share/debhelper/autoscripts/postinst-javalib  
debian/$PACKAGE.postinst.debhelper
echo # End automatically added section  
debian/$PACKAGE.postinst.debhelper
echo # Automatically added by javahelper  
debian/$PACKAGE.prerm.debhelper
-   sed s%#SOURCE#%$SOURCE%;s%#TARGET#%$TARGET%;s%#SONAME#%$SONAME% 
/usr/share/debhelper/autoscripts/prerm-javalib  
debian/$PACKAGE.prerm.debhelper
+   sed s%#SOURCE#%$SOURCE%g;s%#TARGET#%$TARGET%g;s%#SONAME#%$SONAME%g 
/usr/share/debhelper/autoscripts/prerm-javalib  
debian/$PACKAGE.prerm.debhelper
echo # End automatically added section  
debian/$PACKAGE.prerm.debhelper
 }
 
diff --git a/postinst-javalib b/postinst-javalib
index 0d2f681..db6b044 100644
--- a/postinst-javalib
+++ b/postinst-javalib
@@ -9,7 +9,7 @@ if [ -e #TARGET# ]; then
ln -sf #SOURCE# #TARGET#
else
# do nothing, the symlink points to a newer version
-   ;
+   true
fi
else
echo #TARGET# exists and is not a symlink
diff --git a/prerm-javalib b/prerm-javalib
index 6b26e96..16e2c7c 100644
--- a/prerm-javalib
+++ b/prerm-javalib
@@ -3,7 +3,7 @@ if [ -e #TARGET# ]; then
# need to work out if it's pointing at us
old=`readlink #TARGET#`
SONAME=`basename $old .jar | sed 
's/.*\([0-9][0-9.]*\)/\1/'` 
-   if [ '#SONAME#' = $SONAME ] then
+   if [ '#SONAME#' = $SONAME ]; then
# it's our symlink, do something with it
NEWSOURCE=
NEWSONAME=0
@@ -23,7 +23,7 @@ if [ -e #TARGET# ]; then
fi
else
# do nothing, the symlink points to a different version
-   ;
+   true
fi
else
echo #TARGET# exists and is not a symlink


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#592265: Causes FTBFS of other packages

2010-08-08 Thread Matthew Johnson
Package: javahelper
Version: 0.32
Severity: grave

Despite what the man page says, you can't call jar -u -f -m you have to use ufm 
for sun jar. 
This bug will cause javahelper-using packages to FTBFS.

-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-3-amd64 (SMP w/1 CPU core)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages javahelper depends on:
ii  bsdmainutils  8.0.11 collection of more utilities from 
ii  dctrl-tools   2.14   Command-line tools to process Debi
ii  debhelper 7.4.20 helper programs for debian/rules
ii  devscripts2.10.64scripts to make the life of a Debi
ii  dpkg-dev  1.15.7.2   Debian package development tools
ii  libarchive-zip-perl   1.30-2 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
pn  gawknone   (no description available)
pn  tofrodosnone   (no description available)

-- no debconf information



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


[SCM] UNNAMED PROJECT branch, policy-dc10, updated. 0.30-52-ga0a89af

2010-08-08 Thread Matthew Johnson
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, policy-dc10 has been updated
   via  a0a89afdee5c5050b56bab7266d90f4b99e61c78 (commit)
   via  c7b4a4cb1afcfb6cfc5b1a5277f6d69f8cfa386b (commit)
  from  c04e9eeb79e8a271041291189be17ddf061e0208 (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 a0a89afdee5c5050b56bab7266d90f4b99e61c78
Merge: c7b4a4c c04e9ee
Author: Matthew Johnson mj...@qadesh.matthew.ath.cx
Date:   Sun Aug 8 21:24:13 2010 +0100

Merge branch 'policy-dc10' of ssh://mj...@alioth/git/pkg-java/javatools 
into policy-dc10

commit c7b4a4cb1afcfb6cfc5b1a5277f6d69f8cfa386b
Author: Matthew Johnson mj...@qadesh.matthew.ath.cx
Date:   Sun Aug 8 21:23:05 2010 +0100

Add current version of library deps to dependency list as =

---

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

diff --git a/debian/changelog b/debian/changelog
index 585d88d..91b0597 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ javatools (0.33~1) experimental; urgency=low
   * Implement policy changes from DC10
 - Install jars with soname symlinks and postinst/prerm snippets for
 handling them
+  * Add current version of library deps to dependency list as =
 
- -- Matthew Johnson mj...@debian.org  Sun, 08 Aug 2010 20:15:47 +0100
+ -- Matthew Johnson mj...@debian.org  Sun, 08 Aug 2010 21:10:27 +0100
 
 javatools (0.32) unstable; urgency=low
 
diff --git a/jh_depends b/jh_depends
index 1bce83c..b3bbfea 100755
--- a/jh_depends
+++ b/jh_depends
@@ -157,9 +157,11 @@ for p in $PACKAGES; do
   for j in $PACKAGES; do
if ! grep $j  $EXCLUDES  /dev/null; then
if [ -n $VERBOSE ]; then
-   echo Checking:  
$OLDDIR/debian/$j$realjar
+   echo Checking:  
$OLDDIR/debian/$j/.../`basename $realjar`
fi
-   if [ -f $OLDDIR/debian/$j$realjar ]; then
+   if [ -f $OLDDIR/debian/$j/$realjar ]; then
+   LOCALDEBDEPS=$LOCALDEBDEPS $j (= 
\${source:Version})
+   elif [ -f 
$OLDDIR/debian/$j/usr/share/java/$realjar ]; then
LOCALDEBDEPS=$LOCALDEBDEPS $j (= 
\${source:Version})
else 
NEWJARDEPS=$NEWJARDEPS $realjar
@@ -181,7 +183,7 @@ for p in $PACKAGES; do
if grep $d  $EXCLUDES  /dev/null; then
echo Excluding package $d from depends
else
-   REALDEBDEPS=$REALDEBDEPS $d
+   REALDEBDEPS=$REALDEBDEPS $d (= `grep-status -P $d 
-s Version -n`)
fi
done
DEBDEPS=$LOCALDEBDEPS $REALDEBDEPS


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] r12887 - trunk/website/docs

2010-08-06 Thread Matthew Johnson
Author: mjj29
Date: 2010-08-06 19:06:52 + (Fri, 06 Aug 2010)
New Revision: 12887

Added:
   trunk/website/docs/tutorial.html
Log:
add tutorial from javahelper

Added: trunk/website/docs/tutorial.html
===
--- trunk/website/docs/tutorial.html(rev 0)
+++ trunk/website/docs/tutorial.html2010-08-06 19:06:52 UTC (rev 12887)
@@ -0,0 +1,626 @@
+?xml version=1.0 encoding=utf-8?
+!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.1//EN 
http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd;
+html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en
+  head
+meta name=Author content=Matthew Johnson (mj...@debian.org)/
+titlePackaging Java with Javatools/title
+  /head
+  body
+div id=page
+  div id=container
+div id=main
+  div class=shadow
+div id=sticky
+  h2 style=display:none;Page Body/h2
+  hr style=display:none;/
+  h3Packaging Java with Javatools/h3
+  p
+  Javatools replaces the existing ttjarwrapper/tt package and also 
contains programs
+  to help packagers in creating packages for Java programs and libraries.
+   /p
+  h3Packaging tools/h3
+  p
+  The ttjavahelper/tt package consists of several small programs which 
make 
+  packaging Java programs and libraries easier. They are generally 
designed to work
+  in the same fashion as the debhelper programs, but start with the 
ttjh_/tt prefix.
+   /p
+  p
+  All of the programs have their command line arguments documented in 
manpages.
+   /p
+  h4jh_build/h4
+  p
+  Many Java programs and libraries are distributed without sane build 
systems. 
+  ttjh_build/tt provides a simple interface for building Java source 
code
+  into Jars, including setting the appropriate entries in the manifest.
+   /p
+  p
+  In almost all cases all that needs to be done to call ttjh_build/tt 
is to set 
+  ttJAVA_HOME/tt and ttCLASSPATH/tt and then call 
ttjh_build/tt with the 
+  name of the jar and the directory containing the source.
+   /p
+  pre class=code
+JAVA_HOME=/usr/lib/jvm/default-java
+CLASSPATH=/usr/share/java/esd.jar:/usr/share/java/jsch.jar
+jh_build weirdx.jar src
+   /pre
+  p
+  This command will compile all the Java files under ttsrc/tt, set the
+  classpath in the manifest and build it all into weirdx.jar.
+   /p
+  p
+  A couple of other options are worth mentioning. If this jar contains an 
application
+  rather than a library then the tt-m/tt or tt--main/tt option can 
be used
+  to set the ttMain-Class/tt attribute in the manifest which will 
allow the resulting jar
+  file to be be executed
+   /p
+
+   p
+   Alternatively, you may provide a ttdebian/javabuild/tt file 
containing one jar per
+   line, each jar name followed by a list of source files or 
directories. In this 
+   case you can call ttjh_build/tt with no jar or source and 
it will build 
+   those jars. The jars will then be removed by ttjh_build 
--clean/tt.
+   /p
+ pttjh_build/tt also provides a tt--clean/tt parameter which 
should be called in the 
+  ttclean/tt target of ttdebian/rules/tt. It will be called for 
you by ttjh_clean/tt
+   /p
+   p
+   jh_build will also create javadoc, but only for the last jar built in 
each
+   package. It can be installed automatically using jh_installjavadoc (see
+   below).
+   /p
+
+  h4jh_installlibs/h4
+  p
+  For library packages Debian Java policy currently requires that the 
libraries be installed 
+  to tt/usr/share/java/tt in a versioned format and with an 
unversioned symlink. 
+  ttjh_installlibs/tt will take a jar and correctly install it.
+   /p
+  p
+  As with debhelper programs, this can either take a jar as a parameter, 
or read a list of
+  jars from a file in the Debian directory. It also follows the 
tt-p/tt, tt-i/tt and
+  tt-a/tt semantics of debhelper for selecting which packages to 
install the jar to.
+  When operating on a package, ttjh_installlibs/tt will read the list 
of library jars from
+  ttdebian/package.jlibs/tt or ttdebian/jlibs/tt.
+   /p
+  p
+  The jlibs file is a list of jars to install, one per line, and works 
exactly the same as listing 
+  them on the command line. Each jar is installed to 
ttdebian/package/usr/share/java//tt in
+  the appropriate versioned and unversioned forms.
+   /p
+   p
+   If the jars built by upstream already contain the version number, this
+   will be stripped before installing. ttjh_installlibs/tt will also 
try to strip the upstream version number
+   of any dfsg suffix. Other version-mangling options or explicit version 
numbers can also

Bug#591874: javahelper: jh_build does not specify -source, gcj gets it wrong

2010-08-05 Thread Matthew Johnson
Package: javahelper
Version: 0.32
Severity: important


Because gcj _still_ defaults to 1.4 source format and jh_build doesn't specify 
anything
when building, something using default-java will ftbfs on kfreebsd or hppa if 
it uses
1.5 source featuress.

Always specifying: -source 6 -target 5 _should_ be safe on all VMs, so we 
should do that.


-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-3-amd64 (SMP w/1 CPU core)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages javahelper depends on:
ii  bsdmainutils  8.0.11 collection of more utilities from 
ii  dctrl-tools   2.14   Command-line tools to process Debi
ii  debhelper 7.4.20 helper programs for debian/rules
ii  devscripts2.10.64scripts to make the life of a Debi
ii  dpkg-dev  1.15.7.2   Debian package development tools
ii  fastjar   2:0.98-3   Jar creation utility
ii  python2.5.4-9An interactive high-level object-o
ii  python-debian 0.1.16 Python modules to work with Debian
ii  python-scriptutil 1-1Python module which provides the f

javahelper recommends no packages.

Versions of packages javahelper suggests:
ii  cvs 1:1.12.13-12 Concurrent Versions System
pn  gawknone   (no description available)
pn  tofrodosnone   (no description available)
ii  unzip   6.0-4De-archiver for .zip files
pn  zip none   (no description available)

-- no debconf information



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


[SCM] UNNAMED PROJECT branch, master, updated. 0.30-45-g019fcec

2010-08-03 Thread Matthew Johnson
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  019fcec6c6e0e9cb09c871672ce2540fd7a2cb0f (commit)
  from  41d200fc0567ab5bd7375fc1f10b1d99d23ababf (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 019fcec6c6e0e9cb09c871672ce2540fd7a2cb0f
Author: Matthew Johnson mj...@debian.org
Date:   Tue Aug 3 21:34:26 2010 +0100

remove zip/unzip suggests, they should really be in ant or pde-build, 
release

---

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

diff --git a/debian/changelog b/debian/changelog
index 233a25e..d5ec24b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,8 @@
-javatools (0.32) UNRELEASED; urgency=low
+javatools (0.32) unstable; urgency=low
 
   [ Niels Thykier ]
   * Fixed quoting issue in jh_compilefeatures.
   * Renamed a function in the Eclipse module.
-  * Added missing suggests on zip and unzip (which are used by the
-the eclipse-helpers).
   * fetch-eclipse-source script to create tarballs from some eclipse
 upstreams. Its requirements have been added to javahelper's
 suggests.
diff --git a/debian/control b/debian/control
index 834e659..cc4bd6c 100644
--- a/debian/control
+++ b/debian/control
@@ -28,8 +28,6 @@ Depends: ${misc:Depends}, fastjar, debhelper, devscripts,
 Suggests: cvs,
   gawk,
   tofrodos,
-  zip,
-  unzip
 Description: Helper scripts for packaging Java programs
  Javahelper contains several scripts which help in packaging
  Java programs.


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#588379: using jh_depends when a .jar exists in one than one package

2010-07-11 Thread Matthew Johnson
tag 588379 wontfix
thanks

Hi Scott, I'm the other Javahelper maintainer,

On Sun Jul 11 11:12, Scott Howard wrote:
 Processing is a java package which compiles java code, so it depends
 on the jdk. The package won't build unless tools.jar is explicitly in
 the classpath at build time (I'm not too familiar with that package, i
 work with arduino so I don't know what happens if tools.jar isn't in
 the classpath at runtime for processing).

The question I have is - if the Class-Path: in the jar manifest contains just
tools.jar - how is this loaded by the JVM? I would expect it wouldn't know
where to look. If you explicitly list the path to tools.jar, then it'll only
load the one from that JVM - and hence you should depend on just that.

I expect what you actually want to do is either list both in the manifest or
select it at runtime and hence don't need it in the manifest (and, I see below,
this latter is what you do).

My view is that this really is a corner case and the automated tools 
like jh_depends are designed for the common case, so the easiest solution
may be to just list the depends yourself.

 Maybe we can use javahelper to define one classpath during build time
 and another for runtime? (I've tried but haven't found how to do it
 yet using jh_build and setting CLASSPATH and/or using .classpath, and
 I haven't tested if the package would even work - just a theory) I
 have a feeling that having a different classpath than the build time
 classpath isn't that good of an idea, especially when upstream's
 wrapper for launching the .jar [3] does the following:

Well, your wrapper here is setting the classpath, so you don't need it to be in
the jar. The other option would be to use jh_build to build (doesn't upstream
have a build system?) and then jh_classpath to remove the classpath, then you
can put the depends in manually and have the wrapper script (as it does) set
the classpath at runtime.

 This might be a really unique case, but I guess the quirk would be if
 tools.jar is found in the classpath to include either the openjdk OR
 sun jdk since the file exists in both and only one is installed during
 build time (the one in main). I'd understand if it's too much to
 change and maintain the change for the few java packages that would
 depend on tools.jar, I'll defer to your experience and opinion.
 
Yeah, I think that's probably the case here, but thanks for asking about it -
it's certainly an interesting case!

Matt


signature.asc
Description: Digital 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.30-26-g32ea17e

2010-07-04 Thread Matthew Johnson
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  32ea17ed0eb138f46aa3478515c26fc2095bde0d (commit)
  from  f9a654e5e3e15786cfc577d4eaef64931b913176 (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 32ea17ed0eb138f46aa3478515c26fc2095bde0d
Author: Matthew Johnson mj...@qadesh.matthew.ath.cx
Date:   Sun Jul 4 09:33:28 2010 +0100

jh_build add -link on all packages you depend on

---

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

diff --git a/debian/changelog b/debian/changelog
index ab6a11f..dbee893 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,8 +30,10 @@ javatools (0.32) UNRELEASED; urgency=low
   [ Matthew Johnson ]
   * If jars aren't specified by absolute path try finding them under
 /usr/share/java (Closes: #586783)
+  * jh_build will now -link any javadoc in a package that you build-depend
+on
 
- -- Matthew Johnson mj...@debian.org  Fri, 02 Jul 2010 22:29:58 +0100
+ -- Matthew Johnson mj...@debian.org  Sun, 04 Jul 2010 09:32:42 +0100
 
 javatools (0.31) unstable; urgency=low
 
diff --git a/jh_build b/jh_build
index 426c943..37b2f76 100755
--- a/jh_build
+++ b/jh_build
@@ -86,11 +86,7 @@ function dobuild()
echo Debian-Java-Home: $JAVA_HOME  debian/_jh_manifest.$ext
fi
 
-   if [ -d /usr/share/doc/default-jdk-doc/api ]; then
-   CLASSPATHDOCS=-link /usr/share/doc/default-jdk-doc/api
-   else
-   CLASSPATHDOCS=
-   fi
+   CLASSPATHDOCS=`for i in $(grep-dctrl --no-field-names --show-field 
Build-Depends,Build-Depends-Indep -F source $pkg debian/control | tr , ' ' | 
sed 's/([^)]*)//g') ; do dpkg -L $i 2/dev/null | grep /usr/share/doc/.*/api$; 
done | sed 's/^/-link /' | xargs`
 
mkdir -p debian/_jh_build.$ext
if [ -n $srcdirs ]; then


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.30-27-g24558c3

2010-07-04 Thread Matthew Johnson
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  24558c3d846e08030d2a74707788cda19d155f71 (commit)
  from  32ea17ed0eb138f46aa3478515c26fc2095bde0d (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 24558c3d846e08030d2a74707788cda19d155f71
Author: Matthew Johnson mj...@matthew.ath.cx
Date:   Sun Jul 4 10:04:37 2010 +

fix jh_build documentation

---

Summary of changes:
 debian/changelog |3 ++-
 tutorial.html|4 +---
 tutorial.txt |6 ++
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dbee893..d210b06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,8 +32,9 @@ javatools (0.32) UNRELEASED; urgency=low
 /usr/share/java (Closes: #586783)
   * jh_build will now -link any javadoc in a package that you build-depend
 on
+  * fix jh_build documentation 
 
- -- Matthew Johnson mj...@debian.org  Sun, 04 Jul 2010 09:32:42 +0100
+ -- Matthew Johnson mj...@debian.org  Sun, 04 Jul 2010 10:04:17 +
 
 javatools (0.31) unstable; urgency=low
 
diff --git a/tutorial.html b/tutorial.html
index 4a984be..6bd3c28 100644
--- a/tutorial.html
+++ b/tutorial.html
@@ -57,10 +57,8 @@ jh_build weirdx.jar src
p
Alternatively, you may provide a ttdebian/javabuild/tt file 
containing one jar per
line, each jar name followed by a list of source files or 
directories. In this 
-   case you can call ttjh_build/tt with no parameters and it 
will build 
+   case you can call ttjh_build/tt with no jar or source and 
it will build 
those jars. The jars will then be removed by ttjh_build 
--clean/tt.
-  In this case you cannot provide other options to jh_build, but it 
will honour
-   CLASSPATH and JAVA_HOME environment variables.
/p
  pttjh_build/tt also provides a tt--clean/tt parameter which 
should be called in the 
   ttclean/tt target of ttdebian/rules/tt. It will be called for 
you by ttjh_clean/tt
diff --git a/tutorial.txt b/tutorial.txt
index 87a0eca..da64c21 100644
--- a/tutorial.txt
+++ b/tutorial.txt
@@ -43,10 +43,8 @@ jh_build weirdx.jar src
 
Alternatively, you may provide a debian/javabuild file containing one 
jar per
line, each jar name followed by a list of source files or directories. 
In this 
-   case you can call jh_build with no parameters and it will build 
-   those jars. The jars will then be removed by jh_build --clean. In this 
case, 
-   you cannot provide other options to jh_build, but it will honour
-   CLASSPATH and JAVA_HOME environment variables
+   case you can call jh_build with no jar or source  and it will build 
+   those jars. The jars will then be removed by jh_build --clean.
 
jh_build also provides a --clean parameter which should be called in
the clean target of debian/rules. It is called for you by jh_clean


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.30-32-g6683637

2010-07-04 Thread Matthew Johnson
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  668363777e13c68c4c2e880bde51f1cb6c52e4f1 (commit)
  from  d411570f5734f4996a6ec788a8133f9a929e66bb (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 668363777e13c68c4c2e880bde51f1cb6c52e4f1
Author: Matthew Johnson mj...@qadesh.matthew.ath.cx
Date:   Mon Jul 5 00:30:01 2010 +0100

aoeu

---

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

diff --git a/tests/tests.sh b/tests/tests.sh
index 24bf6da..774e624 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -2,7 +2,7 @@
 
 set -e
 _DIR=`pwd`
-. ../jh_lib.sh
+. ../jh_lib.sh.in
 
 run_jh_manifest()
 {


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.30-25-gf9a654e

2010-07-02 Thread Matthew Johnson
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  f9a654e5e3e15786cfc577d4eaef64931b913176 (commit)
  from  4b41e8f70b763075cbaf71fe00e1dafd9e6da554 (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 f9a654e5e3e15786cfc577d4eaef64931b913176
Author: Matthew Johnson mj...@qadesh.matthew.ath.cx
Date:   Fri Jul 2 22:31:31 2010 +0100

fix for 586783

---

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

diff --git a/debian/changelog b/debian/changelog
index 1c54193..ab6a11f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 javatools (0.32) UNRELEASED; urgency=low
 
+  [ Niels Thykier ]
   * Fixed quoting issue in jh_compilefeatures.
   * Created Debian::Javahelper::Java perl module to assist jh_depends
 with finding linked javadocs.
@@ -26,7 +27,11 @@ javatools (0.32) UNRELEASED; urgency=low
 which system javadocs they have been linked against. These packages
 are added to the new ${java:Recommends} variable.
 
- -- Niels Thykier ni...@thykier.net  Wed, 23 Jun 2010 16:16:59 +0200
+  [ Matthew Johnson ]
+  * If jars aren't specified by absolute path try finding them under
+/usr/share/java (Closes: #586783)
+
+ -- Matthew Johnson mj...@debian.org  Fri, 02 Jul 2010 22:29:58 +0100
 
 javatools (0.31) unstable; urgency=low
 
diff --git a/jh_depends b/jh_depends
index 48066cf..1bce83c 100755
--- a/jh_depends
+++ b/jh_depends
@@ -149,6 +149,8 @@ for p in $PACKAGES; do
for i in $JARDEPS; do
if [ -e $i ]; then 
realjar=`readlink -f $i`
+   elif [ -e /usr/share/java/$i ]; then
+   realjar=`readlink -f /usr/share/java/$i`
else
realjar=$i
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


Bug#574029: jh_manifest utf8 errors - workaround

2010-05-01 Thread Matthew Johnson
On Sat May 01 17:40, Eric Lavarde wrote:
 On 01/05/10 17:16, Eric Lavarde wrote:
 Very last thing: the workaround with override_jh_manifest doesn't seem
 to work for me, jh_manifest gets called and happily fails...

 Sorry to reply to myself but I found another workaround. Just add the  
 following to debian/rules:

 JH_MANIFEST_ARGS := -V

Looks like you are using CDBS not dh7, so you will need to do this.

Also looks like it might be a bug with the library I'm using, so I might punt
it to them.

Matt

-- 
Matthew Johnson


signature.asc
Description: Digital 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#574029: jh_manifest utf8 errors

2010-04-27 Thread Matthew Johnson
On Tue Apr 27 09:57, Picca Frédéric-Emmanuel wrote:
 
  I really could do with seeing the manifest from either of your packages - I
  suspect that there is non-utf8 data in there. Without seeing it though I 
  can't
  reproduce or suggest a fix. (I'm afraid I can't read winmail.dat)
 
 sorry for such a late answer.
 
 Attached the faulty manifest file, the one from ATKWidget-4.0.6.jar.

Hmm, this is very weird, I cannot reproduce this failure either by manually
running jh_manifest, or building the package in a clean chroot (via cowbuilder)
- it builds just fine.

 it seems that this MANIFEST is not in unix format.

That should not be a problem.

 the error is still:
 
 Traceback (most recent call last):
   File /usr/bin/jh_manifest, line 264, in module
 updatejar(j, tempmanifest, args)
   File /usr/bin/jh_manifest, line 78, in updatejar
 manifest = parseManifest(tempdir + /META-INF/MANIFEST.MF, None, 
 manifest)
   File /usr/bin/jh_manifest, line 164, in parseManifest
 manifest[section][i.strip()] = sec[i].strip().replace('\n ','')
   File /usr/lib/pymodules/python2.5/debian/deb822.py, line 179, in 
 __getitem__
 value = value.decode(self.encoding)
   File /usr/lib/python2.5/encodings/utf_8.py, line 16, in decode
 return codecs.utf_8_decode(input, errors, True)
 UnicodeDecodeError: 'utf8' codec can't decode byte 0xf3 in position 5: 
 unexpected end of data

This is really weird, since none of the manifests I have after building, nor
the one you sent me, contain a byte with the value f3 (according to hexdump).

I have two more questions: what locale are you building in, and could you run
the following command after you get a build failure (either of you):

   for j in `find debian -name *.jar `; 
   do 
  rm -rf META-INF; 
  jar xf $j META-INF/MANIFEST.MF;
  hexdump -C META-INF/MANIFEST.MF | grep -i f3;
   done

For me this returns no results - ie, none of the manifests contain a byte 0xf3.

I know this isn't really helping with getting javahelper working for you.
There's an easy work around though - you're probably not actually using any
jh_manifest features, so you could just add:

override_jh_manifest:
   
to your debian/rules file (assuming dh7) and it will skip running it at all.
This should be fine.

Matt
-- 
Matthew Johnson


signature.asc
Description: Digital 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#574029: jh_manifest utf8 errors

2010-04-19 Thread Matthew Johnson
On Mon Apr 19 14:09, Eric Lavarde - Debian wrote:
 Matthew Johnson said:
  I really could do with seeing the manifest from either of your packages -
  I
  suspect that there is non-utf8 data in there. Without seeing it though I
  can't
  reproduce or suggest a fix. (I'm afraid I can't read winmail.dat)
 
  Matt
 As I wrote in my email, there is no manifest to share! jh_manifest only
 gets called because I'm using CDBS, I have no debian/manifest or
 debian/package.manifest file.

You do - all jars embed a manifest, the upstream build system may embed more
data. extract META-INF/MANIFEST.MF from your jar files (or send me the jars)

Matt

-- 
Matthew Johnson


signature.asc
Description: Digital 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#574029: jh_manifest utf8 errors

2010-04-18 Thread Matthew Johnson
I really could do with seeing the manifest from either of your packages - I
suspect that there is non-utf8 data in there. Without seeing it though I can't
reproduce or suggest a fix. (I'm afraid I can't read winmail.dat)

Matt

-- 
Matthew Johnson


signature.asc
Description: Digital 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.


Re: excalibur-logkit_2.0-1_i386.changes REJECTED

2009-08-13 Thread Matthew Johnson
On Thu Aug 13 22:02, Archive Administrator wrote:
 Rejected: excalibur-logkit_2.0-1.dsc refers to 
 excalibur-logkit_2.0.orig.tar.gz, but I can't find it in the queue or in the 
 pool.
 

Whoops, needed to pass in -sa because of the old ubuntu revisions. Fixed
now

Matt
-- 
Matthew Johnson


signature.asc
Description: Digital signature
___
pkg-java-maintainers mailing list
pkg-java-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers

Bug#526489: Time to orphan eclipse? (Bug#526489: eclipse: should this package be orphaned?)

2009-06-15 Thread Matthew Johnson
On Mon Jun 15 16:32, Andreas Tille wrote:
 On Mon, 15 Jun 2009, Jens Kapitza wrote:

 I can offer my time but i think i need some help.

 About half a year ago I offered sponsoring packages to push
 things but I have basically zero Java experience and can only
 check about Debian policy and stuff - not really stress test
 whether the installed packages are really working.

I can sponsor and do have Java experience (although won't be using
Eclipse). Eclipse is also a fairly complicated package from what I
remember, so may take some time for anyone to grok, Java experience or
not.

Jens, and anyone else who is interested in this, do you want to send me
any questions you have? 

Matt

-- 
Matthew Johnson


signature.asc
Description: Digital signature
___
pkg-java-maintainers mailing list
pkg-java-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers

Bug#495637: [ant] Dangling symlink in ant package

2009-06-07 Thread Matthew Johnson
I still see this, any chance it could be fixed?

Matt

-- 
Matthew Johnson


signature.asc
Description: Digital signature
___
pkg-java-maintainers mailing list
pkg-java-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers

Re: jaranalyzer_1.2-3_i386.changes REJECTED

2008-08-05 Thread Matthew Johnson
On Tue Aug 05 21:02, Debian Installer wrote:
 
 Rejected: jaranalyzer_1.2-3.dsc refers to jaranalyzer_1.2.orig.tar.gz, but I 
 can't find it in the queue or in the pool.
 
My fault, of course you need other build options when the first revision
is not -1..

Will fix.

Matt
-- 
Matthew Johnson


signature.asc
Description: Digital signature
___
pkg-java-maintainers mailing list
pkg-java-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers

Bug#460605: gjdoc: dh_javadoc doesn't read .javadoc files correctly

2008-01-13 Thread Matthew Johnson
Package: gjdoc
Version: 0.7.7-7
Severity: important


dh_javadoc is meant to read (Java) package names from the file
debian/$package.javadoc. However, when reading the file it does
not strip linebreaks before passing them to gjdoc. As a result,
it calls gjdoc with the arguments:

   foo.bar\n bar.baz\n

which fails. There is also a typo in one of the error messages.

The attached patch fixes the problem

-- System Information:
Debian Release: 4.0
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/dash
Kernel: Linux 2.6.22-2-686
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)

Versions of packages gjdoc depends on:
ii  antlr  2.7.6-7   language tool for constructing rec
ii  debhelper  5.0.42helper programs for debian/rules
ii  gij [java1-runtime]4:4.1.1-15The GNU Java bytecode interpreter
ii  gij-4.1 [java1-runtime 4.1.1-20  The GNU Java bytecode interpreter
ii  java-gcj-compat1.0.65-10 Java runtime environment using GIJ
ii  libc6  2.3.6.ds1-13etch2 GNU C Library: Shared libraries
ii  libgcc11:4.1.1-21GCC support library
ii  libgcj-bc  4.1.1-21  Link time only library for use wit
ii  libgcj7-0  4.1.1-20  Java runtime library for use with 
ii  sun-java5-jre [java1-r 1.5.0-10-3Sun Java(TM) Runtime Environment (
ii  sun-java6-jre [java1-r 6-00-2~bpo.1  Sun Java(TM) Runtime Environment (
ii  zlib1g 1:1.2.3-13compression library - runtime

gjdoc recommends no packages.

-- no debconf information
--- dh_javadoc.old  2008-01-13 23:10:25.071094866 +
+++ dh_javadoc  2008-01-13 23:24:42.591899534 +
@@ -98,8 +98,10 @@
 
if (-e debian/$package.javadoc){
open PACKAGES, debian/$package.javadoc
-   or error(Unable to open file: 
debian/$package.javadocL: $!);
-   my @pkgs = PACKAGES;
+   or error(Unable to open file: debian/$package.javadoc: 
$!);
+   my @pkgs;
+   my $i = 0;
+   while(PACKAGES){chomp($pkgs[$i++]=$_);}
close PACKAGES or warning(Error closing 
debian/$package.javadoc: $!);
@packages = (@packages, @pkgs);
}
___
pkg-java-maintainers mailing list
pkg-java-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers