Bug#758052: Crash upon merging

2014-08-27 Thread Guillaume Mazoyer
Hello,

It looks like a problem deeper than gnome-split itself.

You did not save the /tmp/hs_err_pid5692.log somewhere to investigate
the stacktrace?
Is it possible to share the files that you were trying to merge to try
to reproduce this bug?

Thanks for the bug report.

-- 
Guillaume Mazoyer - https://respawner.fr/

__
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] r15936 - trunk/slashtime/debian

2012-04-11 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2012-04-11 17:34:33 + (Wed, 11 Apr 2012)
New Revision: 15936

Modified:
   trunk/slashtime/debian/control
Log:
slashtime: add Vcs-Browser field.

Modified: trunk/slashtime/debian/control
===
--- trunk/slashtime/debian/control  2012-04-10 17:31:19 UTC (rev 15935)
+++ trunk/slashtime/debian/control  2012-04-11 17:34:33 UTC (rev 15936)
@@ -10,6 +10,7 @@
 Standards-Version: 3.9.2
 Homepage: http://research.operationaldynamics.com/projects/slashtime/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/slashtime/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/slashtime/
 
 Package: slashtime
 Architecture: all


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


[pkg-java] r15906 - in trunk/slashtime/debian: . patches

2012-04-06 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2012-04-06 19:39:00 + (Fri, 06 Apr 2012)
New Revision: 15906

Added:
   trunk/slashtime/debian/patches/01_launcher_script.patch
   trunk/slashtime/debian/patches/02_manpage.patch
Removed:
   trunk/slashtime/debian/patches/01_manifest.patch
   trunk/slashtime/debian/patches/02_launcher_script.patch
   trunk/slashtime/debian/patches/03_manpage.patch
Modified:
   trunk/slashtime/debian/control
   trunk/slashtime/debian/copyright
   trunk/slashtime/debian/patches/series
   trunk/slashtime/debian/rules
Log:
slashtime: several fixes.

Modified: trunk/slashtime/debian/control
===
--- trunk/slashtime/debian/control  2012-04-06 11:07:20 UTC (rev 15905)
+++ trunk/slashtime/debian/control  2012-04-06 19:39:00 UTC (rev 15906)
@@ -5,6 +5,7 @@
 Uploaders: Guillaume Mazoyer respawne...@gmail.com
 Build-Depends: debhelper (= 8),
default-jdk,
+   javahelper,
libjava-gnome-java (= 4.1.1)
 Standards-Version: 3.9.2
 Homepage: http://research.operationaldynamics.com/projects/slashtime/
@@ -14,8 +15,9 @@
 Architecture: all
 Depends: default-jre | java6-runtime,
  libjava-gnome-java (= 4.1.1),
+ ${java:Depends},
  ${misc:Depends}
-Description: Display the time in various places.
+Description: Display the time in various places
  A small program which displays the time in various places. It has a compact
  display of locations along with supporting information such as the date and
  the abbreviated code used to name that timezone.

Modified: trunk/slashtime/debian/copyright
===
--- trunk/slashtime/debian/copyright2012-04-06 11:07:20 UTC (rev 15905)
+++ trunk/slashtime/debian/copyright2012-04-06 19:39:00 UTC (rev 15906)
@@ -4,7 +4,7 @@
 
 Files: *
 Copyright: Copyright (C) 2003-2011 Operational Dynamics Consulting Pty Ltd, 
and Others
-License:
+License: GPL-2
  slashtime is Logiciel Libre and is Open Source; you can redistribute it and/or
  modify it under the terms of the GNU General Public License, version 2 
(GPL),
  with the exception that external third party libraries used by slashtime do 
not
@@ -24,7 +24,7 @@
  http://www.gnu.org/licenses/
 
 Files: debian/*
-Copyright: 2011 Guillaume Mazoyer respawne...@gmail.com
+Copyright: 2012 Guillaume Mazoyer respawne...@gmail.com
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

Added: trunk/slashtime/debian/patches/01_launcher_script.patch
===
--- trunk/slashtime/debian/patches/01_launcher_script.patch 
(rev 0)
+++ trunk/slashtime/debian/patches/01_launcher_script.patch 2012-04-06 
19:39:00 UTC (rev 15906)
@@ -0,0 +1,38 @@
+## Description: Do not point directly to a java binary.
+## Origin/Author: Guillaume Mazoyer
+## Bug: bug URL
+Index: slashtime-0.5.13/configure
+===
+--- slashtime-0.5.13.orig/configure2012-04-06 20:46:43.678711766 +0200
 slashtime-0.5.13/configure 2012-04-06 20:52:37.540466263 +0200
+@@ -1379,11 +1379,10 @@
+ 
+ print LAUNCHER #! /bin/sh\n;
+ print LAUNCHER join ( ,
+-  exec,
+-  $JAVA,
++  exec java,
+   -classpath tmp/classes:$JAVAGNOME_JARS ,
+   slashtime.client.Master,
+-  \$*) . \n;
++  \\$@\) . \n;
+ 
+ close LAUNCHER;
+ 
+@@ -1395,13 +1394,13 @@
+ open LAUNCHER, tmp/launcher/slashtime-install;
+ 
+ print LAUNCHER #! /bin/sh\n;
++print LAUNCHER # cd'ing to the directory is necessary for the application to 
find the images.\n;
+ print LAUNCHER cd $prefix\n;
+ print LAUNCHER join ( ,
+-  exec,
+-  $JAVA,
++  exec java,
+   -classpath $SLASHTIME_JARS:$JAVAGNOME_JARS,
+   slashtime.client.Master,
+-  \$*) . \n;
++  \\$@\) . \n;
+ 
+ close LAUNCHER;
+ 

Deleted: trunk/slashtime/debian/patches/01_manifest.patch
===
--- trunk/slashtime/debian/patches/01_manifest.patch2012-04-06 11:07:20 UTC 
(rev 15905)
+++ trunk/slashtime/debian/patches/01_manifest.patch2012-04-06 19:39:00 UTC 
(rev 15906)
@@ -1,24 +0,0 @@
-## Description: Add Manifest to the JAR file.
-## Origin/Author: Guillaume Mazoyer
-## Bug: bug URL
-Index: slashtime-0.5.13/Makefile
-===
 slashtime-0.5.13.orig/Makefile 2011-12-19 00:09:43.011373948 +0100
-+++ slashtime-0.5.13/Makefile  2011-12-19 00:09:40.219360103 +0100
-@@ -121,7 +121,7 @@
- 
- tmp/slashtime.jar: tmp/stamp/compile
-   @/bin/echo -e $(JAR_CMD)\t$@
--  $(JAR) -cf tmp/slashtime.jar -C tmp/classes .
-+  $(JAR) cfm tmp/slashtime.jar Manifest.txt -C tmp/classes .
- 
- $(DESTDIR)$(PREFIX)/share/slashtime/images

[pkg-java] r15907 - trunk/slashtime/debian

2012-04-06 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2012-04-06 19:54:22 + (Fri, 06 Apr 2012)
New Revision: 15907

Modified:
   trunk/slashtime/debian/copyright
Log:
Fix copyright format URI.

Modified: trunk/slashtime/debian/copyright
===
--- trunk/slashtime/debian/copyright2012-04-06 19:39:00 UTC (rev 15906)
+++ trunk/slashtime/debian/copyright2012-04-06 19:54:22 UTC (rev 15907)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: slashtime
 Source: http://research.operationaldynamics.com/projects/slashtime/dist/
 


___
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] jigsaw packaging branch, master, updated. 9a0746ae2d69d820c9f643eee5c22e5ad6768601

2012-01-26 Thread Guillaume Mazoyer
The following commit has been merged in the master branch:
commit 9a0746ae2d69d820c9f643eee5c22e5ad6768601
Author: Alan Bateman alan.bate...@oracle.com
Date:   Fri Jan 27 00:09:49 2012 +0100

Sync with lastest upstream.

diff --git a/jdk/.hg/cache/branchheads b/jdk/.hg/cache/branchheads
index 26d3058..5fd821b 100644
--- a/jdk/.hg/cache/branchheads
+++ b/jdk/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-8c6429c279e7dcc24102c2e2c69a40997018f946 5000
-8c6429c279e7dcc24102c2e2c69a40997018f946 default
+a22f65ac0b9a462bb7108595db720b4326d337a6 5001
+a22f65ac0b9a462bb7108595db720b4326d337a6 default
diff --git a/jdk/.hg/dirstate b/jdk/.hg/dirstate
index 0191fda..5f3dca8 100644
Binary files a/jdk/.hg/dirstate and b/jdk/.hg/dirstate differ
diff --git a/jdk/.hg/store/00changelog.d b/jdk/.hg/store/00changelog.d
index 228b579..7631017 100644
Binary files a/jdk/.hg/store/00changelog.d and b/jdk/.hg/store/00changelog.d 
differ
diff --git a/jdk/.hg/store/00changelog.i b/jdk/.hg/store/00changelog.i
index d4a370c..e7375d7 100644
Binary files a/jdk/.hg/store/00changelog.i and b/jdk/.hg/store/00changelog.i 
differ
diff --git a/jdk/.hg/store/00manifest.d b/jdk/.hg/store/00manifest.d
index 58b7f08..06c6f62 100644
Binary files a/jdk/.hg/store/00manifest.d and b/jdk/.hg/store/00manifest.d 
differ
diff --git a/jdk/.hg/store/00manifest.i b/jdk/.hg/store/00manifest.i
index 297014f..b720b6f 100644
Binary files a/jdk/.hg/store/00manifest.i and b/jdk/.hg/store/00manifest.i 
differ
diff --git 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_files.java.i 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_files.java.i
index 5ab311e..d8d0dad 100644
Binary files 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_files.java.i and 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_files.java.i differ
diff --git 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file.java.i 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file.java.i
index c7b19ed..5e515c6 100644
Binary files 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file.java.i 
and 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file.java.i 
differ
diff --git 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i
 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i
index b7f4144..c3c3112 100644
Binary files 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i
 and 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i
 differ
diff --git 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_librarian.java.i 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_librarian.java.i
index f0553d4..c10919b 100644
Binary files 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_librarian.java.i 
and 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_librarian.java.i 
differ
diff --git 
a/jdk/.hg/store/data/test/java/lang/reflect/_module/_module_annotation_test.java.i
 
b/jdk/.hg/store/data/test/java/lang/reflect/_module/_module_annotation_test.java.i
index 3f4..cb3070c 100644
Binary files 
a/jdk/.hg/store/data/test/java/lang/reflect/_module/_module_annotation_test.java.i
 and 
b/jdk/.hg/store/data/test/java/lang/reflect/_module/_module_annotation_test.java.i
 differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-native.sh.i 
b/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-native.sh.i
index 25c20ac..67405b1 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-native.sh.i and 
b/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-native.sh.i differ
diff --git a/jdk/.hg/store/undo b/jdk/.hg/store/undo
index 34785b7..fa033b7 100644
Binary files a/jdk/.hg/store/undo and b/jdk/.hg/store/undo differ
diff --git a/jdk/.hg/undo.desc b/jdk/.hg/undo.desc
index e39fa08..b2060d0 100644
--- a/jdk/.hg/undo.desc
+++ b/jdk/.hg/undo.desc
@@ -1,3 +1,3 @@
-4998
+5001
 pull
 http://hg.openjdk.java.net/jigsaw/jigsaw/jdk
diff --git a/jdk/.hg/undo.dirstate b/jdk/.hg/undo.dirstate
index 93c4205..0191fda 100644
Binary files a/jdk/.hg/undo.dirstate and b/jdk/.hg/undo.dirstate differ
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/Files.java 
b/jdk/src/share/classes/org/openjdk/jigsaw/Files.java
index e02e8eb..099c35d 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/Files.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/Files.java
@@ -26,18 +26,34 @@
 package org.openjdk.jigsaw;
 
 import java.io.*;
-import java.util.*;
 import java.util.jar.*;
 import java.util.zip.*;
 
-
 public final class Files {
 
 private Files() { }
 
-private static void ensureIsDirectory(File path)
-throws IOException
-{
+// paths are stored with a platform agnostic separator, '/'
+static String convertSeparator(String path) {
+return path.replace(File.separatorChar, '/');
+}
+
+static 

[SCM] jigsaw packaging branch, master, updated. 5b08edbc0c8c3dceb18e25206b94cb08204aa2f1

2012-01-16 Thread Guillaume Mazoyer
The following commit has been merged in the master branch:
commit 5b08edbc0c8c3dceb18e25206b94cb08204aa2f1
Author: Mandy Chung mandy.ch...@oracle.com
Date:   Mon Jan 16 19:05:49 2012 +0100

Sync with the latest upstream source.

diff --git a/.hg/cache/tags b/.hg/cache/tags
index 5e94dc4..3d4403b 100644
--- a/.hg/cache/tags
+++ b/.hg/cache/tags
@@ -1,5 +1,10 @@
-364 50c6783c57480b4fd02504e0d58e5083dbf82142 
b10add071b36ac8a6201cf17a559dfbdf5cd0178
+411 960b2e6851862c515f414834239360268925ca66 
b7acf83a5fd0481d9b1009e9ed672848716b7e62
 
+69f592185747226a9c765a9fe139c1d34d616f9c jdk8-b02
+587bb549dff83131b65f40aa51864f69562f34a7 jdk8-b03
+f42e3d9394b40a423d345b8da22687b5462e5f25 jdk8-b01
+28cf2aec4dd7c3c75efc1c15078522467c781a6d jdk8-b06
+0db7ae9f2b1017124c779bccd016c976928859a0 jdk8-b07
 59b497130f82ec809c245ffb5e521e3a5fabf8af jdk7-b58
 030142474602b4a067662fffc0c8e541de5a78df jdk7-b59
 ba12117a5e6c918578d6b2a8c693232a33289024 jdk7-b56
@@ -10,13 +15,16 @@ aea0ace7a1e43619800931d42bbf69c579361c2d jdk7-b55
 c235f4a8559d196879c56af80159f67ee5d0e720 jdk7-b53
 5111e13e44e542fe945b47ab154546daec36737d jdk7-b50
 0f0189d55ce4a1f7840da7582ac7d970b3b7ab15 jdk7-b51
+0b66a233bfb9ba2ebda1e5cdfdb0373d6c1e3c69 jdk8-b04
+b910aac18c772b823b1f7da03e2c6528725cc6de jdk8-b05
+fb1bc13260d76447e269e843859eb593fe2a8ab2 jdk8-b08
 541bdc5ad32fc33255944d0a044ad992f3d915e8 jdk7-b41
 44be42de6693063fb191989bf0e188de2fa51e7c jdk7-b40
 848e684279d2ba42577d9621d5b2e5af3823d12d jdk7-b43
 94052b87287303527125026fe4b2698cf867ea83 jdk7-b42
 99846f001ca214015578d593802d26e27246a802 jdk7-b45
 a395e3aac4744cc9033fcd819fad1239a45add52 jdk7-b44
-d7744e86dedc21a8ecf6bdb73eb191b8eaf5b0da jdk7-b47
+26fb81a1e9ceb9baffba216acd9ded62e9e9d5ab jdk8-b13
 e8a2a4d187773a62f3309b0fa265c13425bc2258 jdk7-b46
 aee93a8992d2389121eb610c00a86196f3e2b9b0 jdk7-b49
 4ae9f4bfdb98f65bd957e3fe72471b320150b38e jdk7-b48
@@ -62,6 +70,7 @@ cbc8ad9dd0e085a607427ea35411990982f19a36 jdk7-b25
 cfeea66a3fa8ca3686a7cfa2d0ce8ab0169f168d jdk7-b24
 31e08f70e88d77c2053f91c21b49a04296bdc59a jdk7-b29
 56652b46f328937f6b9b5130f1e4cd80f48868ef jdk7-b28
+8adb70647b5af5273dfe6a540f07be667cd50216 jdk8-b09
 81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109
 140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108
 7d396ad455c3b2f68b0d7094891c5aba7c757a6e jdk7-b107
@@ -82,6 +91,7 @@ e8ebdf41b9c01a26642848f4134f5504e8fb3233 jdk7-b115
 7220e60b097fa027e922f1aeecdd330f3e37409f jdk7-b117
 a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118
 661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119
+7203965666a4fe63bf82f5e4204f41ce6285e716 jdk7-b144
 5f5c33d417f3a14706b09a4a95e65fa7b6fa54d6 jdk7-b92
 5fc102ff48f0e787ce9cc77249841d5ff0941b75 jdk7-b93
 425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90
@@ -94,6 +104,7 @@ fd3663286e77b9f13c39eee124db2beb079b3ca6 jdk7-b95
 e7f18db469a3e947b7096bfd12e87380e5a042cd jdk7-b99
 ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
 20aeeb51713990dbea6929a2e100a8bbf5df70d4 jdk7-b79
+23aa7f2c80a2fa354c80decf03e7c2018177ef4e jdk8-b14
 175cb3fe615998d1004c6d3fd96e6d2e86b6772d jdk7-b70
 4c36e9853dda27bdac5ef4839a610509fbe31d34 jdk7-b71
 0d7e03b426df27c21dcc44ffb9178eacd1b04f10 jdk7-b72
@@ -102,14 +113,17 @@ ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
 d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75
 c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76
 1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77
+1defbc57940a56f0aa41e9dee87b71e8c8b71103 jdk8-b11
+a6c4c248e8fa350c35014fa94bab5ac1a1ac3299 jdk8-b10
 cf26288a114be67c39f2758959ce50b60f5ae330 jdk7-b85
 2f3ea057d1ad56cf3b269cdc4de2741411151982 jdk7-b84
 6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87
 433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86
 8403096d1fe7ff5318df9708cfec84a3fd3e1cf9 jdk7-b81
-a3242906c7747b5d9bcc3d118c7c3c69aa40f4b7 jdk7-b80
+d7744e86dedc21a8ecf6bdb73eb191b8eaf5b0da jdk7-b47
 6880a3af9addb41541e80ebe8cde6f79ec402a58 jdk7-b83
 e1176f86805fe07fd9fb9da065dc51b47712ce76 jdk7-b82
+8e2104d565baee473895d5eba20e39f85ab4bf9f jdk8-b12
 7f1ba4459972bf84b8201dc1cc4f62b1fe1c74f4 jdk7-b89
 82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88
 82e6c820c51ac27882b77755d42efefdbf1dcda0 jdk7-b69
@@ -126,4 +140,7 @@ e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65
 cfbbdb77eac0397b03eb99ee2e07ea00e0a7b81e jdk7-b142
 c6569c5585851dfd39b8de8e021c3c312f51af12 jdk7-b141
 dcfe74f1c6553c556e7d361c30b0b614eb5e40f6 jdk7-b140
-7203965666a4fe63bf82f5e4204f41ce6285e716 jdk7-b144
+d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
+2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
+55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145
+a3242906c7747b5d9bcc3d118c7c3c69aa40f4b7 jdk7-b80
diff --git a/jdk/.hg/cache/branchheads b/jdk/.hg/cache/branchheads
index 1d20d56..26d3058 100644
--- a/jdk/.hg/cache/branchheads
+++ b/jdk/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-22ccf6e7a09237596d9640d586f39c0ea8c2129b 4997
-22ccf6e7a09237596d9640d586f39c0ea8c2129b default
+8c6429c279e7dcc24102c2e2c69a40997018f946 5000

[pkg-java] r15561 - in trunk/slashtime/debian: . patches

2011-12-19 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-12-19 14:16:30 + (Mon, 19 Dec 2011)
New Revision: 15561

Added:
   trunk/slashtime/debian/patches/
   trunk/slashtime/debian/patches/01_manifest.patch
   trunk/slashtime/debian/patches/02_launcher_script.patch
   trunk/slashtime/debian/patches/03_manpage.patch
   trunk/slashtime/debian/patches/series
   trunk/slashtime/debian/slashtime.manpages
Modified:
   trunk/slashtime/debian/control
   trunk/slashtime/debian/copyright
Log:
slashtime: fix some lintian errors and warnings.

Modified: trunk/slashtime/debian/control
===
--- trunk/slashtime/debian/control  2011-12-18 23:33:50 UTC (rev 15560)
+++ trunk/slashtime/debian/control  2011-12-19 14:16:30 UTC (rev 15561)
@@ -15,10 +15,10 @@
 Depends: default-jre | java6-runtime,
  libjava-gnome-java (= 4.1.1),
  ${misc:Depends}
-Description: Slashtime - Display the time in various places.
- Slashtime is a small program which displays the time in various places. It has
- a compact display of locations along with supporting information such as the
- date and the abbreviated code used to name that timezone.
+Description: Display the time in various places.
+ A small program which displays the time in various places. It has a compact
+ display of locations along with supporting information such as the date and
+ the abbreviated code used to name that timezone.
  .
  Time data displayed will be as accurate as the system's zoneinfo data is used.
  Somewhat unusually, Slashtime shows the offset from the current location, not

Modified: trunk/slashtime/debian/copyright
===
--- trunk/slashtime/debian/copyright2011-12-18 23:33:50 UTC (rev 15560)
+++ trunk/slashtime/debian/copyright2011-12-19 14:16:30 UTC (rev 15561)
@@ -21,8 +21,7 @@
  Open Source. See BUGS and HACKING files for details.
  .
  You should have a copy of the GPL somewhere on your system. If you don't, see
- http://www.gnu.org/copyleft/gpl.html or write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ http://www.gnu.org/licenses/
 
 Files: debian/*
 Copyright: 2011 Guillaume Mazoyer respawne...@gmail.com

Added: trunk/slashtime/debian/patches/01_manifest.patch
===
--- trunk/slashtime/debian/patches/01_manifest.patch
(rev 0)
+++ trunk/slashtime/debian/patches/01_manifest.patch2011-12-19 14:16:30 UTC 
(rev 15561)
@@ -0,0 +1,24 @@
+## Description: Add Manifest to the JAR file.
+## Origin/Author: Guillaume Mazoyer
+## Bug: bug URL
+Index: slashtime-0.5.13/Makefile
+===
+--- slashtime-0.5.13.orig/Makefile 2011-12-19 00:09:43.011373948 +0100
 slashtime-0.5.13/Makefile  2011-12-19 00:09:40.219360103 +0100
+@@ -121,7 +121,7 @@
+ 
+ tmp/slashtime.jar: tmp/stamp/compile
+   @/bin/echo -e $(JAR_CMD)\t$@
+-  $(JAR) -cf tmp/slashtime.jar -C tmp/classes .
++  $(JAR) cfm tmp/slashtime.jar Manifest.txt -C tmp/classes .
+ 
+ $(DESTDIR)$(PREFIX)/share/slashtime/images: 
+   @/bin/echo -e MKDIR\t$@/
+Index: slashtime-0.5.13/Manifest.txt
+===
+--- /dev/null  1970-01-01 00:00:00.0 +
 slashtime-0.5.13/Manifest.txt  2011-12-19 00:08:23.874981528 +0100
+@@ -0,0 +1,3 @@
++Manifest-Version: 1.0
++Main-Class: slashtime.client.Master
++Class-Path: /usr/share/java/gtk.jar /usr/share/java/slashtime.jar

Added: trunk/slashtime/debian/patches/02_launcher_script.patch
===
--- trunk/slashtime/debian/patches/02_launcher_script.patch 
(rev 0)
+++ trunk/slashtime/debian/patches/02_launcher_script.patch 2011-12-19 
14:16:30 UTC (rev 15561)
@@ -0,0 +1,35 @@
+## Description: Do not point directly to a java binary.
+## Origin/Author: Guillaume Mazoyer
+## Bug: bug URL
+Index: slashtime-0.5.13/configure
+===
+--- slashtime-0.5.13.orig/configure2011-12-19 00:39:28.916229774 +0100
 slashtime-0.5.13/configure 2011-12-19 00:40:25.236509051 +0100
+@@ -1379,11 +1379,10 @@
+ 
+ print LAUNCHER #! /bin/sh\n;
+ print LAUNCHER join ( ,
+-  exec,
+-  $JAVA,
++  exec java,
+   -classpath tmp/classes:$JAVAGNOME_JARS ,
+   slashtime.client.Master,
+-  \$*) . \n;
++  \\$@\) . \n;
+ 
+ close LAUNCHER;
+ 
+@@ -1397,11 +1396,10 @@
+ print LAUNCHER #! /bin/sh\n;
+ print LAUNCHER cd $prefix\n;
+ print LAUNCHER join ( ,
+-  exec,
+-  $JAVA,
++  exec java,
+   -classpath $SLASHTIME_JARS:$JAVAGNOME_JARS,
+   slashtime.client.Master,
+-  \$*) . \n;
++  \\$@\) . \n;
+ 
+ close LAUNCHER;
+ 

Added: trunk/slashtime/debian/patches/03_manpage.patch

[SCM] jigsaw packaging branch, master, updated. 9525b9189759e98277a77d1e140a167bc8029409

2011-12-02 Thread Guillaume Mazoyer
The following commit has been merged in the master branch:
commit 9525b9189759e98277a77d1e140a167bc8029409
Author: Alan Bateman alan.bate...@oracle.com
Date:   Fri Dec 2 22:43:12 2011 +0100

Sync with latest upstream.

diff --git a/jdk/.hg/cache/branchheads b/jdk/.hg/cache/branchheads
index 38c363d..1d20d56 100644
--- a/jdk/.hg/cache/branchheads
+++ b/jdk/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-807e450b0e1c810720e6be6abc3ebe017e92578e 4996
-807e450b0e1c810720e6be6abc3ebe017e92578e default
+22ccf6e7a09237596d9640d586f39c0ea8c2129b 4997
+22ccf6e7a09237596d9640d586f39c0ea8c2129b default
diff --git a/jdk/.hg/dirstate b/jdk/.hg/dirstate
index 40df47d..93c4205 100644
Binary files a/jdk/.hg/dirstate and b/jdk/.hg/dirstate differ
diff --git a/jdk/.hg/store/00changelog.d b/jdk/.hg/store/00changelog.d
index 5387a3b..03ddae2 100644
Binary files a/jdk/.hg/store/00changelog.d and b/jdk/.hg/store/00changelog.d 
differ
diff --git a/jdk/.hg/store/00changelog.i b/jdk/.hg/store/00changelog.i
index 4b6d449..7e27f9a 100644
Binary files a/jdk/.hg/store/00changelog.i and b/jdk/.hg/store/00changelog.i 
differ
diff --git a/jdk/.hg/store/00manifest.d b/jdk/.hg/store/00manifest.d
index cc0c951..fcd9566 100644
Binary files a/jdk/.hg/store/00manifest.d and b/jdk/.hg/store/00manifest.d 
differ
diff --git a/jdk/.hg/store/00manifest.i b/jdk/.hg/store/00manifest.i
index cc90698..2422e60 100644
Binary files a/jdk/.hg/store/00manifest.i and b/jdk/.hg/store/00manifest.i 
differ
diff --git a/jdk/.hg/store/data/make/common/_defs-modules.gmk.i 
b/jdk/.hg/store/data/make/common/_defs-modules.gmk.i
index 414ce1a..302e93e 100644
Binary files a/jdk/.hg/store/data/make/common/_defs-modules.gmk.i and 
b/jdk/.hg/store/data/make/common/_defs-modules.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_modules.gmk.i 
b/jdk/.hg/store/data/make/common/_modules.gmk.i
index 630f6bb..3e86e6f 100644
Binary files a/jdk/.hg/store/data/make/common/_modules.gmk.i and 
b/jdk/.hg/store/data/make/common/_modules.gmk.i differ
diff --git a/jdk/.hg/store/data/make/modules/_makefile.i 
b/jdk/.hg/store/data/make/modules/_makefile.i
index 39b806d..b46ccd6 100644
Binary files a/jdk/.hg/store/data/make/modules/_makefile.i and 
b/jdk/.hg/store/data/make/modules/_makefile.i differ
diff --git 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_class_info.java.i 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_class_info.java.i
index b98176d..890db0e 100644
Binary files 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_class_info.java.i 
and 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_class_info.java.i 
differ
diff --git 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_files.java.i 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_files.java.i
index b6f97d0..5ab311e 100644
Binary files 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_files.java.i and 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_files.java.i differ
diff --git 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_launcher.java.i 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_launcher.java.i
index 68baaf1..cd10d03 100644
Binary files 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_launcher.java.i and 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_launcher.java.i 
differ
diff --git 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file.java.i 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file.java.i
index eaaf69f..c7b19ed 100644
Binary files 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file.java.i 
and 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file.java.i 
differ
diff --git 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i
 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i
index 95678fc..b7f4144 100644
Binary files 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i
 and 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i
 differ
diff --git 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_librarian.java.i 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_librarian.java.i
index 0142e5e..f0553d4 100644
Binary files 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_librarian.java.i 
and 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_librarian.java.i 
differ
diff --git 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_packager.java.i 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_packager.java.i
index 03a3d65..c7e9d7f 100644
Binary files 
a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_packager.java.i 
and 
b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_packager.java.i 
differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/___library.java.i 

[SCM] jigsaw packaging branch, master, updated. 04142577728d2c1b12379bb4420695cfb14a5323

2011-10-30 Thread Guillaume Mazoyer
The following commit has been merged in the master branch:
commit 04142577728d2c1b12379bb4420695cfb14a5323
Author: Alan Bateman alan.bate...@oracle.com
Date:   Sun Oct 30 23:39:33 2011 +0100

Sync with the latest Jigsaw changes.

diff --git a/jdk/.hg/cache/branchheads b/jdk/.hg/cache/branchheads
index e3d0e84..6412cf7 100644
--- a/jdk/.hg/cache/branchheads
+++ b/jdk/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-cf4fbc24740e5edfad8a26f0bfc42aab51a8a2ba 4866
-cf4fbc24740e5edfad8a26f0bfc42aab51a8a2ba default
+960eb03d12700845bef706069fdfa642923af449 4867
+960eb03d12700845bef706069fdfa642923af449 default
diff --git a/jdk/.hg/dirstate b/jdk/.hg/dirstate
index 801a8a7..e6cccfe 100644
Binary files a/jdk/.hg/dirstate and b/jdk/.hg/dirstate differ
diff --git a/jdk/.hg/store/00changelog.d b/jdk/.hg/store/00changelog.d
index 7b9585a..2badd11 100644
Binary files a/jdk/.hg/store/00changelog.d and b/jdk/.hg/store/00changelog.d 
differ
diff --git a/jdk/.hg/store/00changelog.i b/jdk/.hg/store/00changelog.i
index bccfc33..514ccf2 100644
Binary files a/jdk/.hg/store/00changelog.i and b/jdk/.hg/store/00changelog.i 
differ
diff --git a/jdk/.hg/store/00manifest.d b/jdk/.hg/store/00manifest.d
index 632a3b6..2507d3a 100644
Binary files a/jdk/.hg/store/00manifest.d and b/jdk/.hg/store/00manifest.d 
differ
diff --git a/jdk/.hg/store/00manifest.i b/jdk/.hg/store/00manifest.i
index 4352e7a..dd3975f 100644
Binary files a/jdk/.hg/store/00manifest.i and b/jdk/.hg/store/00manifest.i 
differ
diff --git a/jdk/.hg/store/data/make/modules/modules.config.i 
b/jdk/.hg/store/data/make/modules/modules.config.i
index d5901dd..ce79a36 100644
Binary files a/jdk/.hg/store/data/make/modules/modules.config.i and 
b/jdk/.hg/store/data/make/modules/modules.config.i differ
diff --git a/jdk/.hg/store/data/make/modules/modules.group.i 
b/jdk/.hg/store/data/make/modules/modules.group.i
index 61f0689..68ba5a8 100644
Binary files a/jdk/.hg/store/data/make/modules/modules.group.i and 
b/jdk/.hg/store/data/make/modules/modules.group.i differ
diff --git a/jdk/.hg/store/data/make/modules/optional.depconfig.i 
b/jdk/.hg/store/data/make/modules/optional.depconfig.i
index 8c8d6ee..430bf5f 100644
Binary files a/jdk/.hg/store/data/make/modules/optional.depconfig.i and 
b/jdk/.hg/store/data/make/modules/optional.depconfig.i differ
diff --git a/jdk/.hg/store/undo b/jdk/.hg/store/undo
index bd2040b..c62ecc3 100644
Binary files a/jdk/.hg/store/undo and b/jdk/.hg/store/undo differ
diff --git a/jdk/.hg/undo.desc b/jdk/.hg/undo.desc
index 421e889..ba0306f 100644
--- a/jdk/.hg/undo.desc
+++ b/jdk/.hg/undo.desc
@@ -1,3 +1,3 @@
-4708
+4867
 pull
 http://hg.openjdk.java.net/jigsaw/jigsaw/jdk
diff --git a/jdk/.hg/undo.dirstate b/jdk/.hg/undo.dirstate
index e7ab5d6..801a8a7 100644
Binary files a/jdk/.hg/undo.dirstate and b/jdk/.hg/undo.dirstate differ
diff --git a/jdk/make/modules/modules.config b/jdk/make/modules/modules.config
index c06423b..324bade 100644
--- a/jdk/make/modules/modules.config
+++ b/jdk/make/modules/modules.config
@@ -631,8 +631,14 @@ module jdbc-odbc {
 include META-INF/services/java.sql.Driver;
 }
 
+// JDBC 4.1, JSR 221
 module jdbc {
-include java.sql.**, javax.sql.**;
+include java.sql.**, javax.sql.*;
+}
+
+// JDBC Rowset interface, JSR 114
+module jdbc-rowset {
+include javax.sql.rowset.**;
 include com.sun.rowset.**;
 }
 
diff --git a/jdk/make/modules/modules.group b/jdk/make/modules/modules.group
index 6dd06b8..f785de8 100644
--- a/jdk/make/modules/modules.group
+++ b/jdk/make/modules/modules.group
@@ -160,6 +160,11 @@ module sun.jdbc {
 include jdbc;
 }
 
+module sun.jdbc.rowset {
+requires local jdk.boot;
+include jdbc-rowset;
+}
+
 module sun.compat {
 requires local jdk.boot;   // ensure loaded by bootstrap class loader
 include private-legacy;
diff --git a/jdk/make/modules/optional.depconfig 
b/jdk/make/modules/optional.depconfig
index 65aa09c..652ce11 100644
--- a/jdk/make/modules/optional.depconfig
+++ b/jdk/make/modules/optional.depconfig
@@ -147,3 +147,23 @@
 @Optional
   java.lang.System - java.nio.channels.Channel
   java.lang.System - java.nio.channels.spi.SelectorProvider
+
+# public javax.xml.transform.Source getSource(java.lang.Class)
+@Optional
+  java.sql.SQLXML - javax.xml.transform.Source
+
+# public javax.xml.transform.Result setResult(java.lang.Class)
+@Optional
+  java.sql.SQLXML - javax.xml.transform.Result
+ 
+# public java.util.logging.Logger getParentLogger() 
+@Optional
+  java.sql.Driver - java.util.logging.Logger
+
+# public java.util.logging.Logger getParentLogger()
+@Optional
+  javax.sql.CommonDataSource - java.util.logging.Logger
+
+# public javax.transaction.xa.XAResource getXAResource()
+@Optional
+  javax.sql.XAConnection - javax.transaction.xa.XAResource 

-- 
jigsaw packaging

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


[SCM] jigsaw packaging branch, master, updated. d8e67fa731b64c7da8351ea0c69fb9eee5019949

2011-10-02 Thread Guillaume Mazoyer
The following commit has been merged in the master branch:
commit d8e67fa731b64c7da8351ea0c69fb9eee5019949
Author: Guillaume Mazoyer respawne...@gmail.com
Date:   Fri Sep 30 20:51:41 2011 +0200

Fix for jpkg tool. Debian patch not needed anymore.

diff --git a/.hg/tags.cache b/.hg/tags.cache
new file mode 100644
index 000..763b1fd
--- /dev/null
+++ b/.hg/tags.cache
@@ -0,0 +1,133 @@
+382 db00b7627ab109c4661ce24f99dbd5717f39 
463be2b9347974a9a699d88a3bd536f52dc930fc
+
+f42e3d9394b40a423d345b8da22687b5462e5f25 jdk8-b01
+59b497130f82ec809c245ffb5e521e3a5fabf8af jdk7-b58
+030142474602b4a067662fffc0c8e541de5a78df jdk7-b59
+ba12117a5e6c918578d6b2a8c693232a33289024 jdk7-b56
+ffd09e767dfa6d21466183a400f72cf62d53297f jdk7-b57
+2ef382b1bbd58a68e668391c6145a4b2066c5b96 jdk7-b54
+aea0ace7a1e43619800931d42bbf69c579361c2d jdk7-b55
+4264c2fe66493e57c411045a1b61377796641e45 jdk7-b52
+c235f4a8559d196879c56af80159f67ee5d0e720 jdk7-b53
+5111e13e44e542fe945b47ab154546daec36737d jdk7-b50
+0f0189d55ce4a1f7840da7582ac7d970b3b7ab15 jdk7-b51
+541bdc5ad32fc33255944d0a044ad992f3d915e8 jdk7-b41
+44be42de6693063fb191989bf0e188de2fa51e7c jdk7-b40
+848e684279d2ba42577d9621d5b2e5af3823d12d jdk7-b43
+94052b87287303527125026fe4b2698cf867ea83 jdk7-b42
+99846f001ca214015578d593802d26e27246a802 jdk7-b45
+a395e3aac4744cc9033fcd819fad1239a45add52 jdk7-b44
+d7744e86dedc21a8ecf6bdb73eb191b8eaf5b0da jdk7-b47
+e8a2a4d187773a62f3309b0fa265c13425bc2258 jdk7-b46
+aee93a8992d2389121eb610c00a86196f3e2b9b0 jdk7-b49
+4ae9f4bfdb98f65bd957e3fe72471b320150b38e jdk7-b48
+ea7bd43ecda59edb09026663bb704bfd912d460a jigsaw-b06
+696214fdbb709e4b7a27628b71fbb559d7ec6810 jigsaw-b04
+bb6913e3202a17d245da7e9bd42552d961655fd8 jigsaw-b05
+87cdb467827802f7e9953bcd775ea4499025b55d jigsaw-b02
+bef3965ce4a87a9646518e46f00664849bd8704f jigsaw-b03
+5f0790f5534291795aa311bf8f5e72e4f0ec47b5 jigsaw-b01
+a6b015b59fbc2518762c17ccc35702f03ef7713a jdk7-b129
+57d702105b23fb90e40beaf00f8f8aeae5e249e7 jdk7-b128
+2c2d4f88637b488014c37e1a2eb401f68bca8838 jdk7-b121
+366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120
+ed6950da30cf1e8904b4bdb034d471647942271f jdk7-b123
+f1591eed71f64f6eba79fb7426f5616cc4dfea73 jdk7-b122
+5c4df7e992775c102f08e9f1c0a124b324641b70 jdk7-b125
+024a6755895bf91b5a3c98984c89ee018efbf538 jdk7-b124
+bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127
+b566d490905691787f8931f69947a92c67c6d5e4 jdk7-b126
+46a989ab932992b2084b946eeb322fa99b9fee6c jdk7-b34
+143c1abedb7d3095eff0f9ee5fec9bf48e3490fc jdk7-b35
+4b4f5fea8d7d0743f0c30d91fcd9bf9d96e5d2ad jdk7-b36
+744554f5a3290e11c71cd2ddb1aff49e431f9ed0 jdk7-b37
+2dab2f712e1832c92acfa63ec0337048b9422c20 jdk7-b30
+3300a35a0bd56d695b92fe0b34f03ebbfc939064 jdk7-b31
+64da805be725721bf2004e7409a0d7a16fc8ddbc jdk7-b32
+bb1ef4ee3d2c8cbf43a37d372325a7952be590b9 jdk7-b33
+cc47a76899ed33a2c513cb688348244c9b5a1288 jdk7-b38
+ab523b49de1fc73fefe6855ce1e0349bdbd7af29 jdk7-b39
+fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138
+7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139
+0f62a65fb666b337caa585015ab6ea2e60e709ca jdk7-b132
+c6f380693342feadccc5fe2c5adf500e861361aa jdk7-b133
+cc58c11af15411042719e9c82707fdbef60a9e0f jdk7-b130
+5d86d951426aaf340b1ba84ae2d5ab5da65a71e2 jdk7-b131
+2fe76e73adaa5133ac559f0b3c2c0707eca04580 jdk7-b136
+7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137
+ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134
+783bd02b4ab4596059c74b10a1793d7bd2f1c157 jdk7-b135
+11b4dc9f2be3523ef989a0db8459eb56b3045c3a jdk7-b27
+9410f77cc30c604d1caf7c9fe3a57fa19e1acbe8 jdk7-b26
+cbc8ad9dd0e085a607427ea35411990982f19a36 jdk7-b25
+cfeea66a3fa8ca3686a7cfa2d0ce8ab0169f168d jdk7-b24
+31e08f70e88d77c2053f91c21b49a04296bdc59a jdk7-b29
+56652b46f328937f6b9b5130f1e4cd80f48868ef jdk7-b28
+81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109
+140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108
+7d396ad455c3b2f68b0d7094891c5aba7c757a6e jdk7-b107
+43096cccf1cee749c2f4e7714ee71f4e9e0f4d7f jdk7-b106
+9f96a4269d7727dad68864eaab795eafce270311 jdk7-b105
+f8be576feefce0c6695f188ef97ec16b73ad9cfd jdk7-b104
+be2aedc4e3b1751c1310f334242ba69e90867f38 jdk7-b103
+a136a51f5113da4dad3853b74a8536ab583ab112 jdk7-b102
+4193eaf5f1b82794c6a0fb1a8d11af43d1b1d611 jdk7-b101
+b218a53ec7d3d42be61d31d6917a6c5c037b6f56 jdk7-b100
+2a02d4a6955c7c078aee9a604cb3be409800d82c jdk7-b110
+9702d6fef68e17533ee7fcf5923b11ead3e912ce jdk7-b111
+b852103caf73da70068473777ae867a457bb3ae1 jdk7-b112
+c1df968c4527bfab5f97662a89245f15d12d378b jdk7-b113
+27985a5c6e5268014d25d55886e0ecb96af4763d jdk7-b114
+e8ebdf41b9c01a26642848f4134f5504e8fb3233 jdk7-b115
+94e9a1bfba8b8d1fe0bfd43b88629b1f27b02a76 jdk7-b116
+7220e60b097fa027e922f1aeecdd330f3e37409f jdk7-b117
+a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118
+661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119
+5f5c33d417f3a14706b09a4a95e65fa7b6fa54d6 jdk7-b92
+5fc102ff48f0e787ce9cc77249841d5ff0941b75 jdk7-b93
+425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90
+97d8b6c659c29c8493a8b2b72c2796a021a8cf79 jdk7-b91

[pkg-java] r15140 - in trunk: . slashtime slashtime/debian slashtime/debian/source

2011-09-30 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-09-30 19:47:56 + (Fri, 30 Sep 2011)
New Revision: 15140

Added:
   trunk/slashtime/
   trunk/slashtime/debian/
   trunk/slashtime/debian/changelog
   trunk/slashtime/debian/compat
   trunk/slashtime/debian/control
   trunk/slashtime/debian/copyright
   trunk/slashtime/debian/docs
   trunk/slashtime/debian/rules
   trunk/slashtime/debian/source/
   trunk/slashtime/debian/source/format
   trunk/slashtime/debian/watch
Log:
slashtime: Add initial release.


Added: trunk/slashtime/debian/changelog
===
--- trunk/slashtime/debian/changelog(rev 0)
+++ trunk/slashtime/debian/changelog2011-09-30 19:47:56 UTC (rev 15140)
@@ -0,0 +1,5 @@
+slashtime (0.5.13-1) unstable; urgency=low
+
+  * Initial release (Closes: #643911)
+
+ -- Guillaume Mazoyer respawne...@gmail.com  Fri, 30 Sep 2011 19:14:04 +0200

Added: trunk/slashtime/debian/compat
===
--- trunk/slashtime/debian/compat   (rev 0)
+++ trunk/slashtime/debian/compat   2011-09-30 19:47:56 UTC (rev 15140)
@@ -0,0 +1 @@
+8

Added: trunk/slashtime/debian/control
===
--- trunk/slashtime/debian/control  (rev 0)
+++ trunk/slashtime/debian/control  2011-09-30 19:47:56 UTC (rev 15140)
@@ -0,0 +1,29 @@
+Source: slashtime
+Section: misc
+Priority: optional
+Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
+Uploaders: Guillaume Mazoyer respawne...@gmail.com
+Build-Depends: debhelper (= 8),
+   default-jdk,
+   libjava-gnome-java (= 4.1.1)
+Standards-Version: 3.9.2
+Homepage: http://research.operationaldynamics.com/projects/slashtime/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/slashtime/
+
+Package: slashtime
+Architecture: any
+Depends: default-jre | java6-runtime,
+ libjava-gnome-java (= 4.1.1),
+ ${misc:Depends}
+Description: Slashtime - Display the time in various places.
+ Slashtime is a small program which displays the time in various places. It has
+ a compact display of locations along with supporting information such as the
+ date and the abbreviated code used to name that timezone.
+ .
+ Time data displayed will be as accurate as the system's zoneinfo data is used.
+ Somewhat unusually, Slashtime shows the offset from the current location, not
+ from UTC. When running you can change the center point by double-clicking on
+ another city.
+ .
+ There is a meeting planner built into Slashtime. You can specify a date and
+ time and see what the corresponding time in other locations will be.

Added: trunk/slashtime/debian/copyright
===
--- trunk/slashtime/debian/copyright(rev 0)
+++ trunk/slashtime/debian/copyright2011-09-30 19:47:56 UTC (rev 15140)
@@ -0,0 +1,44 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: slashtime
+Source: http://research.operationaldynamics.com/projects/slashtime/dist/
+
+Files: *
+Copyright: Copyright (C) 2003-2011 Operational Dynamics Consulting Pty Ltd, 
and Others
+License:
+ slashtime is Logiciel Libre and is Open Source; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License, version 2 
(GPL),
+ with the exception that external third party libraries used by slashtime do 
not
+ need to be licenced under GPL so long as they are redistributable under an 
Open
+ Source licence.
+ .
+ slashtime is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR 
A
+ PARTICULAR PURPOSE. See the GPL for more details. In particular, note that if
+ you use this and loose your data, you're on your own.
+ .
+ Of course, if you find a bug, please let us know. And, if you fix anything or
+ improve the code please contribute your changes back - that's the whole idea 
of
+ Open Source. See BUGS and HACKING files for details.
+ .
+ You should have a copy of the GPL somewhere on your system. If you don't, see
+ http://www.gnu.org/copyleft/gpl.html or write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+Files: debian/*
+Copyright: 2011 Guillaume Mazoyer respawne...@gmail.com
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should

[pkg-java] r15141 - tags

2011-09-30 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-09-30 19:50:03 + (Fri, 30 Sep 2011)
New Revision: 15141

Added:
   tags/slashtime/
Log:
slashtime: add tags.



___
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] r15142 - branches

2011-09-30 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-09-30 19:51:18 + (Fri, 30 Sep 2011)
New Revision: 15142

Added:
   branches/slashtime/
Log:
slashtime: add branches.



___
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] r15143 - trunk/slashtime/debian

2011-09-30 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-09-30 20:21:44 + (Fri, 30 Sep 2011)
New Revision: 15143

Modified:
   trunk/slashtime/debian/control
Log:
slashtime: It's Java build one package for all arch.

Modified: trunk/slashtime/debian/control
===
--- trunk/slashtime/debian/control  2011-09-30 19:51:18 UTC (rev 15142)
+++ trunk/slashtime/debian/control  2011-09-30 20:21:44 UTC (rev 15143)
@@ -11,7 +11,7 @@
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/slashtime/
 
 Package: slashtime
-Architecture: any
+Architecture: all
 Depends: default-jre | java6-runtime,
  libjava-gnome-java (= 4.1.1),
  ${misc:Depends}


___
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] jigsaw packaging branch, master, updated. b9530e7570ad7129cc257110036bf00a5287321c

2011-08-30 Thread Guillaume Mazoyer
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 jigsaw packaging.

The branch, master has been updated
   via  b9530e7570ad7129cc257110036bf00a5287321c (commit)
  from  53df146c92e398f00bfa6dad8e72c79dcd5f427d (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 b9530e7570ad7129cc257110036bf00a5287321c
Author: Guillaume Mazoyer respawne...@gmail.com
Date:   Tue Aug 30 13:54:14 2011 +0200

Support for multiarch (or something similar).

---

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

diff --git a/debian-wip/rules b/debian-wip/rules
index e0780de..efa93fa 100755
--- a/debian-wip/rules
+++ b/debian-wip/rules
@@ -1,9 +1,10 @@
 #!/usr/bin/make -f
 
-CPU = $(shell nproc)
+CPU= $(shell nproc)
+DEB_HOST_ARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH)
 
 export   LANG=C
-export   ALT_BOOTDIR=/usr/lib/jvm/java-7-openjdk
+export   ALT_BOOTDIR=/usr/lib/jvm/java-7-openjdk-$(DEB_HOST_ARCH)
 export   ALT_DROPS_DIR=$(CURDIR)
 export   PARALLEL_COMPILE_JOBS=$(CPU)
 export   ALT_PARALLEL_COMPILE_JOBS=$(CPU)


hooks/post-receive
-- 
jigsaw packaging

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


[SCM] jigsaw packaging branch, master, updated. 5e0769ad66a55d12e62fab944c003748ac58cee6

2011-08-24 Thread Guillaume Mazoyer
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 jigsaw packaging.

The branch, master has been updated
   via  5e0769ad66a55d12e62fab944c003748ac58cee6 (commit)
  from  1b36941265cbcf03aadb203be99765bfc8990641 (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 5e0769ad66a55d12e62fab944c003748ac58cee6
Author: Guillaume Mazoyer respawne...@gmail.com
Date:   Wed Aug 24 16:56:08 2011 +0200

Keep Alan Bateman patch as Debian patch.

---

Summary of changes:
 debian-wip/patches/06_alanb_mp_prototype.patch |  400 
 debian-wip/patches/series  |1 +
 jdk/src/share/bin/java.c   |   22 --
 .../classes/org/openjdk/jigsaw/ClassInfo.java  |7 -
 .../share/classes/org/openjdk/jigsaw/Launcher.java |   31 +--
 5 files changed, 409 insertions(+), 52 deletions(-)

diff --git a/debian-wip/patches/06_alanb_mp_prototype.patch 
b/debian-wip/patches/06_alanb_mp_prototype.patch
new file mode 100644
index 000..a4ecb7d
--- /dev/null
+++ b/debian-wip/patches/06_alanb_mp_prototype.patch
@@ -0,0 +1,400 @@
+## Description: Exploded modules and modules path.
+## Origin/Author: Alan Batemane
+## Bug: bug URL
+Index: jigsaw-1.8/jdk/src/share/bin/java.c
+===
+--- jigsaw-1.8.orig/jdk/src/share/bin/java.c   2011-08-24 15:55:11.807369204 
+0200
 jigsaw-1.8/jdk/src/share/bin/java.c2011-08-24 15:54:39.391208459 
+0200
+@@ -768,6 +768,22 @@
+ JLI_MemFree((char *) s);
+ }
+ 
++static void
++SetModulePath(const char *s)
++{
++char *def;
++size_t len;
++const char *orig = s;
++static const char format[] = -Djava.module.path=%s;
++len = sizeof(format) - 2 + JLI_StrLen(s); /* -2 == strlen(%s) */
++def = JLI_MemAlloc(len);
++JLI_Snprintf(def, len, format, s);
++AddOption(def, NULL);
++if (s != orig)
++JLI_MemFree((char *) s);
++}
++
++
+ /*
+  * Set the bootclasspath for installed modules.
+  * A temporary workaround until jigsaw legacy support is
+@@ -1101,6 +1117,12 @@
+ /* -classpath can only be set when running legacy mode */
+ mode = LM_CLASS;
+ argv++; --argc;
++} else if (JLI_StrCmp(arg, -modulepath) == 0 || JLI_StrCmp(arg, 
-mp) == 0) {
++ARG_CHECK (argc, ARG_ERROR1, arg);
++SetModulePath(*argv);
++/* -modulepath can only be set when running in module mode */
++mode = LM_MODULE;
++argv++; --argc;
+ } else if (JLI_StrCmp(arg, -jar) == 0) {
+ ARG_CHECK (argc, ARG_ERROR2, arg);
+ if (mode == LM_MODULE)
+Index: jigsaw-1.8/jdk/src/share/classes/org/openjdk/jigsaw/ClassInfo.java
+===
+--- jigsaw-1.8.orig/jdk/src/share/classes/org/openjdk/jigsaw/ClassInfo.java
2011-08-24 15:55:51.263564859 +0200
 jigsaw-1.8/jdk/src/share/classes/org/openjdk/jigsaw/ClassInfo.java 
2011-08-24 15:54:39.391208459 +0200
+@@ -363,6 +363,13 @@
+ }
+ return ci;
+ }
++
++static ClassInfo parse(byte[] buf) throws IOException {
++ClassInfo ci = new ClassInfo();
++ci.load(ByteBuffer.wrap(buf, 0, buf.length), /*path*/null);
++return ci;
++}
++
+ 
+ // ## Test
+ //
+Index: jigsaw-1.8/jdk/src/share/classes/org/openjdk/jigsaw/Launcher.java
+===
+--- jigsaw-1.8.orig/jdk/src/share/classes/org/openjdk/jigsaw/Launcher.java 
2011-08-24 15:55:51.595566505 +0200
 jigsaw-1.8/jdk/src/share/classes/org/openjdk/jigsaw/Launcher.java  
2011-08-24 15:54:39.395208479 +0200
+@@ -27,9 +27,6 @@
+ 
+ import java.io.*;
+ import java.lang.module.*;
+-import java.lang.reflect.*;
+-
+-import static org.openjdk.jigsaw.Trace.*;
+ 
+ 
+ public final class Launcher {
+@@ -43,8 +40,13 @@
+ private static Loader loadModule(File libPath, ModuleIdQuery midq)
+ throws IOException
+ {
+-
+ Library lb = SimpleLibrary.open(libPath, false);
++
++// interpose modulepath library if -modulepath set
++String mp = System.getProperty(java.module.path);
++if (mp != null)
++lb = ModulePathLibrary.open(mp, lb);
++
+ ModuleId mid = lb.findLatestModuleId(midq);
+ if (mid == null)
+ throw new Error(midq + : No installed module
+@@ -56,16 +58,29 @@
+ if (cn == null)
+ throw new Error(mid + : Module does not specify
+ +  a main class

[SCM] jigsaw packaging branch, master, updated. 53df146c92e398f00bfa6dad8e72c79dcd5f427d

2011-08-24 Thread Guillaume Mazoyer
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 jigsaw packaging.

The branch, master has been updated
   via  53df146c92e398f00bfa6dad8e72c79dcd5f427d (commit)
  from  5e0769ad66a55d12e62fab944c003748ac58cee6 (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 53df146c92e398f00bfa6dad8e72c79dcd5f427d
Author: Guillaume Mazoyer respawne...@gmail.com
Date:   Wed Aug 24 22:07:40 2011 +0200

Remove file created by alanb patch.

---

Summary of changes:
 .../org/openjdk/jigsaw/ModulePathLibrary.java  |  265 
 1 files changed, 0 insertions(+), 265 deletions(-)

diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/ModulePathLibrary.java 
b/jdk/src/share/classes/org/openjdk/jigsaw/ModulePathLibrary.java
deleted file mode 100644
index 7decae3..000
--- a/jdk/src/share/classes/org/openjdk/jigsaw/ModulePathLibrary.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the Classpath exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package org.openjdk.jigsaw;
-
-import java.lang.module.*;
-import java.util.*;
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.*;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.io.*;
-import java.security.CodeSigner;
-import java.security.SignatureException;
-
-/**
- * A simple read-only module library based on a module path as specified by the
- * -modulepath (-mp) option.
- */
-
-public final class ModulePathLibrary
-extends Library
-{
-private static final JigsawModuleSystem jms = 
JigsawModuleSystem.instance();
-
-private final Path root;
-private final Library parent;
-
-// mid - module-info bytes
-private final MapModuleId,byte[] modules;
-
-private ModulePathLibrary(String path, Library parent) throws IOException {
-this.root = FileSystems.getDefault().getPath(path);
-this.parent = parent;
-this.modules = new HashMap();
-
-// preload module info for each module
-try (DirectoryStreamPath stream = Files.newDirectoryStream(root)) {
-for (Path name: stream) {
-Path mipath = name.resolve(module-info.class);
-if (Files.exists(mipath)) { 
-byte[] bytes = Files.readAllBytes(mipath);
-ClassInfo ci = ClassInfo.parse(bytes);
-ModuleId mid = 
jms.parseModuleId(name.getFileName().toString(), 
- ci.moduleVersion());
-modules.put(mid, bytes);
-}
-}
-}
-}
-
-static ModulePathLibrary open(String path, Library parent) throws 
IOException {
-return new ModulePathLibrary(path, parent);
-}
-
-@Override
-public String name() {
-return root.toString();
-}
-
-@Override
-public Library parent() {
-return parent;
-}
-
-@Override
-public URI location() {
-return root.toUri();
-}
-
-@Override
-public int majorVersion() {
-return 1;
-}
-
-@Override
-public int minorVersion() {
-return 0;
-}
-
-@Override
-public byte[] readLocalModuleInfoBytes(ModuleId mid) {
-return modules.get(mid);
-}
-
-@Override
-public void gatherLocalModuleIds(String moduleName, SetModuleId mids) {
-if (moduleName == null) {
-mids.addAll(modules.keySet

[SCM] jigsaw packaging branch, master, updated. 1b36941265cbcf03aadb203be99765bfc8990641

2011-08-23 Thread Guillaume Mazoyer
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 jigsaw packaging.

The branch, master has been updated
   via  1b36941265cbcf03aadb203be99765bfc8990641 (commit)
  from  f70383b26fd5257c9a104dc8240ee4ff2e3287aa (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 1b36941265cbcf03aadb203be99765bfc8990641
Author: Guillaume Mazoyer respawne...@gmail.com
Date:   Wed Aug 24 00:33:12 2011 +0200

Remove useless file.

---

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

diff --git a/jigbuild b/jigbuild
deleted file mode 100644
index 1ce69f0..000
--- a/jigbuild
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-# jigbuild
-# jigsaw building script for upstream
-# Copyright Tom Marble
-# NOTE: this has bash but ONLY until we can convert to POSIX
-
-# done below
-# cpus=`grep ^processor /proc/cpuinfo | wc -l | awk '{print $1;}'`
-cpus=$(nproc)
-
-#export ALT_BINARY_PLUGS_PATH=${HOME}/src/jdk-7-ea-plug/openjdk-binary-plugs
-export LANG=C
-export ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk
-export PARALLEL_COMPILE_JOBS=$cpus
-export ALT_PARALLEL_COMPILE_JOBS=$cpus
-export HOTSPOT_BUILD_JOBS=$cpus
-export NO_DOCS=true
-
-#generic=jdk/make/jdk_generic_profile.sh
-#if [ -f $generic ]; then
-#  . jdk/make/jdk_generic_profile.sh
-#else
-#  echo error: could not read $generic
-#fi
-
-
-
-


hooks/post-receive
-- 
jigsaw packaging

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


[SCM] jigsaw packaging branch, master, updated. e395a48ce8b3a15417bb418d6a3dfc8b3a690cd0

2011-08-22 Thread Guillaume Mazoyer
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 jigsaw packaging.

The branch, master has been updated
   via  e395a48ce8b3a15417bb418d6a3dfc8b3a690cd0 (commit)
  from  4b9c4397ce1fd586476fd184e7113aa3b97bd5c7 (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 e395a48ce8b3a15417bb418d6a3dfc8b3a690cd0
Author: Guillaume Mazoyer respawne...@gmail.com
Date:   Mon Aug 22 15:10:13 2011 +0200

Add script to download external sources.

---

Summary of changes:
 debian-wip/download-external-sources.sh |   18 ++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/debian-wip/download-external-sources.sh 
b/debian-wip/download-external-sources.sh
new file mode 100644
index 000..aaa6a8d
--- /dev/null
+++ b/debian-wip/download-external-sources.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+download_src() {
+if [ $# -ne 2 ]; then
+exit 1
+fi
+
+url=$(grep ${2}_src.master.bundle.url.base ${1}/${1}.properties | \
+  cut -d '=' -f2)
+zip=$(grep ${2}_src.bundle.name ${1}/${1}.properties | \
+  cut -d '=' -f2)
+
+wget --no-check-certificate ${url}/${zip}
+}
+
+download_src jaxp  jaxp
+download_src jaxws jaxws
+download_src jaxws jaf


hooks/post-receive
-- 
jigsaw packaging

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


[SCM] jigsaw packaging branch, master, updated. 0ddad19c4cfeb6633856f00d0553c7e1d80b11ad

2011-08-21 Thread Guillaume Mazoyer
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 jigsaw packaging.

The branch, master has been updated
   via  0ddad19c4cfeb6633856f00d0553c7e1d80b11ad (commit)
   via  bf71b556ca1191470c4ce608953265e70c5925b0 (commit)
  from  da9a21503954aec806443d8076992def8a77e8e4 (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 0ddad19c4cfeb6633856f00d0553c7e1d80b11ad
Author: Guillaume Mazoyer respawne...@gmail.com
Date:   Sun Aug 21 16:08:58 2011 +0200

Also replace OpenJDK 6 dependency by OpenJDK 7.

commit bf71b556ca1191470c4ce608953265e70c5925b0
Author: Guillaume Mazoyer respawne...@gmail.com
Date:   Sun Aug 21 15:58:28 2011 +0200

Check that we use OpenJDK 7 to build Jigsaw.

---

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

diff --git a/debian-wip/control b/debian-wip/control
index ecbf370..fdf06ba 100644
--- a/debian-wip/control
+++ b/debian-wip/control
@@ -39,7 +39,7 @@ Build-Depends: ant,
m4,
mauve,
metacity | twm,
-   openjdk-6-jdk (= 6b18),
+   openjdk-7-jdk,
pkg-config,
procps,
rhino (= 1.7R3~),
diff --git a/debian-wip/rules b/debian-wip/rules
index 29d95db..76bebc1 100755
--- a/debian-wip/rules
+++ b/debian-wip/rules
@@ -13,6 +13,8 @@ unexport LD_LIBRARY_PATH
 
 dh_override_auto_configure:
$(MAKE) sanity
+   java -version 21 | grep java -version \1.7 ; \
+   if [ $$? -eq 1 ] ; then echo OpenJDK 7 needed to build ; exit 1 ; fi
 
 dh_override_auto_build:
$(MAKE) all


hooks/post-receive
-- 
jigsaw packaging

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


[SCM] jigsaw packaging branch, master, updated. 846dca94e2a9fe6e230352a20af18f1d7f5be8d0

2011-08-21 Thread Guillaume Mazoyer
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 jigsaw packaging.

The branch, master has been updated
   via  846dca94e2a9fe6e230352a20af18f1d7f5be8d0 (commit)
  from  0ddad19c4cfeb6633856f00d0553c7e1d80b11ad (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 846dca94e2a9fe6e230352a20af18f1d7f5be8d0
Author: Guillaume Mazoyer respawne...@gmail.com
Date:   Mon Aug 22 00:56:18 2011 +0200

Maybe we should use OpenJDK 7 as BOOTDIR...

---

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

diff --git a/debian-wip/rules b/debian-wip/rules
index 76bebc1..2efb8a6 100755
--- a/debian-wip/rules
+++ b/debian-wip/rules
@@ -3,7 +3,7 @@
 CPU = $(shell nproc)
 
 export   LANG=C
-export   ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk
+export   ALT_BOOTDIR=/usr/lib/jvm/java-7-openjdk
 export   ALT_DROPS_DIR=$(CURDIR)/build
 export   PARALLEL_COMPILE_JOBS=$(CPU)
 export   ALT_PARALLEL_COMPILE_JOBS=$(CPU)


hooks/post-receive
-- 
jigsaw packaging

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


[SCM] jigsaw packaging branch, master, updated. 4b9c4397ce1fd586476fd184e7113aa3b97bd5c7

2011-08-21 Thread Guillaume Mazoyer
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 jigsaw packaging.

The branch, master has been updated
   via  4b9c4397ce1fd586476fd184e7113aa3b97bd5c7 (commit)
  from  846dca94e2a9fe6e230352a20af18f1d7f5be8d0 (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 4b9c4397ce1fd586476fd184e7113aa3b97bd5c7
Author: Guillaume Mazoyer respawne...@gmail.com
Date:   Mon Aug 22 02:02:21 2011 +0200

The build directory doesn't exist in the tree.

---

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

diff --git a/debian-wip/rules b/debian-wip/rules
index 2efb8a6..e0780de 100755
--- a/debian-wip/rules
+++ b/debian-wip/rules
@@ -4,7 +4,7 @@ CPU = $(shell nproc)
 
 export   LANG=C
 export   ALT_BOOTDIR=/usr/lib/jvm/java-7-openjdk
-export   ALT_DROPS_DIR=$(CURDIR)/build
+export   ALT_DROPS_DIR=$(CURDIR)
 export   PARALLEL_COMPILE_JOBS=$(CPU)
 export   ALT_PARALLEL_COMPILE_JOBS=$(CPU)
 export   HOTSPOT_BUILD_JOBS=$(CPU)


hooks/post-receive
-- 
jigsaw packaging

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


[SCM] jigsaw packaging branch, master, updated. c0b1a71ca30c907278b5b7f0a5a1b412a997982a

2011-08-18 Thread Guillaume Mazoyer
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 jigsaw packaging.

The branch, master has been updated
   via  c0b1a71ca30c907278b5b7f0a5a1b412a997982a (commit)
  from  da187a22239cbb6674327671daf280dedb3dd16d (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 c0b1a71ca30c907278b5b7f0a5a1b412a997982a
Author: Guillaume Mazoyer respawne...@gmail.com
Date:   Thu Aug 18 14:59:43 2011 +0200

More work on the debian-wip directory.
Add some patches for tests.
Add some missing build dependencies.

---

Summary of changes:
 debian-wip/control   |4 +-
 debian-wip/patches/02_jtreg_binary.patch |   68 ++
 debian-wip/patches/03_hosts_tests.patch  |   67 +
 debian-wip/patches/04_junit_jar.patch|   17 +++
 debian-wip/patches/series|3 +
 debian-wip/rules |3 +
 6 files changed, 161 insertions(+), 1 deletions(-)

diff --git a/debian-wip/control b/debian-wip/control
index 4b1d7ab..ecbf370 100644
--- a/debian-wip/control
+++ b/debian-wip/control
@@ -9,10 +9,12 @@ Build-Depends: ant,
autotools-dev,
cpio,
dbus-x11 | twm,
-   debhelper (= 5),
+   debhelper (= 7.0.50~),
fastjar (= 2:0.96-0ubuntu2),
g++-4.6,
gawk,
+   jtreg,
+   junit,
libasound2-dev,
libcups2-dev,
libffi-dev,
diff --git a/debian-wip/patches/02_jtreg_binary.patch 
b/debian-wip/patches/02_jtreg_binary.patch
new file mode 100644
index 000..9d3697c
--- /dev/null
+++ b/debian-wip/patches/02_jtreg_binary.patch
@@ -0,0 +1,68 @@
+## Description: Fix path to the jtreg and jtdiff binaries
+## Origin/Author: Guillaume Mazoyer
+## Bug: bug URL
+Index: jigsaw-1.8/hotspot/test/Makefile
+===
+--- jigsaw-1.8.orig/hotspot/test/Makefile  2011-08-18 14:07:19.855046528 
+0200
 jigsaw-1.8/hotspot/test/Makefile   2011-08-18 14:04:58.386345027 +0200
+@@ -137,7 +137,7 @@
+ # jtreg tests
+ 
+ # Expect JT_HOME to be set for jtreg tests. (home for jtreg)
+-JT_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
++JT_HOME = /usr
+ ifdef JPRT_JTREG_HOME
+   JT_HOME = $(JPRT_JTREG_HOME)
+ endif
+@@ -149,7 +149,7 @@
+ endif
+ 
+ # Default JTREG to run (win32 script works for everybody)
+-JTREG = $(JT_HOME)/win32/bin/jtreg
++JTREG = $(JT_HOME)/bin/jtreg
+ 
+ # Option to tell jtreg to not run tests marked with ignore
+ ifeq ($(PLATFORM), windows)
+Index: jigsaw-1.8/jdk/test/Makefile
+===
+--- jigsaw-1.8.orig/jdk/test/Makefile  2011-08-18 14:07:03.658966216 +0200
 jigsaw-1.8/jdk/test/Makefile   2011-08-18 14:05:17.546440023 +0200
+@@ -353,7 +353,7 @@
+ 
+ # Expect JT_HOME to be set for jtreg tests. (home for jtreg)
+ ifndef JT_HOME
+-  JT_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
++  JT_HOME = /usr
+   ifdef JPRT_JTREG_HOME
+ JT_HOME = $(JPRT_JTREG_HOME)
+   endif
+@@ -634,7 +634,7 @@
+ # --
+ 
+ # Default JTREG to run (win32 script works for everybody)
+-JTREG = $(JT_HOME)/win32/bin/jtreg
++JTREG = $(JT_HOME)/bin/jtreg
+ # Add any extra options (samevm etc.)
+ JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
+ # Only run automatic tests
+Index: jigsaw-1.8/langtools/test/Makefile
+===
+--- jigsaw-1.8.orig/langtools/test/Makefile2011-08-18 14:05:53.850620057 
+0200
 jigsaw-1.8/langtools/test/Makefile 2011-08-18 14:03:18.213848295 +0200
+@@ -69,13 +69,9 @@
+ endif
+ 
+ # Default JTREG to run
+-ifdef JPRT_JTREG_HOME
+-  JTREG_HOME = $(JPRT_JTREG_HOME)
+-else
+-  JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
+-endif
+-JTREG = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtreg
+-JTDIFF = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtdiff
++JTREG_HOME = /usr
++JTREG = $(JTREG_HOME)/bin/jtreg
++JTDIFF = $(JTREG_HOME)/bin/jtdiff
+ 
+ # Default JCK to run
+ ifdef JPRT_JCK_HOME
diff --git a/debian-wip/patches/03_hosts_tests.patch 
b/debian-wip/patches/03_hosts_tests.patch
new file mode 100644
index 000..4219efa
--- /dev/null
+++ b/debian-wip/patches/03_hosts_tests.patch
@@ -0,0 +1,67 @@
+## Description: Change hosts to reach during the tests
+## Origin/Author: Guillaume Mazoyer (based on IcedTea)
+## Bug: bug URL
+Index: jigsaw-1.8/jdk/test/java/net/InetAddress/ptr/lookup.sh

[SCM] jigsaw packaging branch, master, updated. da187a22239cbb6674327671daf280dedb3dd16d

2011-08-18 Thread Guillaume Mazoyer
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 jigsaw packaging.

The branch, master has been updated
   via  da187a22239cbb6674327671daf280dedb3dd16d (commit)
  from  6a1ea0ecddcbe6d0f757018b73aa2d20fe9f7bed (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 da187a22239cbb6674327671daf280dedb3dd16d
Author: Guillaume Mazoyer respawne...@gmail.com
Date:   Thu Aug 18 13:51:05 2011 +0200

New debian directory (work in progress).

---

Summary of changes:
 debian-wip/changelog   |5 +
 debian-wip/compat  |1 +
 debian-wip/control |  540 
 debian-wip/copyright   |   36 ++
 debian-wip/docs|2 +
 .../jigsaw-deprecated.tools.install|0
 debian-wip/jigsaw-doc.docs |1 +
 debian-wip/jigsaw-doc.install  |1 +
 .../jigsaw-jdk.advanced.install|0
 .../jigsaw-jdk.apt.install |0
 .../jigsaw-jdk.base.install|0
 .../jigsaw-jdk.boot.install|0
 .../jigsaw-jdk.compiler.install|0
 .../jigsaw-jdk.corba.install   |0
 .../jigsaw-jdk.deploy.install  |0
 .../jigsaw-jdk.desktop.install |0
 .../jigsaw-jdk.ext.install |0
 .../jigsaw-jdk.install |0
 .../jigsaw-jdk.jaas.install|0
 .../jigsaw-jdk.javac.install   |0
 .../jigsaw-jdk.javadoc.install |0
 .../jigsaw-jdk.javah.install   |0
 .../jigsaw-jdk.javap.install   |0
 .../jigsaw-jdk.jaxp.install|0
 .../jigsaw-jdk.jaxws.install   |0
 .../jigsaw-jdk.jdbc.install|0
 .../jigsaw-jdk.jndi.install|0
 .../jigsaw-jdk.jre.install |0
 .../jigsaw-jdk.jsse.install|0
 .../jigsaw-jdk.jta.install |0
 .../jigsaw-jdk.jx.annotations.install  |0
 .../jigsaw-jdk.kerberos.install|0
 .../jigsaw-jdk.logging.install |0
 .../jigsaw-jdk.management.install  |0
 .../jigsaw-jdk.mirror.install  |0
 .../jigsaw-jdk.rmi.install |0
 .../jigsaw-jdk.scripting.install   |0
 .../jigsaw-jdk.security.acl.install|0
 .../jigsaw-jdk.smartcardio.install |0
 .../jigsaw-jdk.sunjce.install  |0
 .../jigsaw-jdk.sunpkcs11.install   |0
 .../jigsaw-jdk.tools.base.install  |0
 .../jigsaw-jdk.tools.install   |0
 .../jigsaw-jdk.tools.jaxws.install |0
 .../jigsaw-jdk.tools.jre.install   |0
 .../jigsaw-jdk.xmldsig.install |0
 .../jigsaw-sun.charsets.install|0
 .../jigsaw-sun.compat.install  |0
 .../jigsaw-sun.corba.install   |0
 .../jigsaw-sun.desktop.install |0
 .../jigsaw-sun.jaas.install|0
 .../jigsaw-sun.jaxp.install|0
 .../jigsaw-sun.jdbc.install|0
 .../jigsaw-sun.jndi.install|0
 .../jigsaw-sun.jsse.install|0
 .../jigsaw-sun.jta.install |0
 .../jigsaw-sun.kerberos.install|0
 .../jigsaw-sun.localedata.install  |0
 .../jigsaw-sun.logging.install |0
 .../jigsaw-sun.management.install  |0
 .../jigsaw-sun.resources.install   |0
 .../jigsaw-sun.rmi.install |0
 .../jigsaw-sun.security.acl.install|0
 .../jigsaw-sun.sunec.install   |0
 debian-wip/patches/01_jpkg_fix.patch   |   16 +
 debian-wip/patches/series  |1 +
 debian-wip/rules   |   22 +
 debian-wip/source/format   |1 +
 68 files changed, 626 insertions(+), 0 deletions(-)

diff --git a/debian-wip/changelog b/debian-wip

[SCM] jigsaw packaging branch, master, updated. e91cc6538f3dc1777a5fcbc4a3f6adf9055a345f

2011-08-18 Thread Guillaume Mazoyer
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 jigsaw packaging.

The branch, master has been updated
   via  e91cc6538f3dc1777a5fcbc4a3f6adf9055a345f (commit)
  from  c0b1a71ca30c907278b5b7f0a5a1b412a997982a (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 e91cc6538f3dc1777a5fcbc4a3f6adf9055a345f
Author: Guillaume Mazoyer respawne...@gmail.com
Date:   Fri Aug 19 01:21:26 2011 +0200

Patch to disable some failing tests.

---

Summary of changes:
 debian-wip/patches/05_disable_tests.patch |   28 
 debian-wip/patches/series |1 +
 2 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/debian-wip/patches/05_disable_tests.patch 
b/debian-wip/patches/05_disable_tests.patch
new file mode 100644
index 000..a50675a
--- /dev/null
+++ b/debian-wip/patches/05_disable_tests.patch
@@ -0,0 +1,28 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: jigsaw-1.8/jdk/test/ProblemList.txt
+===
+--- jigsaw-1.8.orig/jdk/test/ProblemList.txt   2011-08-19 00:54:49.747692737 
+0200
 jigsaw-1.8/jdk/test/ProblemList.txt2011-08-19 00:53:42.531359431 
+0200
+@@ -713,3 +713,20 @@
+ 
+ 
+ 
++# Tests failing during Debian build package process
++
++java/lang/invoke/ClassValueTest.java  generic-all
++java/lang/invoke/InvokeGenericTest.java   
generic-all
++java/lang/invoke/JavaDocExamplesTest.java generic-all
++java/lang/invoke/MethodHandlesTest.java   
generic-all
++java/lang/invoke/MethodTypeTest.java  generic-all
++java/lang/invoke/RicochetTest.javageneric-all
++javax/management/remote/mandatory/connection/RMIConnectionIdTest.java 
generic-all
++java/nio/channels/DatagramChannel/Connect.java
generic-all
++java/nio/channels/DatagramChannel/ConnectedSend.java  generic-all
++java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 
generic-all
++sun/security/krb5/auto/BadKdc1.java   generic-all
++com/sun/jdi/ExceptionEvents.java  generic-all
++sun/tools/jinfo/Basic.sh  generic-all
++tools/launcher/ExecutionEnvironment.java  generic-all
++tools/launcher/VersionCheck.java  generic-all
diff --git a/debian-wip/patches/series b/debian-wip/patches/series
index 5ef4e32..2c0d4a7 100644
--- a/debian-wip/patches/series
+++ b/debian-wip/patches/series
@@ -2,3 +2,4 @@
 02_jtreg_binary.patch
 03_hosts_tests.patch
 04_junit_jar.patch
+05_disable_tests.patch


hooks/post-receive
-- 
jigsaw packaging

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


[SCM] jigsaw packaging branch, master, updated. da9a21503954aec806443d8076992def8a77e8e4

2011-08-18 Thread Guillaume Mazoyer
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 jigsaw packaging.

The branch, master has been updated
   via  da9a21503954aec806443d8076992def8a77e8e4 (commit)
  from  e91cc6538f3dc1777a5fcbc4a3f6adf9055a345f (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 da9a21503954aec806443d8076992def8a77e8e4
Author: Guillaume Mazoyer respawne...@gmail.com
Date:   Fri Aug 19 01:23:35 2011 +0200

Edit the header of the last commited patch.

---

Summary of changes:
 debian-wip/patches/05_disable_tests.patch |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian-wip/patches/05_disable_tests.patch 
b/debian-wip/patches/05_disable_tests.patch
index a50675a..28fe034 100644
--- a/debian-wip/patches/05_disable_tests.patch
+++ b/debian-wip/patches/05_disable_tests.patch
@@ -1,5 +1,5 @@
-## Description: add some description
-## Origin/Author: add some origin or author
+## Description: Disable failing tests
+## Origin/Author: Guillaume Mazoyer
 ## Bug: bug URL
 Index: jigsaw-1.8/jdk/test/ProblemList.txt
 ===


hooks/post-receive
-- 
jigsaw packaging

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


[pkg-java] r14062 - in trunk/gnome-split/debian: . patches

2011-08-07 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-08-07 17:56:17 + (Sun, 07 Aug 2011)
New Revision: 14062

Added:
   trunk/gnome-split/debian/patches/02_makefile.patch
Removed:
   trunk/gnome-split/debian/patches/02_manpage.patch
Modified:
   trunk/gnome-split/debian/changelog
   trunk/gnome-split/debian/control
   trunk/gnome-split/debian/patches/series
   trunk/gnome-split/debian/rules
Log:
gnome-split: New upstream release + bug fixes.

Modified: trunk/gnome-split/debian/changelog
===
--- trunk/gnome-split/debian/changelog  2011-08-07 16:59:52 UTC (rev 14061)
+++ trunk/gnome-split/debian/changelog  2011-08-07 17:56:17 UTC (rev 14062)
@@ -1,3 +1,12 @@
+gnome-split (1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build against java-gnome 4.1.1.
+  * debian/rules: Fix launcher script to use /usr/lib/jni.
+  * debian/patches/02_makefile.patch: Fix makefile rule for mime type.
+
+ -- Guillaume Mazoyer respawne...@gmail.com  Sun, 07 Aug 2011 18:26:09 +0200
+
 gnome-split (0.7-1) unstable; urgency=low
 
   * Initial release (Closes: #636253)

Modified: trunk/gnome-split/debian/control
===
--- trunk/gnome-split/debian/control2011-08-07 16:59:52 UTC (rev 14061)
+++ trunk/gnome-split/debian/control2011-08-07 17:56:17 UTC (rev 14062)
@@ -3,11 +3,10 @@
 Priority: optional
 Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
 Uploaders: Guillaume Mazoyer respawne...@gmail.com
-Build-Depends: autotools-dev,
-   debhelper (= 7),
+Build-Depends: debhelper (= 7.0.50~),
default-jdk,
libdbus-java,
-   libjava-gnome-java (= 4.0.15)
+   libjava-gnome-java (= 4.1.1)
 Standards-Version: 3.9.2
 Homepage: http://gnome-split.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/gnome-split/
@@ -16,7 +15,7 @@
 Architecture: all
 Depends: default-jre | java6-runtime,
  libdbus-java,
- libjava-gnome-java (= 4.0.15),
+ libjava-gnome-java (= 4.1.1),
  ${misc:Depends}
 Description: GNOME Split - File splitter for GNOME desktop
  Tool that allows you to split files and merge them back. It is written in Java

Added: trunk/gnome-split/debian/patches/02_makefile.patch
===
--- trunk/gnome-split/debian/patches/02_makefile.patch  
(rev 0)
+++ trunk/gnome-split/debian/patches/02_makefile.patch  2011-08-07 17:56:17 UTC 
(rev 14062)
@@ -0,0 +1,18 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: gnome-split-1.1/Makefile
+===
+--- gnome-split-1.1.orig/Makefile  2011-08-07 19:44:07.470699167 +0200
 gnome-split-1.1/Makefile   2011-08-07 19:44:05.906691418 +0200
+@@ -97,6 +97,10 @@
+   @/bin/echo -e MKDIR\t$@/
+   -mkdir -p $@
+ 
++$(DESTDIR)$(PREFIX)/share/mime/packages:
++  @/bin/echo -e MKDIR\t$@/
++  -mkdir -p $@
++
+ $(DESTDIR)$(PREFIX)/bin/gnome-split: \
+   $(DESTDIR)$(PREFIX)/bin \
+   tmp/launcher/gnome-split-install

Deleted: trunk/gnome-split/debian/patches/02_manpage.patch
===
--- trunk/gnome-split/debian/patches/02_manpage.patch   2011-08-07 16:59:52 UTC 
(rev 14061)
+++ trunk/gnome-split/debian/patches/02_manpage.patch   2011-08-07 17:56:17 UTC 
(rev 14062)
@@ -1,29 +0,0 @@
-## Description: add some description
-## Origin/Author: add some origin or author
-## Bug: bug URL
-Index: gnome-split-0.7/gnome-split.1
-===
 /dev/null  1970-01-01 00:00:00.0 +
-+++ gnome-split-0.7/gnome-split.1  2011-08-02 21:26:29.233121415 +0200
-@@ -0,0 +1,21 @@
-+.TH man 1 August 2011 GNOME Split 0.7 GNOME Split manpage
-+.SH NAME
-+GNOME Split \- File splitter for GNOME desktop
-+.SH SYNOPSIS
-+gnome-split [OPTION] [FILE]
-+.SH DESCRIPTION
-+GNOME Split is a tool that allows you to split files and merge them back. It 
is
-+written in Java and uses a GTK+ user interface (thanks to the java-gnome
-+project). The goal is to offer a native implementation of similar projects 
which
-+can handle multiple file formats (e.g. Xtremsplit).
-+.SH OPTIONS
-+.TP
-+\fB\-s\fR, \fB\-\-split\fR
-+display the split view
-+.TP
-+\fB\-m\fR, \fB\-\-merge\fR
-+display the merge view
-+.SH BUGS
-+Oh right, just go check them https://bugs.launchpad.net/gnome-split
-+.SH AUTHOR
-+Written by Guillaume Mazoyer

Modified: trunk/gnome-split/debian/patches/series
===
--- trunk/gnome-split/debian/patches/series 2011-08-07 16:59:52 UTC (rev 
14061)
+++ trunk/gnome-split/debian/patches/series 2011-08-07 17:56:17 UTC (rev 
14062)
@@ -1,2 +1,2

Bug#630285: java-gnome: Please transition to libnotify 0.7

2011-08-04 Thread Guillaume Mazoyer
Looks like java-gnome 4.1.1 is buildable in unstable and testing once
libnotify 0.7 will be in them.


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#630285: java-gnome: Please transition to libnotify 0.7

2011-08-02 Thread Guillaume Mazoyer
This bug is fixed upstream in 4.1.1 (which is in experimental).
What can I do to fix it in sid?
If I patch the the current package it will not build until the
transition is done. Sadly, 4.1.1 cannot be migrated to sid because it
depends on gtk3.

What is the best way to fix this bug?


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] r13900 - in trunk: . gnome-split gnome-split/debian gnome-split/debian/patches gnome-split/debian/source

2011-08-02 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-08-02 19:38:24 + (Tue, 02 Aug 2011)
New Revision: 13900

Added:
   trunk/gnome-split/
   trunk/gnome-split/debian/
   trunk/gnome-split/debian/changelog
   trunk/gnome-split/debian/compat
   trunk/gnome-split/debian/control
   trunk/gnome-split/debian/copyright
   trunk/gnome-split/debian/docs
   trunk/gnome-split/debian/gnome-split.manpages
   trunk/gnome-split/debian/patches/
   trunk/gnome-split/debian/patches/01_manifest_main_class.patch
   trunk/gnome-split/debian/patches/02_manpage.patch
   trunk/gnome-split/debian/patches/series
   trunk/gnome-split/debian/rules
   trunk/gnome-split/debian/source/
   trunk/gnome-split/debian/source/format
   trunk/gnome-split/debian/watch
Log:
Add gnome-split project.


Added: trunk/gnome-split/debian/changelog
===
--- trunk/gnome-split/debian/changelog  (rev 0)
+++ trunk/gnome-split/debian/changelog  2011-08-02 19:38:24 UTC (rev 13900)
@@ -0,0 +1,5 @@
+gnome-split (0.7-1) unstable; urgency=low
+
+  * Initial release (Closes: #636253)
+
+ -- Guillaume Mazoyer respawne...@gmail.com  Mon, 01 Aug 2011 22:36:41 +0200

Added: trunk/gnome-split/debian/compat
===
--- trunk/gnome-split/debian/compat (rev 0)
+++ trunk/gnome-split/debian/compat 2011-08-02 19:38:24 UTC (rev 13900)
@@ -0,0 +1 @@
+5

Added: trunk/gnome-split/debian/control
===
--- trunk/gnome-split/debian/control(rev 0)
+++ trunk/gnome-split/debian/control2011-08-02 19:38:24 UTC (rev 13900)
@@ -0,0 +1,23 @@
+Source: gnome-split
+Section: gnome
+Priority: optional
+Maintainer: Guillaume Mazoyer respawne...@gmail.com
+Build-Depends: autotools-dev,
+   debhelper (= 7),
+   default-jdk,
+   libdbus-java,
+   libjava-gnome-java (= 4.0.15)
+Standards-Version: 3.9.2
+Homepage: http://gnome-split.org/
+
+Package: gnome-split
+Architecture: all
+Depends: default-jre | java6-runtime,
+ libdbus-java,
+ libjava-gnome-java (= 4.0.15),
+ ${misc:Depends}
+Description: GNOME Split - File splitter for GNOME desktop
+ Tool that allows you to split files and merge them back. It is written in Java
+ and uses a GTK+ user interface (thanks to the java-gnome project). The goal is
+ to offer a native implementation of similar projects which can handle multiple
+ file formats (e.g. Xtremsplit).

Added: trunk/gnome-split/debian/copyright
===
--- trunk/gnome-split/debian/copyright  (rev 0)
+++ trunk/gnome-split/debian/copyright  2011-08-02 19:38:24 UTC (rev 13900)
@@ -0,0 +1,34 @@
+This package was debianized by Guillaume Mazoyer respawne...@gmail.com on
+Tue, 01 Aug 2011 22:19:08 +0200.
+
+It was downloaded from http://gnome-split.org/releases/
+
+Upstream Author(s):
+
+Guillaume Mazoyer respawne...@gmail.com
+
+Copyright:
+
+Copyright (C) 2009-2011 Guillaume Mazoyer respawne...@gmail.com
+
+License:
+
+GNOME Split is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNOME Split is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNOME Split.  If not, see http://www.gnu.org/licenses/.
+
+The Debian packaging is:
+
+Copyright (C) 2011 Guillaume Mazoyer respawne...@gmail.com
+
+and is licensed under the GPL version 3,
+see `/usr/share/common-licenses/GPL-3'.

Added: trunk/gnome-split/debian/docs
===
--- trunk/gnome-split/debian/docs   (rev 0)
+++ trunk/gnome-split/debian/docs   2011-08-02 19:38:24 UTC (rev 13900)
@@ -0,0 +1,2 @@
+README
+NEWS

Added: trunk/gnome-split/debian/gnome-split.manpages
===
--- trunk/gnome-split/debian/gnome-split.manpages   
(rev 0)
+++ trunk/gnome-split/debian/gnome-split.manpages   2011-08-02 19:38:24 UTC 
(rev 13900)
@@ -0,0 +1 @@
+gnome-split.1

Added: trunk/gnome-split/debian/patches/01_manifest_main_class.patch
===
--- trunk/gnome-split/debian/patches/01_manifest_main_class.patch   
(rev 0)
+++ trunk/gnome-split/debian/patches/01_manifest_main_class.patch   
2011-08-02 19:38:24

[pkg-java] r13901 - tags

2011-08-02 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-08-02 19:39:41 + (Tue, 02 Aug 2011)
New Revision: 13901

Added:
   tags/gnome-split/
Log:
Add tags for gnome-split.



___
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] r13902 - branches

2011-08-02 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-08-02 19:40:23 + (Tue, 02 Aug 2011)
New Revision: 13902

Added:
   branches/gnome-split/
Log:
Add branches for gnome-split.



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


RFS: gnome-split 0.7-1 (new)

2011-08-02 Thread Guillaume Mazoyer
Hi Team

I am looking for a sponsor for my new package gnome-split.

* Package name: gnome-split
  Version : 0.7-1
* URL : http://gnome-split.org/
* License : GPLv3
  Section : gnome

The package appears to be lintian clean.
The upload would fix this bug: http://bugs.debian.org/636253

My motivation for maintaining this package is that it is my application
(I'm upstream). It is not the latest available version but it is the
latest version that can be build in sid.

I have uploaded to svn.debian.org:
 - svn+ssh://svn.debian.org/svn/pkg-java/trunk/gnome-split

It would be great if someone could review and upload this package for
me.

Thank you.

--

Guillaume Mazoyer


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] r13898 - in trunk/libjtharness-java/debian: . patches

2011-08-01 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-08-01 16:53:24 + (Mon, 01 Aug 2011)
New Revision: 13898

Added:
   trunk/libjtharness-java/debian/patches/01_imports.patch
   trunk/libjtharness-java/debian/patches/02_dependencies.patch
Removed:
   trunk/libjtharness-java/debian/patches/dependencies.diff
   trunk/libjtharness-java/debian/patches/rxtx.diff
Modified:
   trunk/libjtharness-java/debian/changelog
   trunk/libjtharness-java/debian/control
   trunk/libjtharness-java/debian/patches/series
Log:
jtharness: New upstream release, updated patches.

Modified: trunk/libjtharness-java/debian/changelog
===
--- trunk/libjtharness-java/debian/changelog2011-07-30 13:40:58 UTC (rev 
13897)
+++ trunk/libjtharness-java/debian/changelog2011-08-01 16:53:24 UTC (rev 
13898)
@@ -1,3 +1,12 @@
+jtharness (4.4.0-MR1-Rel-b19-1) unstable; urgency=low
+
+  * New upstream relase.
+  * debian/control: Add Vcs-Svn field.
+  * debian/patches/01_imports.patch: Update patch.
+  * debian/patches/02_dependencies.patch: Update patch.
+
+ -- Guillaume Mazoyer respawne...@gmail.com  Mon, 01 Aug 2011 17:45:44 +0200
+
 jtharness (4.3.0-MR1-Rel-b23-1) unstable; urgency=low
 
   * Initial release (Closes: #628857).

Modified: trunk/libjtharness-java/debian/control
===
--- trunk/libjtharness-java/debian/control  2011-07-30 13:40:58 UTC (rev 
13897)
+++ trunk/libjtharness-java/debian/control  2011-08-01 16:53:24 UTC (rev 
13898)
@@ -14,6 +14,7 @@
  libservlet3.0-java
 Standards-Version: 3.9.2
 Homepage: http://jtharness.java.net/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjtharness/
 
 Package: libjtharness-java
 Architecture: all

Added: trunk/libjtharness-java/debian/patches/01_imports.patch
===
--- trunk/libjtharness-java/debian/patches/01_imports.patch 
(rev 0)
+++ trunk/libjtharness-java/debian/patches/01_imports.patch 2011-08-01 
16:53:24 UTC (rev 13898)
@@ -0,0 +1,75 @@
+## Description: Replace imports.
+## Origin/Author: Tom Marble
+## Bug: bug URL
+Index: 
jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest/agent/SerialPortAgentCommand.java
+===
+--- 
jtharness-4.4.0-MR1-Rel-b19.orig/src/com/sun/javatest/agent/SerialPortAgentCommand.java
2011-08-01 18:16:11.692070426 +0200
 
jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest/agent/SerialPortAgentCommand.java
 2011-08-01 18:13:11.619177489 +0200
+@@ -28,8 +28,8 @@
+ 
+ import java.io.IOException;
+ import java.io.PrintWriter;
+-import javax.comm.NoSuchPortException;
+-import javax.comm.PortInUseException;
++import gnu.io.NoSuchPortException;
++import gnu.io.PortInUseException;
+ 
+ import com.sun.javatest.Command;
+ import com.sun.javatest.ProductInfo;
+Index: 
jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest/agent/SerialPortConnection.java
+===
+--- 
jtharness-4.4.0-MR1-Rel-b19.orig/src/com/sun/javatest/agent/SerialPortConnection.java
  2011-08-01 18:16:11.824071075 +0200
 
jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest/agent/SerialPortConnection.java
   2011-08-01 18:15:32.479875987 +0200
+@@ -31,13 +31,13 @@
+ import java.io.InputStream;
+ import java.io.OutputStream;
+ import java.util.TooManyListenersException;
+-import javax.comm.CommPortIdentifier;
+-import javax.comm.NoSuchPortException;
+-import javax.comm.PortInUseException;
+-import javax.comm.SerialPort;
+-import javax.comm.SerialPortEvent;
+-import javax.comm.SerialPortEventListener;
+-import javax.comm.UnsupportedCommOperationException;
++import gnu.io.CommPortIdentifier;
++import gnu.io.NoSuchPortException;
++import gnu.io.PortInUseException;
++import gnu.io.SerialPort;
++import gnu.io.SerialPortEvent;
++import gnu.io.SerialPortEventListener;
++import gnu.io.UnsupportedCommOperationException;
+ 
+ /** 
+  * A connection via a serial port.
+Index: 
jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest/agent/SerialPortConnectionFactory.java
+===
+--- 
jtharness-4.4.0-MR1-Rel-b19.orig/src/com/sun/javatest/agent/SerialPortConnectionFactory.java
   2011-08-01 18:16:12.188072889 +0200
 
jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest/agent/SerialPortConnectionFactory.java
2011-08-01 18:13:47.755356687 +0200
+@@ -27,9 +27,9 @@
+ package com.sun.javatest.agent;
+ 
+ import java.io.IOException;
+-import javax.comm.CommPortIdentifier;
+-import javax.comm.NoSuchPortException;
+-import javax.comm.PortInUseException;
++import gnu.io.CommPortIdentifier;
++import gnu.io.NoSuchPortException;
++import gnu.io.PortInUseException;
+ 
+ /**
+  * A factory for creating connections to be used by agents communicating
+Index: 
jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest

[pkg-java] r13891 - in trunk/java-gnome/debian: . patches

2011-07-30 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-07-30 09:37:37 + (Sat, 30 Jul 2011)
New Revision: 13891

Removed:
   trunk/java-gnome/debian/patches/02_javadoc_workaround.patch
   trunk/java-gnome/debian/patches/03_libnotify_0_7.patch
Modified:
   trunk/java-gnome/debian/changelog
   trunk/java-gnome/debian/control
   trunk/java-gnome/debian/patches/01_take_screenshots.diff
   trunk/java-gnome/debian/patches/series
Log:
java-gnome: new upstream release 4.1.1

Modified: trunk/java-gnome/debian/changelog
===
--- trunk/java-gnome/debian/changelog   2011-07-30 05:45:56 UTC (rev 13890)
+++ trunk/java-gnome/debian/changelog   2011-07-30 09:37:37 UTC (rev 13891)
@@ -1,3 +1,15 @@
+java-gnome (4.1.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/patches/02_javadoc_workaround.patch
+- Remove useless patch (fixed upstream)
+  * debian/patches/03_libnotify_0_7.patch
+- Remove useless patch (fixed upstream)
+  * debian/control:
+- Update dependencies list according to the upstream configure file.
+
+ -- Guillaume Mazoyer respawne...@gmail.com  Thu, 28 Jul 2011 21:07:13 +0200
+
 java-gnome (4.0.19-1) experimental; urgency=low
 
   * New upstream release.

Modified: trunk/java-gnome/debian/control
===
--- trunk/java-gnome/debian/control 2011-07-30 05:45:56 UTC (rev 13890)
+++ trunk/java-gnome/debian/control 2011-07-30 09:37:37 UTC (rev 13891)
@@ -12,15 +12,13 @@
libatk1.0-dev,
libcairo2-dev (= 1.10),
libenchant-dev,
-   libglade2-dev,
-   libglib2.0-dev (= 2.22),
-   libgtk2.0-dev (= 2.22),
-   libgtksourceview2.0-dev (= 2.6.1),
-   libgtkspell-dev (= 2.0.15),
-   libnotify-dev (= 0.7.1),
+   libglib2.0-dev (= 2.28),
+   libgtk-3-dev (= 3.0),
+   libgtksourceview-3.0-dev (= 3.0),
+   libnotify-dev (= 0.7),
libpango1.0-dev (= 1.28),
librsvg2-dev (= 2.32),
-   libunique-dev (= 1.0.8),
+   libunique-3.0-dev (= 3.0),
metacity,
quilt,
xfonts-base,

Modified: trunk/java-gnome/debian/patches/01_take_screenshots.diff
===
--- trunk/java-gnome/debian/patches/01_take_screenshots.diff2011-07-30 
05:45:56 UTC (rev 13890)
+++ trunk/java-gnome/debian/patches/01_take_screenshots.diff2011-07-30 
09:37:37 UTC (rev 13891)
@@ -1,7 +1,10 @@
-Index: java-gnome-4.0.18/tests/screenshots/Harness.java
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: java-gnome-4.1.1/tests/screenshots/Harness.java
 ===
 java-gnome-4.0.18.orig/tests/screenshots/Harness.java  2010-12-24 
17:21:45.340053376 +0100
-+++ java-gnome-4.0.18/tests/screenshots/Harness.java   2010-12-24 
17:21:43.176336608 +0100
+--- java-gnome-4.1.1.orig/tests/screenshots/Harness.java   2011-07-11 
06:34:06.0 +0200
 java-gnome-4.1.1/tests/screenshots/Harness.java2011-07-28 
21:09:03.801856812 +0200
 @@ -91,7 +91,7 @@
   */
  public final class Harness
@@ -48,7 +51,7 @@
  SnapshotContextArc.class,
  SnapshotContextArcNegative.class,
  SnapshotMatrixRotate.class,
-@@ -306,7 +306,7 @@
+@@ -311,7 +311,7 @@
  if (windowManager != null) {
  System.out.println(KILL\tmetacity);
  windowManager.destroy();

Deleted: trunk/java-gnome/debian/patches/02_javadoc_workaround.patch
===
--- trunk/java-gnome/debian/patches/02_javadoc_workaround.patch 2011-07-30 
05:45:56 UTC (rev 13890)
+++ trunk/java-gnome/debian/patches/02_javadoc_workaround.patch 2011-07-30 
09:37:37 UTC (rev 13891)
@@ -1,28 +0,0 @@
-## Description: javadoc generation fix
-## Origin/Author: Andrew Cowie
-Index: java-gnome-4.0.19/build/faster
-===
 java-gnome-4.0.19.orig/build/faster2011-02-16 00:11:34.828588913 
+0100
-+++ java-gnome-4.0.19/build/faster 2011-02-16 00:11:32.188570530 +0100
-@@ -648,7 +648,6 @@
-   cmd += -quiet 
- 
-   cmd += -d doc/api 
--  cmd += -classpath tmp/bindings 
-   cmd += -public 
-   cmd += -nodeprecated 
-   cmd += -source 1.5 
-@@ -664,11 +663,11 @@
-   cmd += -breakiterator 
-   cmd += -stylesheetfile src/bindings/stylesheet.css 
-   cmd += -overview src/bindings/overview.html 
--  cmd += -sourcepath src/bindings 
-+  cmd += -sourcepath src/bindings:generated/bindings 
-   cmd += -encoding UTF-8 
-   cmd += -subpackages org 
-   cmd += -exclude org.freedesktop.bindings

[pkg-java] r13892 - trunk/java-gnome/debian

2011-07-30 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-07-30 09:57:02 + (Sat, 30 Jul 2011)
New Revision: 13892

Modified:
   trunk/java-gnome/debian/watch
Log:
java-gnome: Fix watch file syntax.

Modified: trunk/java-gnome/debian/watch
===
--- trunk/java-gnome/debian/watch   2011-07-30 09:37:37 UTC (rev 13891)
+++ trunk/java-gnome/debian/watch   2011-07-30 09:57:02 UTC (rev 13892)
@@ -1,2 +1,2 @@
 version=3
-http://ftp.gnome.org/pub/gnome/sources/java-gnome/([\d\.]+)/java-gnome-([\d\.]+)\.tar\.gz
 debian
+http://ftp.gnome.org/pub/gnome/sources/java-gnome/([\d\.]+)/java-gnome-([\d\.]+)\.tar\.xz
 debian


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


[pkg-java] r13893 - trunk/java-gnome/debian

2011-07-30 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-07-30 10:35:08 + (Sat, 30 Jul 2011)
New Revision: 13893

Modified:
   trunk/java-gnome/debian/changelog
   trunk/java-gnome/debian/control
Log:
java-gnome: Fix several lintian warnings.

Modified: trunk/java-gnome/debian/changelog
===
--- trunk/java-gnome/debian/changelog   2011-07-30 09:57:02 UTC (rev 13892)
+++ trunk/java-gnome/debian/changelog   2011-07-30 10:35:08 UTC (rev 13893)
@@ -7,6 +7,9 @@
 - Remove useless patch (fixed upstream)
   * debian/control:
 - Update dependencies list according to the upstream configure file.
+- Fix description-synopsis-starts-with-article
+- Fix needless-dependency-on-jre
+- Bump Standards-Version to 3.9.2
 
  -- Guillaume Mazoyer respawne...@gmail.com  Thu, 28 Jul 2011 21:07:13 +0200
 

Modified: trunk/java-gnome/debian/control
===
--- trunk/java-gnome/debian/control 2011-07-30 09:57:02 UTC (rev 13892)
+++ trunk/java-gnome/debian/control 2011-07-30 10:35:08 UTC (rev 13893)
@@ -23,7 +23,7 @@
quilt,
xfonts-base,
xvfb
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Section: java
 Homepage: http://java-gnome.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java-gnome
@@ -32,10 +32,9 @@
 
 Package: libjava-gnome-java
 Architecture: all
-Depends: default-jre | java5-runtime,
- libjava-gnome-jni (= ${source:Version}),
+Depends: libjava-gnome-jni (= ${source:Version}),
  ${misc:Depends}
-Description: The java-gnome language bindings project
+Description: java-gnome language bindings project
  These are the Java bindings for GTK+ and GNOME! Featuring a robust
  engineering design, completely generated internals, a lovingly crafted
  layer presenting the public API, and steadily increasing coverage of
@@ -51,7 +50,7 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libjava-gnome-java ( 4.0.11)
-Description: The java-gnome language bindings project
+Description: java-gnome language bindings project
  These are the Java bindings for GTK+ and GNOME! Featuring a robust
  engineering design, completely generated internals, a lovingly crafted
  layer presenting the public API, and steadily increasing coverage of
@@ -67,7 +66,7 @@
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: libjava-gnome-java
-Description: The java-gnome language bindings project
+Description: java-gnome language bindings project
  These are the Java bindings for GTK+ and GNOME! Featuring a robust
  engineering design, completely generated internals, a lovingly crafted
  layer presenting the public API, and steadily increasing coverage of


___
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] jigsaw packaging branch, master, updated. 2d5c55e6efb439aca65f1c80c42129cb2bcd6538

2011-07-26 Thread Guillaume Mazoyer
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 jigsaw packaging.

The branch, master has been updated
   via  2d5c55e6efb439aca65f1c80c42129cb2bcd6538 (commit)
   via  f34602426fbf325503ec85f1573d6500de8a3208 (commit)
  from  fa703d24d9f08a30e8d6ebbf67797a601bb38c53 (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 2d5c55e6efb439aca65f1c80c42129cb2bcd6538
Merge: f346024 fa703d2
Author: Guillaume Mazoyer respawne...@gmail.com
Date:   Tue Jul 26 20:43:02 2011 +0200

Merge git+ssh://git.debian.org/git/pkg-java/jigsaw

commit f34602426fbf325503ec85f1573d6500de8a3208
Author: Alan Bateman alan.bate...@oracle.com
Date:   Tue Jul 26 16:28:35 2011 +0200

Patch Jigsaw with alanb exploded modules patch.

---

Summary of changes:
 jdk/src/share/bin/java.c   |   22 ++
 .../classes/org/openjdk/jigsaw/ClassInfo.java  |7 +
 .../share/classes/org/openjdk/jigsaw/Launcher.java |   31 ++-
 .../org/openjdk/jigsaw/ModulePathLibrary.java  |  265 
 4 files changed, 317 insertions(+), 8 deletions(-)

diff --git a/jdk/src/share/bin/java.c b/jdk/src/share/bin/java.c
index 60aff58..71fabdf 100644
--- a/jdk/src/share/bin/java.c
+++ b/jdk/src/share/bin/java.c
@@ -768,6 +768,22 @@ SetClassPath(const char *s)
 JLI_MemFree((char *) s);
 }
 
+static void
+SetModulePath(const char *s)
+{
+char *def;
+size_t len;
+const char *orig = s;
+static const char format[] = -Djava.module.path=%s;
+len = sizeof(format) - 2 + JLI_StrLen(s); /* -2 == strlen(%s) */
+def = JLI_MemAlloc(len);
+JLI_Snprintf(def, len, format, s);
+AddOption(def, NULL);
+if (s != orig)
+JLI_MemFree((char *) s);
+}
+
+
 /*
  * Set the bootclasspath for installed modules.
  * A temporary workaround until jigsaw legacy support is
@@ -1101,6 +1117,12 @@ ParseArguments(int *pargc, char ***pargv,
 /* -classpath can only be set when running legacy mode */
 mode = LM_CLASS;
 argv++; --argc;
+} else if (JLI_StrCmp(arg, -modulepath) == 0 || JLI_StrCmp(arg, 
-mp) == 0) {
+ARG_CHECK (argc, ARG_ERROR1, arg);
+SetModulePath(*argv);
+/* -modulepath can only be set when running in module mode */
+mode = LM_MODULE;
+argv++; --argc;
 } else if (JLI_StrCmp(arg, -jar) == 0) {
 ARG_CHECK (argc, ARG_ERROR2, arg);
 if (mode == LM_MODULE)
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/ClassInfo.java 
b/jdk/src/share/classes/org/openjdk/jigsaw/ClassInfo.java
index 1493d67..8b0ba4d 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/ClassInfo.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/ClassInfo.java
@@ -363,6 +363,13 @@ public class ClassInfo {
 }
 return ci;
 }
+
+static ClassInfo parse(byte[] buf) throws IOException {
+ClassInfo ci = new ClassInfo();
+ci.load(ByteBuffer.wrap(buf, 0, buf.length), /*path*/null);
+return ci;
+}
+
 
 // ## Test
 //
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/Launcher.java 
b/jdk/src/share/classes/org/openjdk/jigsaw/Launcher.java
index 20f7797..2788001 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/Launcher.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/Launcher.java
@@ -27,9 +27,6 @@ package org.openjdk.jigsaw;
 
 import java.io.*;
 import java.lang.module.*;
-import java.lang.reflect.*;
-
-import static org.openjdk.jigsaw.Trace.*;
 
 
 public final class Launcher {
@@ -43,8 +40,13 @@ public final class Launcher {
 private static Loader loadModule(File libPath, ModuleIdQuery midq)
 throws IOException
 {
-
 Library lb = SimpleLibrary.open(libPath, false);
+
+// interpose modulepath library if -modulepath set
+String mp = System.getProperty(java.module.path);
+if (mp != null)
+lb = ModulePathLibrary.open(mp, lb);
+
 ModuleId mid = lb.findLatestModuleId(midq);
 if (mid == null)
 throw new Error(midq + : No installed module
@@ -56,16 +58,29 @@ public final class Launcher {
 if (cn == null)
 throw new Error(mid + : Module does not specify
 +  a main class);
+
 ConfigurationContext cf = lb.readConfiguration(mid);
-if (cf == null)
-throw new Error(mid + : Module not configured);
+if (cf == null) {
+// module not configured so if running with -modulepath we compute
+// the full configuration for the root module

[pkg-java] r13834 - in trunk/jtreg/debian: . patches

2011-07-02 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-07-02 14:09:40 + (Sat, 02 Jul 2011)
New Revision: 13834

Modified:
   trunk/jtreg/debian/changelog
   trunk/jtreg/debian/patches/launchers.patch
   trunk/jtreg/debian/rules
Log:
Fix patch for scripts variables.
Use rm -f in rules instead of ||:.

Modified: trunk/jtreg/debian/changelog
===
--- trunk/jtreg/debian/changelog2011-07-02 14:03:52 UTC (rev 13833)
+++ trunk/jtreg/debian/changelog2011-07-02 14:09:40 UTC (rev 13834)
@@ -1,3 +1,10 @@
+jtreg (4.1-2) unstable; urgency=low
+
+  * debian/patches/launchers.patch: Fixed typo in a variable name.
+  * debian/rules: Removed extra spaces and use rm -f instead of ||:.
+
+ -- Guillaume Mazoyer respawne...@gmail.com  Sat, 02 Jul 2011 07:13:54 -0500
+
 jtreg (4.1-1) unstable; urgency=low
 
   * Initial release (Closes: #629577)

Modified: trunk/jtreg/debian/patches/launchers.patch
===
--- trunk/jtreg/debian/patches/launchers.patch  2011-07-02 14:03:52 UTC (rev 
13833)
+++ trunk/jtreg/debian/patches/launchers.patch  2011-07-02 14:09:40 UTC (rev 
13834)
@@ -3,8 +3,8 @@
 ## Bug: bug URL
 Index: jtreg-4.1/src/share/bin/jtdiff.sh
 ===
 jtreg-4.1.orig/src/share/bin/jtdiff.sh 2011-06-20 06:16:12.189555818 
-0500
-+++ jtreg-4.1/src/share/bin/jtdiff.sh  2011-06-20 06:16:39.521555822 -0500
+--- jtreg-4.1.orig/src/share/bin/jtdiff.sh 2011-07-02 07:12:29.290992102 
-0500
 jtreg-4.1/src/share/bin/jtdiff.sh  2011-07-02 07:13:22.678992112 -0500
 @@ -38,32 +38,25 @@
  # 
  # jtdiff also provides an Ant task for direct invocation from Ant.
@@ -49,7 +49,7 @@
 +fi
 +
 +# Directory where other JAR are
-+if [ -z ${JTHAR_HOME} ]; then
++if [ -z ${JAR_HOME} ]; then
 +JAR_HOME=/usr/share/java
 +fi
  
@@ -72,7 +72,7 @@
 +# Determine java for jtdiff, JAVA_HOME, java
 +JT_JAVA=${JAVA_HOME}/bin/java
 +# Determine class path
-+JT_CLASSPATH=${JTREG_HOME}/jtreg.jar:${JTHAR_HOME}/javatest.jar:${JTHAR_HOME}/jh.jar:${JTHAR_HOME}/junit.jar
++JT_CLASSPATH=${JTREG_HOME}/jtreg.jar:${JTHAR_HOME}/javatest.jar:${JTHAR_HOME}/jh.jar:${JAR_HOME}/junit.jar
  
  # Verify java version (1.)5 or newer used to run jtdiff
 -version=`$JT_JAVA -classpath ${JT_HOME}/lib/jtreg.jar 
com.sun.javatest.regtest.GetSystemProperty java.version 21 | 
@@ -94,8 +94,8 @@
  $jtdiffOpts
 Index: jtreg-4.1/src/share/bin/jtreg.sh
 ===
 jtreg-4.1.orig/src/share/bin/jtreg.sh  2011-06-20 06:16:12.177555818 
-0500
-+++ jtreg-4.1/src/share/bin/jtreg.sh   2011-06-20 06:16:58.117555826 -0500
+--- jtreg-4.1.orig/src/share/bin/jtreg.sh  2011-07-02 07:12:29.270992102 
-0500
 jtreg-4.1/src/share/bin/jtreg.sh   2011-07-02 07:13:49.818992118 -0500
 @@ -57,32 +57,25 @@
  # jtreg also provides Ant tasks; see the online help for details.
  # E.g.  jtreg -onlineHelp ant
@@ -140,7 +140,7 @@
 +fi
 +
 +# Directory where other JAR are
-+if [ -z ${JTHAR_HOME} ]; then
++if [ -z ${JAR_HOME} ]; then
 +JAR_HOME=/usr/share/java
 +fi
  
@@ -165,7 +165,7 @@
 +# Determine java for jtdiff, JAVA_HOME, java
 +JT_JAVA=${JAVA_HOME}/bin/java
 +# Determine class path
-+JT_CLASSPATH=${JTREG_HOME}/jtreg.jar:${JTHAR_HOME}/javatest.jar:${JTHAR_HOME}/jh.jar:${JTHAR_HOME}/junit.jar
++JT_CLASSPATH=${JTREG_HOME}/jtreg.jar:${JTHAR_HOME}/javatest.jar:${JTHAR_HOME}/jh.jar:${JAR_HOME}/junit.jar
  
  # Verify java version (1.)5 or newer used to run jtreg
 -version=`$JT_JAVA -classpath ${JT_HOME}/lib/jtreg.jar 
com.sun.javatest.regtest.GetSystemProperty java.version 21 | 

Modified: trunk/jtreg/debian/rules
===
--- trunk/jtreg/debian/rules2011-07-02 14:03:52 UTC (rev 13833)
+++ trunk/jtreg/debian/rules2011-07-02 14:09:40 UTC (rev 13834)
@@ -6,15 +6,15 @@
ant -f make/build.xml
dh_auto_build
JTREG_HOME=./dist/jtreg/lib/ help2man --name=Regression Test Harness \
---help-option=-help ./dist/jtreg/linux/bin/jtdiff   jtdiff.1
+--help-option=-help ./dist/jtreg/linux/bin/jtdiff  jtdiff.1
JTREG_HOME=./dist/jtreg/lib/ help2man --name=Regression Test Harness \
---help-option=-help ./dist/jtreg/linux/bin/jtreg   jtreg.1
+--help-option=-help ./dist/jtreg/linux/bin/jtreg  jtreg.1
 
 override_dh_auto_clean:
-   rm -r dist  ||:
-   rm -r build ||:
-   rm jtdiff.1 ||:
-   rm jtreg.1  ||:
+   rm -rf dist
+   rm -rf build
+   rm -f jtdiff.1
+   rm -f jtreg.1
dh_auto_clean
 
 %:


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


[pkg-java] r13813 - in trunk: . jtreg jtreg/debian jtreg/debian/patches jtreg/debian/source

2011-06-22 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-06-22 13:23:23 + (Wed, 22 Jun 2011)
New Revision: 13813

Added:
   trunk/jtreg/
   trunk/jtreg/debian/
   trunk/jtreg/debian/changelog
   trunk/jtreg/debian/compat
   trunk/jtreg/debian/control
   trunk/jtreg/debian/copyright
   trunk/jtreg/debian/docs
   trunk/jtreg/debian/jtreg.install
   trunk/jtreg/debian/jtreg.manpages
   trunk/jtreg/debian/patches/
   trunk/jtreg/debian/patches/dependencies.patch
   trunk/jtreg/debian/patches/launchers.patch
   trunk/jtreg/debian/patches/series
   trunk/jtreg/debian/rules
   trunk/jtreg/debian/source/
   trunk/jtreg/debian/source/format
Log:
Add jtreg initial release (4.1).


Added: trunk/jtreg/debian/changelog
===
--- trunk/jtreg/debian/changelog(rev 0)
+++ trunk/jtreg/debian/changelog2011-06-22 13:23:23 UTC (rev 13813)
@@ -0,0 +1,5 @@
+jtreg (4.1-1) unstable; urgency=low
+
+  * Initial release (Closes: #629577)
+
+ -- Guillaume Mazoyer respawne...@gmail.com  Tue, 07 Jun 2011 15:11:38 -0500

Added: trunk/jtreg/debian/compat
===
--- trunk/jtreg/debian/compat   (rev 0)
+++ trunk/jtreg/debian/compat   2011-06-22 13:23:23 UTC (rev 13813)
@@ -0,0 +1 @@
+7

Added: trunk/jtreg/debian/control
===
--- trunk/jtreg/debian/control  (rev 0)
+++ trunk/jtreg/debian/control  2011-06-22 13:23:23 UTC (rev 13813)
@@ -0,0 +1,27 @@
+Source: jtreg
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
+Uploaders: Guillaume Mazoyer respawne...@gmail.com
+Build-Depends: debhelper (= 7.0.50~), javahelper, help2man
+Build-Depends-Indep: default-jdk,
+ libjtharness-java,
+ ant,
+ javahelp2,
+ libxalan2-java
+Standards-Version: 3.9.2
+Homepage: http://openjdk.java.net/jtreg/index.html
+
+Package: jtreg
+Architecture: all
+Depends: ${java:Depends},
+ ${misc:Depends},
+ libjtharness-java,
+ javahelp2,
+ libxalan2-java
+Description: Regression Test Harness for the OpenJDK platform
+ jtreg is the test harness used by the OpenJDK test framework.
+ This framework is intended primarily for regression tests.
+ It can also be used for unit tests, functional tests, and even simple product
+ tests -- in other words, just about any type of test except a conformance 
test,
+ which belong in a TCK.

Added: trunk/jtreg/debian/copyright
===
--- trunk/jtreg/debian/copyright(rev 0)
+++ trunk/jtreg/debian/copyright2011-06-22 13:23:23 UTC (rev 13813)
@@ -0,0 +1,70 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: jtreg
+Source: http://download.java.net/openjdk/jtreg/
+
+Files: *
+Copyright: 1996-2008 Sun Microsystems, Inc.  All Rights Reserved.
+License:
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+ .
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+ .
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ CA 95054 USA or visit www.sun.com if you need additional information or
+ have any questions.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+ '
+ CLASSPATH EXCEPTION TO THE GPL
+ .
+ Certain source files distributed by Sun Microsystems, Inc.  are subject to
+ the following clarification and special exception to the GPL, but only where
+ Sun has expressly included in the particular source file's header the words
+ Sun designates this particular file as subject to the Classpath exception
+ as provided by Sun in the LICENSE file that accompanied this code.
+ .
+  Linking this library statically or dynamically with other modules is making
+  a combined work based on this library.  Thus, the terms and conditions of
+  the GNU General Public License cover the whole combination.
+ .
+  As a special exception, the copyright holders of this library give you
+  permission to link this library with independent modules to produce an
+  executable, regardless of the license terms

[pkg-java] r13814 - tags

2011-06-22 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-06-22 13:24:04 + (Wed, 22 Jun 2011)
New Revision: 13814

Added:
   tags/jtreg/
Log:
Created tags for jtreg.



___
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] r13815 - branches

2011-06-22 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-06-22 13:24:38 + (Wed, 22 Jun 2011)
New Revision: 13815

Added:
   branches/jtreg/
Log:
Created branches for jtreg.



___
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] r13762 - in trunk: . libjtharness-java libjtharness-java/debian libjtharness-java/debian/patches libjtharness-java/debian/source

2011-06-07 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-06-07 19:18:54 + (Tue, 07 Jun 2011)
New Revision: 13762

Added:
   trunk/libjtharness-java/
   trunk/libjtharness-java/debian/
   trunk/libjtharness-java/debian/changelog
   trunk/libjtharness-java/debian/compat
   trunk/libjtharness-java/debian/control
   trunk/libjtharness-java/debian/copyright
   trunk/libjtharness-java/debian/libjtharness-java-doc.install
   trunk/libjtharness-java/debian/libjtharness-java-doc.javadoc
   trunk/libjtharness-java/debian/libjtharness-java.jlibs
   trunk/libjtharness-java/debian/patches/
   trunk/libjtharness-java/debian/patches/dependencies.diff
   trunk/libjtharness-java/debian/patches/rxtx.diff
   trunk/libjtharness-java/debian/patches/series
   trunk/libjtharness-java/debian/rules
   trunk/libjtharness-java/debian/source/
   trunk/libjtharness-java/debian/source/format
Log:
Added jtharness-java package.


Added: trunk/libjtharness-java/debian/changelog
===
--- trunk/libjtharness-java/debian/changelog(rev 0)
+++ trunk/libjtharness-java/debian/changelog2011-06-07 19:18:54 UTC (rev 
13762)
@@ -0,0 +1,5 @@
+jtharness (4.3.0-MR1-Rel-b23-1) unstable; urgency=low
+
+  * Initial release (Closes: #628857).
+
+ -- Guillaume Mazoyer respawne...@gmail.com  Tue, 31 May 2011 12:56:01 -0500

Added: trunk/libjtharness-java/debian/compat
===
--- trunk/libjtharness-java/debian/compat   (rev 0)
+++ trunk/libjtharness-java/debian/compat   2011-06-07 19:18:54 UTC (rev 
13762)
@@ -0,0 +1 @@
+7

Added: trunk/libjtharness-java/debian/control
===
--- trunk/libjtharness-java/debian/control  (rev 0)
+++ trunk/libjtharness-java/debian/control  2011-06-07 19:18:54 UTC (rev 
13762)
@@ -0,0 +1,43 @@
+Source: jtharness
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
+Uploaders: Guillaume Mazoyer respawne...@gmail.com
+Build-Depends: debhelper (= 7.0.50~), javahelper
+Build-Depends-Indep: default-jdk,
+ default-jdk-doc,
+ ant,
+ junit4,
+ javahelp2,
+ librxtx-java,
+ libasm3-java,
+ libservlet3.0-java
+Standards-Version: 3.9.2
+Homepage: http://jtharness.java.net/
+
+Package: libjtharness-java
+Architecture: all
+Depends: junit4,
+ librxtx-java,
+ libasm3-java,
+ libservlet3.0-java,
+ ${java:Depends},
+ ${misc:Depends}
+Description: jtharness
+ The JT harness is a general purpose, fully-featured, flexible, and 
configurable
+ test harness very well suited for most types of unit testing. Originally
+ developed as a test harness to run TCK test suites, it has since evolved into 
a
+ general purpose test platform.
+
+Package: libjtharness-java-doc
+Section: doc
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Suggests: libjtharness-java
+Description: jtharness (documentation)
+ This is the javadoc for the libjtharness-java package.
+ .
+ The JT harness is a general purpose, fully-featured, flexible, and 
configurable
+ test harness very well suited for most types of unit testing. Originally
+ developed as a test harness to run TCK test suites, it has since evolved into 
a
+ general purpose test platform.

Added: trunk/libjtharness-java/debian/copyright
===
--- trunk/libjtharness-java/debian/copyright(rev 0)
+++ trunk/libjtharness-java/debian/copyright2011-06-07 19:18:54 UTC (rev 
13762)
@@ -0,0 +1,72 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: jtharness
+Source: http://jtharness.java.net/
+
+Files: *
+Copyright: Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights 
reserved.
+License:
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.  Oracle designates this
+ particular file as subject to the Classpath exception as provided
+ by Oracle in the LICENSE file that accompanied this code.
+ .
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+ .
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ Please contact Oracle, 500 Oracle Parkway

[pkg-java] r13763 - tags

2011-06-07 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-06-07 19:20:29 + (Tue, 07 Jun 2011)
New Revision: 13763

Added:
   tags/libjtharness-java/
Log:
Added jtharness-java tags.



___
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] r13764 - branches

2011-06-07 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-06-07 19:21:10 + (Tue, 07 Jun 2011)
New Revision: 13764

Added:
   branches/libjtharness-java/
Log:
Added jtharness-java branches.



___
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] r13429 - trunk/java-gnome/debian/patches

2011-03-15 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-03-15 20:49:00 + (Tue, 15 Mar 2011)
New Revision: 13429

Modified:
   trunk/java-gnome/debian/patches/03_libnotify_0_7.patch
Log:
Fix for upstream configure file to compile with libnotify = 0.7.0.

Modified: trunk/java-gnome/debian/patches/03_libnotify_0_7.patch
===
--- trunk/java-gnome/debian/patches/03_libnotify_0_7.patch  2011-03-15 
19:24:56 UTC (rev 13428)
+++ trunk/java-gnome/debian/patches/03_libnotify_0_7.patch  2011-03-15 
20:49:00 UTC (rev 13429)
@@ -1,5 +1,17 @@
 ## Description: Fix to compile with libnotify 0.7
 ## Origin/Author: Guillaume Mazoyer
+Index: java-gnome-4.0.19/configure
+===
+--- java-gnome-4.0.19.orig/configure   2011-03-15 21:46:54.77790 +0100
 java-gnome-4.0.19/configure2011-03-15 21:46:52.39390 +0100
+@@ -917,7 +917,7 @@
+   libgtksourceview2.0-dev);
+ 
+   check_system_library(@gnomedev_libs,
+-  libnotify = 0.4.5 libnotify  0.7.0,
++  libnotify = 0.7.0,
+   LibNotify,
+   libnotify-dev);
 Index: java-gnome-4.0.19/src/bindings/org/gnome/notify/Notification.java
 ===
 --- java-gnome-4.0.19.orig/src/bindings/org/gnome/notify/Notification.java 
2011-02-20 22:05:19.334711005 +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] r13430 - trunk/java-gnome/debian/patches

2011-03-15 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-03-15 21:04:00 + (Tue, 15 Mar 2011)
New Revision: 13430

Modified:
   trunk/java-gnome/debian/patches/03_libnotify_0_7.patch
Log:
Here is the real fixed patch.

Modified: trunk/java-gnome/debian/patches/03_libnotify_0_7.patch
===
--- trunk/java-gnome/debian/patches/03_libnotify_0_7.patch  2011-03-15 
20:49:00 UTC (rev 13429)
+++ trunk/java-gnome/debian/patches/03_libnotify_0_7.patch  2011-03-15 
21:04:00 UTC (rev 13430)
@@ -1,21 +1,9 @@
 ## Description: Fix to compile with libnotify 0.7
 ## Origin/Author: Guillaume Mazoyer
-Index: java-gnome-4.0.19/configure
-===
 java-gnome-4.0.19.orig/configure   2011-03-15 21:46:54.77790 +0100
-+++ java-gnome-4.0.19/configure2011-03-15 21:46:52.39390 +0100
-@@ -917,7 +917,7 @@
-   libgtksourceview2.0-dev);
- 
-   check_system_library(@gnomedev_libs,
--  libnotify = 0.4.5 libnotify  0.7.0,
-+  libnotify = 0.7.0,
-   LibNotify,
-   libnotify-dev);
 Index: java-gnome-4.0.19/src/bindings/org/gnome/notify/Notification.java
 ===
 java-gnome-4.0.19.orig/src/bindings/org/gnome/notify/Notification.java 
2011-02-20 22:05:19.334711005 +0100
-+++ java-gnome-4.0.19/src/bindings/org/gnome/notify/Notification.java  
2011-02-20 22:04:25.642711002 +0100
+--- java-gnome-4.0.19.orig/src/bindings/org/gnome/notify/Notification.java 
2011-02-14 07:47:43.0 +0100
 java-gnome-4.0.19/src/bindings/org/gnome/notify/Notification.java  
2011-03-15 22:01:13.39792 +0100
 @@ -80,41 +80,7 @@
   */
  
@@ -101,8 +89,8 @@
   * @since 4.0.12
 Index: java-gnome-4.0.19/src/defs/NotifyNotification.defs
 ===
 java-gnome-4.0.19.orig/src/defs/NotifyNotification.defs2011-02-20 
22:05:18.846710996 +0100
-+++ java-gnome-4.0.19/src/defs/NotifyNotification.defs 2011-02-20 
22:01:33.650710998 +0100
+--- java-gnome-4.0.19.orig/src/defs/NotifyNotification.defs2011-02-14 
07:47:43.0 +0100
 java-gnome-4.0.19/src/defs/NotifyNotification.defs 2011-03-15 
22:01:13.39792 +0100
 @@ -15,19 +15,6 @@
  '(const-gchar* summary)
  '(const-gchar* body (null-ok))
@@ -159,3 +147,16 @@
  (define-method show
(of-object NotifyNotification)
(c-name notify_notification_show)
+Index: java-gnome-4.0.19/configure
+===
+--- java-gnome-4.0.19.orig/configure   2011-03-15 22:02:05.81792 +0100
 java-gnome-4.0.19/configure2011-03-15 22:02:04.66194 +0100
+@@ -917,7 +917,7 @@
+   libgtksourceview2.0-dev);
+ 
+   check_system_library(@gnomedev_libs,
+-  libnotify = 0.4.5 libnotify  0.7.0,
++  libnotify = 0.7.0,
+   LibNotify,
+   libnotify-dev);
+ 


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


[pkg-java] r13432 - trunk/java-gnome/debian/patches

2011-03-15 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-03-15 22:04:04 + (Tue, 15 Mar 2011)
New Revision: 13432

Modified:
   trunk/java-gnome/debian/patches/03_libnotify_0_7.patch
Log:
Fix example compilation with libnotify = 0.7.0.

Modified: trunk/java-gnome/debian/patches/03_libnotify_0_7.patch
===
--- trunk/java-gnome/debian/patches/03_libnotify_0_7.patch  2011-03-15 
21:55:48 UTC (rev 13431)
+++ trunk/java-gnome/debian/patches/03_libnotify_0_7.patch  2011-03-15 
22:04:04 UTC (rev 13432)
@@ -3,7 +3,7 @@
 Index: java-gnome-4.0.19/src/bindings/org/gnome/notify/Notification.java
 ===
 --- java-gnome-4.0.19.orig/src/bindings/org/gnome/notify/Notification.java 
2011-02-14 07:47:43.0 +0100
-+++ java-gnome-4.0.19/src/bindings/org/gnome/notify/Notification.java  
2011-03-15 22:01:13.39792 +0100
 java-gnome-4.0.19/src/bindings/org/gnome/notify/Notification.java  
2011-03-15 22:59:41.08192 +0100
 @@ -80,41 +80,7 @@
   */
  
@@ -90,7 +90,7 @@
 Index: java-gnome-4.0.19/src/defs/NotifyNotification.defs
 ===
 --- java-gnome-4.0.19.orig/src/defs/NotifyNotification.defs2011-02-14 
07:47:43.0 +0100
-+++ java-gnome-4.0.19/src/defs/NotifyNotification.defs 2011-03-15 
22:01:13.39792 +0100
 java-gnome-4.0.19/src/defs/NotifyNotification.defs 2011-03-15 
22:59:41.08192 +0100
 @@ -15,19 +15,6 @@
  '(const-gchar* summary)
  '(const-gchar* body (null-ok))
@@ -149,8 +149,8 @@
(c-name notify_notification_show)
 Index: java-gnome-4.0.19/configure
 ===
 java-gnome-4.0.19.orig/configure   2011-03-15 22:02:05.81792 +0100
-+++ java-gnome-4.0.19/configure2011-03-15 22:02:04.66194 +0100
+--- java-gnome-4.0.19.orig/configure   2011-02-14 07:47:43.0 +0100
 java-gnome-4.0.19/configure2011-03-15 22:59:41.08192 +0100
 @@ -917,7 +917,7 @@
libgtksourceview2.0-dev);
  
@@ -160,3 +160,16 @@
LibNotify,
libnotify-dev);
  
+Index: java-gnome-4.0.19/doc/examples/notify/ExampleLowBattery.java
+===
+--- java-gnome-4.0.19.orig/doc/examples/notify/ExampleLowBattery.java  
2011-03-15 23:02:58.75794 +0100
 java-gnome-4.0.19/doc/examples/notify/ExampleLowBattery.java   
2011-03-15 23:00:53.50594 +0100
+@@ -61,7 +61,7 @@
+  */
+ 
+ notification = new Notification(Low Battery Example, Your battery 
is low!,
+-messagebox_warning, icon);
++messagebox_warning);
+ 
+ /*
+  * Quit the application after notification disappears.


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


[pkg-java] r13349 - in trunk/java-gnome/debian: . patches

2011-02-23 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-02-23 16:34:30 + (Wed, 23 Feb 2011)
New Revision: 13349

Added:
   trunk/java-gnome/debian/patches/02_javadoc_workaround.patch
   trunk/java-gnome/debian/patches/03_libnotify_0_7.patch
Modified:
   trunk/java-gnome/debian/changelog
   trunk/java-gnome/debian/control
   trunk/java-gnome/debian/copyright
   trunk/java-gnome/debian/libjava-gnome-java-doc.install
   trunk/java-gnome/debian/patches/series
Log:
java-gnome 4.0.19

Modified: trunk/java-gnome/debian/changelog
===
--- trunk/java-gnome/debian/changelog   2011-02-22 21:35:23 UTC (rev 13348)
+++ trunk/java-gnome/debian/changelog   2011-02-23 16:34:30 UTC (rev 13349)
@@ -1,3 +1,15 @@
+java-gnome (4.0.19-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/patches/02_javadoc_workaround.patch
+- Fix javadoc generation.
+  * debian/patches/03_libnotify_0_7.patch
+- Fix binding compilation with libnotify 0.7.
+  * debian/control:
+- Update dependencies list according to the upstream configure file.
+
+ -- Guillaume Mazoyer respawne...@gmail.com  Wed, 23 Feb 2011 17:29:16 +0100
+
 java-gnome (4.0.18-1) experimental; urgency=low
 
   * New upstream release (Closes: #588943).

Modified: trunk/java-gnome/debian/control
===
--- trunk/java-gnome/debian/control 2011-02-22 21:35:23 UTC (rev 13348)
+++ trunk/java-gnome/debian/control 2011-02-23 16:34:30 UTC (rev 13349)
@@ -1,8 +1,30 @@
 Source: java-gnome
 Priority: optional
 Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Manu Mahajan m...@codepencil.com, Onkar Shinde 
onkarshi...@ubuntu.com, Guillaume Mazoyer respawne...@gmail.com
-Build-Depends: debhelper (= 5), cdbs, default-jdk, junit, libglib2.0-dev (= 
2.22), libgtk2.0-dev (= 2.22), libcairo2-dev (= 1.10), libpango1.0-dev (= 
1.28), libatk1.0-dev, libgtksourceview2.0-dev (= 2.6.1), libnotify-dev (= 
0.4.5), libgtkspell-dev (= 2.0.15), libunique-dev (= 1.0.8), libglade2-dev, 
librsvg2-dev, xvfb, xfonts-base, metacity, hicolor-icon-theme
+Uploaders: Manu Mahajan m...@codepencil.com,
+   Onkar Shinde onkarshi...@ubuntu.com,
+   Guillaume Mazoyer respawne...@gmail.com
+Build-Depends: cdbs,
+   debhelper (= 5),
+   default-jdk,
+   hicolor-icon-theme,
+   junit,
+   libatk1.0-dev,
+   libcairo2-dev (= 1.10),
+   libenchant-dev,
+   libglade2-dev,
+   libglib2.0-dev (= 2.22),
+   libgtk2.0-dev (= 2.22),
+   libgtksourceview2.0-dev (= 2.6.1),
+   libgtkspell-dev (= 2.0.15),
+   libnotify-dev (= 0.4.5),
+   libpango1.0-dev (= 1.28),
+   librsvg2-dev (= 2.32),
+   libunique-dev (= 1.0.8),
+   metacity,
+   quilt,
+   xfonts-base,
+   xvfb
 Standards-Version: 3.9.1
 Section: java
 Homepage: http://java-gnome.sourceforge.net/
@@ -12,32 +34,34 @@
 
 Package: libjava-gnome-java
 Architecture: all
-Depends: ${misc:Depends}, libjava-gnome-jni (= ${source:Version})
+Depends: default-jre | java5-runtime,
+ libjava-gnome-jni (= ${source:Version}),
+ ${misc:Depends}
 Description: The java-gnome language bindings project
- These are the Java bindings for GTK+ and GNOME! Featuring a robust 
- engineering design, completely generated internals, a lovingly crafted 
- layer presenting the public API, and steadily increasing coverage of 
+ These are the Java bindings for GTK+ and GNOME! Featuring a robust
+ engineering design, completely generated internals, a lovingly crafted
+ layer presenting the public API, and steadily increasing coverage of
  the underlying libraries.
  .
- You can use java-gnome to develop sophisticated user interfaces for 
- Linux applications so that they richly integrate with the GNOME Desktop 
- while leveraging the power of the Java language and your expertise with 
+ You can use java-gnome to develop sophisticated user interfaces for
+ Linux applications so that they richly integrate with the GNOME Desktop
+ while leveraging the power of the Java language and your expertise with
  it.
 
 Package: libjava-gnome-jni
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libjava-gnome-java ( 4.0.11)
 Description: The java-gnome language bindings project
- These are the Java bindings for GTK+ and GNOME! Featuring a robust 
- engineering design, completely generated internals, a lovingly crafted 
- layer presenting the public API, and steadily increasing coverage of 
+ These are the Java bindings for GTK+ and GNOME! Featuring a robust
+ engineering design, completely generated internals, a lovingly crafted
+ layer presenting the public API, and steadily increasing

[pkg-java] r13217 - in trunk/java-gnome/debian: . patches

2011-01-15 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-01-15 17:28:48 + (Sat, 15 Jan 2011)
New Revision: 13217

Modified:
   trunk/java-gnome/debian/changelog
   trunk/java-gnome/debian/control
   trunk/java-gnome/debian/copyright
   trunk/java-gnome/debian/patches/01_take_screenshots.diff
Log:
java-gnome 4.0.18

Modified: trunk/java-gnome/debian/changelog
===
--- trunk/java-gnome/debian/changelog   2011-01-15 10:35:15 UTC (rev 13216)
+++ trunk/java-gnome/debian/changelog   2011-01-15 17:28:48 UTC (rev 13217)
@@ -1,3 +1,18 @@
+java-gnome (4.0.18-1) unstable; urgency=low
+
+  * New upstream release (Closes: #588943).
+  * Update copyright.
+  * debian/patches/01_take_screenshots.diff
+- Use dbus-launch to start metacity.
+  * debian/control
+- Add libglib2.0-dev (= 2.22) dependency.
+- Add libcairo2-dev (= 1.10) dependency.
+- Add librsvg2-dev dependency.
+- Add libatk1.0-dev dependency.
+- Bump GTK+ build dependency version as per upstream.
+
+ -- Guillaume Mazoyer respawne...@gmail.com  Sat, 15 Jan 2011 15:17:02 +0100
+
 java-gnome (4.0.16-1) UNRELEASED; urgency=low
 
   * New upstream release.

Modified: trunk/java-gnome/debian/control
===
--- trunk/java-gnome/debian/control 2011-01-15 10:35:15 UTC (rev 13216)
+++ trunk/java-gnome/debian/control 2011-01-15 17:28:48 UTC (rev 13217)
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
 Uploaders: Manu Mahajan m...@codepencil.com, Onkar Shinde 
onkarshi...@ubuntu.com, Guillaume Mazoyer respawne...@gmail.com
-Build-Depends: debhelper (= 5), cdbs, default-jdk, junit, libglib2.0-dev (= 
2.22), libgtk2.0-dev (= 2.18), libpango1.0-dev (= 1.22), 
libgtksourceview2.0-dev (= 2.6.1), libnotify-dev (= 0.4.5), libgtkspell-dev 
(= 2.0.13), libunique-dev (= 1.0.8), libglade2-dev, xvfb, xfonts-base, 
metacity, hicolor-icon-theme
+Build-Depends: debhelper (= 5), cdbs, default-jdk, junit, libglib2.0-dev (= 
2.22), libgtk2.0-dev (= 2.22), libcairo2-dev (= 1.10), libpango1.0-dev (= 
1.28), libatk1.0-dev, libgtksourceview2.0-dev (= 2.6.1), libnotify-dev (= 
0.4.5), libgtkspell-dev (= 2.0.15), libunique-dev (= 1.0.8), libglade2-dev, 
librsvg2-dev, xvfb, xfonts-base, metacity, hicolor-icon-theme
 Standards-Version: 3.9.1
 Section: java
 Homepage: http://java-gnome.sourceforge.net/

Modified: trunk/java-gnome/debian/copyright
===
--- trunk/java-gnome/debian/copyright   2011-01-15 10:35:15 UTC (rev 13216)
+++ trunk/java-gnome/debian/copyright   2011-01-15 17:28:48 UTC (rev 13217)
@@ -5,7 +5,7 @@
 
 Files: *
 Copyright:
-2004-2010 Operational Dynamics Consulting Pty Ltd.
+2004-2011 Operational Dynamics Consulting Pty Ltd.
 1997-1998 Andrew Cowie
 1998-2005 The java-gnome Team
 2007 Vreixo Formoso Lopes
@@ -16,13 +16,13 @@
 
 Files: src/generator/*
 Copyright:
-2004-2010 Operational Dynamics Consulting Pty Ltd.
+2004-2011 Operational Dynamics Consulting Pty Ltd.
 2007 Vreixo Formoso Lopes
 License: GPL-2+
 
 Files: tests/*
 Copyright:
-2004-2010 Operational Dynamics Consulting Pty Ltd.
+2004-2011 Operational Dynamics Consulting Pty Ltd.
 1997-1998 Andrew Cowie
 License: GPL-2+
 

Modified: trunk/java-gnome/debian/patches/01_take_screenshots.diff
===
--- trunk/java-gnome/debian/patches/01_take_screenshots.diff2011-01-15 
10:35:15 UTC (rev 13216)
+++ trunk/java-gnome/debian/patches/01_take_screenshots.diff2011-01-15 
17:28:48 UTC (rev 13217)
@@ -1,8 +1,8 @@
-Index: java-gnome-4.0.14/tests/screenshots/Harness.java
+Index: java-gnome-4.0.18/tests/screenshots/Harness.java
 ===
 java-gnome-4.0.14.orig/tests/screenshots/Harness.java  2009-12-16 
05:56:18.0 +0530
-+++ java-gnome-4.0.14/tests/screenshots/Harness.java   2010-01-11 
09:36:04.0 +0530
-@@ -67,7 +67,7 @@
+--- java-gnome-4.0.18.orig/tests/screenshots/Harness.java  2010-12-24 
17:21:45.340053376 +0100
 java-gnome-4.0.18/tests/screenshots/Harness.java   2010-12-24 
17:21:43.176336608 +0100
+@@ -91,7 +91,7 @@
   */
  public final class Harness
  {
@@ -11,7 +11,12 @@
  
  public static void main(String[] args) throws IOException, 
InterruptedException {
  final String DISPLAY;
-@@ -113,11 +113,11 @@
+@@ -134,15 +134,15 @@
+ checkAlive(xServerVirtual, Xvfb);
+ 
+ System.out.println(EXEC\tmetacity);
+-windowManager = r.exec(/usr/bin/metacity --display= + 
DISPLAY);
++windowManager = r.exec(/usr/bin/dbus-launch 
/usr/bin/metacity --display= + DISPLAY);
  Thread.sleep(100);
  checkAlive(windowManager, metacity);
  
@@ -25,25 +30,25

[pkg-java] r13218 - tags/java-gnome

2011-01-15 Thread Guillaume Mazoyer
Author: gmazoyer-guest
Date: 2011-01-15 17:37:06 + (Sat, 15 Jan 2011)
New Revision: 13218

Added:
   tags/java-gnome/4.0.18-1/
Log:
tags for java-gnome 4.0.18-1


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


Bug#588943: Need more info?

2010-10-09 Thread Guillaume Mazoyer
So, I guess we should stick with the second patch I proposed and not the
last one. Is the patch correct? Does it need more work?

-- 
Guillaume Mazoyer - http://www.respawner.fr/


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


Bug#588943: Need more info?

2010-09-18 Thread Guillaume Mazoyer
Hi Niels,

Thank you for reviewing the patch that I proposed.
Here is another one I created considering your advices.

I just created a patch for the Debian directory.

-- 
Guillaume Mazoyer - http://www.respawner.fr/
diff -urN debian/changelog java-gnome-4.0.16/debian/changelog
--- debian/changelog	2010-04-11 21:36:04.0 +0200
+++ java-gnome-4.0.16/debian/changelog	2010-09-18 11:56:21.919887814 +0200
@@ -1,3 +1,17 @@
+java-gnome (4.0.16-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control
+- Update GTK+ depedency to libgtk2.0-dev (= 2.18).
+- Add libglib2.0-dev (= 2.22) build dependency.
+- Make sure the installed JNI package is always compatible with the package
+  which provides the JAR.
+- libjava-gnome-java does not need to depends on a JRE.
+  * debian/copyright
+- Update copyright to 2010.
+
+ -- Guillaume Mazoyer respawne...@gmail.com  Sat, 18 Sep 2010 11:50:55 +0200
+
 java-gnome (4.0.15-1) unstable; urgency=low
 
   * Team upload
diff -urN debian/control java-gnome-4.0.16/debian/control
--- debian/control	2010-04-11 21:36:04.0 +0200
+++ java-gnome-4.0.16/debian/control	2010-09-18 11:50:48.592876317 +0200
@@ -1,9 +1,9 @@
 Source: java-gnome
 Priority: optional
 Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Manu Mahajan m...@codepencil.com, Onkar Shinde onkarshi...@ubuntu.com
-Build-Depends: debhelper (= 5), cdbs, default-jdk, junit, libgtk2.0-dev (= 2.16), libpango1.0-dev (= 1.22), libgtksourceview2.0-dev (= 2.6.1), libnotify-dev (= 0.4.5), libgtkspell-dev (= 2.0.13), libunique-dev (= 1.0.8), libglade2-dev, xvfb, xfonts-base, metacity, hicolor-icon-theme
-Standards-Version: 3.8.4
+Uploaders: Manu Mahajan m...@codepencil.com, Onkar Shinde onkarshi...@ubuntu.com, Guillaume Mazoyer respawne...@gmail.com
+Build-Depends: debhelper (= 5), cdbs, default-jdk, junit, libglib2.0-dev (= 2.22), libgtk2.0-dev (= 2.18), libpango1.0-dev (= 1.22), libgtksourceview2.0-dev (= 2.6.1), libnotify-dev (= 0.4.5), libgtkspell-dev (= 2.0.13), libunique-dev (= 1.0.8), libglade2-dev, xvfb, xfonts-base, metacity, hicolor-icon-theme
+Standards-Version: 3.9.0
 Section: java
 Homepage: http://java-gnome.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java-gnome
@@ -12,7 +12,7 @@
 
 Package: libjava-gnome-java
 Architecture: all
-Depends: ${misc:Depends}, default-jre | java5-runtime, libjava-gnome-jni
+Depends: ${misc:Depends}, libjava-gnome-jni (= ${source:Version})
 Description: The java-gnome language bindings project
  These are the Java bindings for GTK+ and GNOME! Featuring a robust 
  engineering design, completely generated internals, a lovingly crafted 
diff -urN debian/copyright java-gnome-4.0.16/debian/copyright
--- debian/copyright	2009-12-28 11:21:15.0 +0100
+++ java-gnome-4.0.16/debian/copyright	2010-06-20 11:24:25.134032116 +0200
@@ -5,7 +5,7 @@
 
 Files: *
 Copyright:
-2004-2009 Operational Dynamics Consulting Pty Ltd.
+2004-2010 Operational Dynamics Consulting Pty Ltd.
 1997-1998 Andrew Cowie
 1998-2005 The java-gnome Team
 2007 Vreixo Formoso Lopes
@@ -16,13 +16,13 @@
 
 Files: src/generator/*
 Copyright:
-2004-2009 Operational Dynamics Consulting Pty Ltd.
+2004-2010 Operational Dynamics Consulting Pty Ltd.
 2007 Vreixo Formoso Lopes
 License: GPL-2+
 
 Files: tests/*
 Copyright:
-2004-2009 Operational Dynamics Consulting Pty Ltd.
+2004-2010 Operational Dynamics Consulting Pty Ltd.
 1997-1998 Andrew Cowie
 License: GPL-2+
 


signature.asc
Description: Ceci est une partie de message numériquement signée
__
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#588943: hard interdependency

2010-09-18 Thread Guillaume Mazoyer
 The interdependency between libjava-gnome-java and libjava-gnome-jni is
 hard; so a = in the versions isn't a good idea [from upstream's
 perspective]
Yes, that is right. In my first patch I used = 4.0.16.
Then, I should use = ${source:Version} instead of =
${source:Version}.

-- 
Guillaume Mazoyer - http://www.respawner.fr/
diff -urN debian/changelog java-gnome-4.0.16/debian/changelog
--- debian/changelog	2010-04-11 21:36:04.0 +0200
+++ java-gnome-4.0.16/debian/changelog	2010-09-18 11:56:21.919887814 +0200
@@ -1,3 +1,17 @@
+java-gnome (4.0.16-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control
+- Update GTK+ depedency to libgtk2.0-dev (= 2.18).
+- Add libglib2.0-dev (= 2.22) build dependency.
+- Make sure the installed JNI package is always compatible with the package
+  which provides the JAR.
+- libjava-gnome-java does not need to depends on a JRE.
+  * debian/copyright
+- Update copyright to 2010.
+
+ -- Guillaume Mazoyer respawne...@gmail.com  Sat, 18 Sep 2010 11:50:55 +0200
+
 java-gnome (4.0.15-1) unstable; urgency=low
 
   * Team upload
diff -urN debian/control java-gnome-4.0.16/debian/control
--- debian/control	2010-04-11 21:36:04.0 +0200
+++ java-gnome-4.0.16/debian/control	2010-09-18 12:55:37.900909003 +0200
@@ -1,9 +1,9 @@
 Source: java-gnome
 Priority: optional
 Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org
-Uploaders: Manu Mahajan m...@codepencil.com, Onkar Shinde onkarshi...@ubuntu.com
-Build-Depends: debhelper (= 5), cdbs, default-jdk, junit, libgtk2.0-dev (= 2.16), libpango1.0-dev (= 1.22), libgtksourceview2.0-dev (= 2.6.1), libnotify-dev (= 0.4.5), libgtkspell-dev (= 2.0.13), libunique-dev (= 1.0.8), libglade2-dev, xvfb, xfonts-base, metacity, hicolor-icon-theme
-Standards-Version: 3.8.4
+Uploaders: Manu Mahajan m...@codepencil.com, Onkar Shinde onkarshi...@ubuntu.com, Guillaume Mazoyer respawne...@gmail.com
+Build-Depends: debhelper (= 5), cdbs, default-jdk, junit, libglib2.0-dev (= 2.22), libgtk2.0-dev (= 2.18), libpango1.0-dev (= 1.22), libgtksourceview2.0-dev (= 2.6.1), libnotify-dev (= 0.4.5), libgtkspell-dev (= 2.0.13), libunique-dev (= 1.0.8), libglade2-dev, xvfb, xfonts-base, metacity, hicolor-icon-theme
+Standards-Version: 3.9.0
 Section: java
 Homepage: http://java-gnome.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java-gnome
@@ -12,7 +12,7 @@
 
 Package: libjava-gnome-java
 Architecture: all
-Depends: ${misc:Depends}, default-jre | java5-runtime, libjava-gnome-jni
+Depends: ${misc:Depends}, libjava-gnome-jni (= ${source:Version})
 Description: The java-gnome language bindings project
  These are the Java bindings for GTK+ and GNOME! Featuring a robust 
  engineering design, completely generated internals, a lovingly crafted 
diff -urN debian/copyright java-gnome-4.0.16/debian/copyright
--- debian/copyright	2009-12-28 11:21:15.0 +0100
+++ java-gnome-4.0.16/debian/copyright	2010-06-20 11:24:25.134032116 +0200
@@ -5,7 +5,7 @@
 
 Files: *
 Copyright:
-2004-2009 Operational Dynamics Consulting Pty Ltd.
+2004-2010 Operational Dynamics Consulting Pty Ltd.
 1997-1998 Andrew Cowie
 1998-2005 The java-gnome Team
 2007 Vreixo Formoso Lopes
@@ -16,13 +16,13 @@
 
 Files: src/generator/*
 Copyright:
-2004-2009 Operational Dynamics Consulting Pty Ltd.
+2004-2010 Operational Dynamics Consulting Pty Ltd.
 2007 Vreixo Formoso Lopes
 License: GPL-2+
 
 Files: tests/*
 Copyright:
-2004-2009 Operational Dynamics Consulting Pty Ltd.
+2004-2010 Operational Dynamics Consulting Pty Ltd.
 1997-1998 Andrew Cowie
 License: GPL-2+
 


signature.asc
Description: Ceci est une partie de message numériquement signée
__
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.