This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository java-gnome.
commit 1b919c60e4f5d7bc7ded728137783238e6cd125c Author: Onkar Shinde <onkarshi...@ubuntu.com> Date: Sat Jan 16 19:19:07 2010 +0530 Imported Debian patch 4.0.14-2 --- debian/changelog | 11 +++++++++++ debian/patches/01_take_screenshots.diff | 23 ++++++++++++++++------- debian/rules | 1 + 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7dc9159..5ddb059 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +java-gnome (4.0.14-2) unstable; urgency=low + + * debian/patches/01_take_screenshots.diff + - Disable the file chooser dialog again as it still causes FTBFS on buildd. + (Closes: #564494) + * debian/rules + - Add verbosity to build log if architecture is hppa. This will help us + track down cause of FTBFS on hppa. + + -- Onkar Shinde <onkarshi...@ubuntu.com> Sat, 16 Jan 2010 19:19:07 +0530 + java-gnome (4.0.14-1) unstable; urgency=low * New upstream release. diff --git a/debian/patches/01_take_screenshots.diff b/debian/patches/01_take_screenshots.diff index 0478548..3054961 100644 --- a/debian/patches/01_take_screenshots.diff +++ b/debian/patches/01_take_screenshots.diff @@ -1,8 +1,8 @@ -Index: java-gnome-4.0.13/tests/screenshots/Harness.java +Index: java-gnome-4.0.14/tests/screenshots/Harness.java =================================================================== ---- java-gnome-4.0.13.orig/tests/screenshots/Harness.java 2009-08-27 08:49:52.000000000 +0530 -+++ java-gnome-4.0.13/tests/screenshots/Harness.java 2009-09-18 00:09:34.000000000 +0530 -@@ -66,7 +66,7 @@ +--- java-gnome-4.0.14.orig/tests/screenshots/Harness.java 2009-12-16 05:56:18.000000000 +0530 ++++ java-gnome-4.0.14/tests/screenshots/Harness.java 2010-01-11 09:36:04.000000000 +0530 +@@ -67,7 +67,7 @@ */ public final class Harness { @@ -11,7 +11,7 @@ Index: java-gnome-4.0.13/tests/screenshots/Harness.java public static void main(String[] args) throws IOException, InterruptedException { final String DISPLAY; -@@ -112,11 +112,11 @@ +@@ -113,11 +113,11 @@ Thread.sleep(100); checkAlive(windowManager, "metacity"); @@ -25,7 +25,16 @@ Index: java-gnome-4.0.13/tests/screenshots/Harness.java } Gtk.init(new String[] { -@@ -162,7 +162,7 @@ +@@ -149,7 +149,7 @@ + SnapshotQuestionMessageDialog.class, + SnapshotTreeView.class, + SnapshotTreeStore.class, +- SnapshotFileChooserDialog.class, ++ /*SnapshotFileChooserDialog.class,*/ + SnapshotAboutDialog.class, + SnapshotHScale.class, + SnapshotVScale.class, +@@ -163,7 +163,7 @@ SnapshotContextLine.class, SnapshotTextView.class, SnapshotTextViewBorderWindows.class, @@ -34,7 +43,7 @@ Index: java-gnome-4.0.13/tests/screenshots/Harness.java SnapshotContextArc.class, SnapshotContextArcNegative.class, SnapshotMatrixRotate.class, -@@ -230,7 +230,7 @@ +@@ -232,7 +232,7 @@ if (windowManager != null) { System.out.println("KILL\tmetacity"); windowManager.destroy(); diff --git a/debian/rules b/debian/rules index 3d39264..d03b591 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,7 @@ DEB_MAKE_ENVVARS += DISPLAY=":99" DEB_MAKE_BUILD_TARGET += doc endif ifneq (,$(filter $(DEB_HOST_ARCH), hppa)) +DEB_MAKE_ENVVARS += V=1 CFLAGS += -ffunction-sections endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-gnome.git _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits