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

[Guillaume Mazoyer]

Author: gmazoyer-guest
Date: 2011-01-15 17:28:48 +0000 (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 <respawneral at 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 at lists.alioth.debian.org>
 Uploaders: Manu Mahajan <manu at codepencil.com>, Onkar Shinde <onkarshinde at ubuntu.com>, Guillaume Mazoyer <respawneral at 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.diff	2011-01-15 10:35:15 UTC (rev 13216)
+++ trunk/java-gnome/debian/patches/01_take_screenshots.diff	2011-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.000000000 +0530
-+++ java-gnome-4.0.14/tests/screenshots/Harness.java	2010-01-11 09:36:04.000000000 +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 @@
              }
  
              Gtk.init(new String[] {
-@@ -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,
--                    SnapshotTextViewSpelling.class,
-+                    /*SnapshotTextViewSpelling.class,*/
-                     SnapshotContextArc.class,
-                     SnapshotContextArcNegative.class,
-                     SnapshotMatrixRotate.class,
-@@ -232,7 +232,7 @@
+@@ -174,7 +174,7 @@
+                 SnapshotQuestionMessageDialog.class,
+                 SnapshotTreeView.class,
+                 SnapshotTreeStore.class,
+-                SnapshotFileChooserDialog.class,
++                /*SnapshotFileChooserDialog.class,*/
+                 SnapshotAboutDialog.class,
+                 SnapshotHScale.class,
+                 SnapshotVScale.class,
+@@ -188,7 +188,7 @@
+                 SnapshotContextLine.class,
+                 SnapshotTextView.class,
+                 SnapshotTextViewBorderWindows.class,
+-                SnapshotTextViewSpelling.class,
++                /*SnapshotTextViewSpelling.class,*/
+                 SnapshotContextArc.class,
+                 SnapshotContextArcNegative.class,
+                 SnapshotMatrixRotate.class,
+@@ -306,7 +306,7 @@
              if (windowManager != null) {
                  System.out.println("KILL\tmetacity");
                  windowManager.destroy();