[java-gnome] 02/11: Imported Debian patch 4.1.3-1

Tony Mancill tmancill at moszumanska.debian.org
Tue Sep 9 05:44:56 UTC 2014


This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository java-gnome.

commit 316147359086403e204637c3b7ca61fd4d0c1722
Author: Guillaume Mazoyer <respawneral at gmail.com>
Date:   Mon May 19 17:39:50 2014 +0200

    Imported Debian patch 4.1.3-1
---
 debian/README.Maintainer                   |   4 +
 debian/README.source                       |   4 +
 debian/changelog                           | 264 +++++++++++++++++++++++++++++
 debian/compat                              |   1 +
 debian/control                             |  83 +++++++++
 debian/copyright                           |  73 ++++++++
 debian/libjava-gnome-java-doc.install      |   3 +
 debian/libjava-gnome-java.docs             |   2 +
 debian/libjava-gnome-java.install          |   1 +
 debian/libjava-gnome-jni.install           |   1 +
 debian/patches/01_take_screenshots.diff    |  62 +++++++
 debian/patches/02_build_python.diff        |  12 ++
 debian/patches/03_build_doc_snapshots.diff |  14 ++
 debian/patches/series                      |   3 +
 debian/rules                               |  22 +++
 debian/source/format                       |   1 +
 debian/watch                               |   2 +
 17 files changed, 552 insertions(+)

diff --git a/debian/README.Maintainer b/debian/README.Maintainer
new file mode 100644
index 0000000..d44667b
--- /dev/null
+++ b/debian/README.Maintainer
@@ -0,0 +1,4 @@
+#
+# To check if the patches still apply on new upstream versions:
+#
+for i in debian/patches/*.diff; do echo -e "#\n# $i\n#"; patch --fuzz=3 --dry-run -p1 < $i; done
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..968d681
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,4 @@
+This package uses quilt in order to apply patches to the upstream source.
+Patches are stored in debian/patches.
+
+Please refer to /usr/share/doc/quilt/README.source for further details.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..45d1b0f
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,264 @@
+java-gnome (4.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control
+    - Remove libunique dependency.
+    - Remove DM-Upload-Allowed field.
+    - Add dbus-x11 dependency to take doc screenshots.
+    - Update Standards-Version to 3.9.4.
+  * debian/README.Maintainer
+    - Add instructions for maintainers.
+  * debian/libjava-gnome-java.docs
+    - Update documentation filenames.
+  * debian/libjava-gnome-java-doc.install
+    - Fix HACKING file installation.
+  * debian/patches/02_unique_dependency.diff
+    - Remove no longer needed patch (fixed upstream).
+  * debian/patches/02_build_python.diff
+    - Add patch to fix build process (python2 env variable not found).
+  * debian/patches/03_build_doc_snapshots.diff (Closes: #748565)
+    - Add patch to fix build process of the documentation (accessibilty bug).
+
+ -- Guillaume Mazoyer <respawneral at gmail.com>  Mon, 19 May 2014 17:39:50 +0200
+
+java-gnome (4.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control
+    - Bump GTK required version to 3.4.
+    - Remove useless quilt dependency.
+    - Update descriptions to fix lintian warnings.
+  * debian/patches/02_java7_compat.diff
+    - Remove no longer needed patch (fixed upstream).
+  * debian/patches/02_unique_dependency.diff
+    - Add patch to fix the libunique dependency.
+  * debian/watch
+    - Upstream provides only .xz tarballs.
+  * debian/copyright
+    - Use new format.
+    - Update file copyright.
+
+ -- Guillaume Mazoyer <respawneral at gmail.com>  Thu, 30 Aug 2012 15:51:50 +0200
+
+java-gnome (4.1.1-4) unstable; urgency=low
+
+  * Team upload.
+  * Pull Java7 compatibility patch from Fedora.
+
+ -- Niels Thykier <niels at thykier.net>  Mon, 18 Jun 2012 22:41:02 +0200
+
+java-gnome (4.1.1-3) unstable; urgency=low
+
+  * Team upload.
+  * Add python to build-dep to address FTBFS. (Closes: #676073)
+  * Bump Standards-Version to 3.9.3 (no changes).
+
+ -- tony mancill <tmancill at debian.org>  Mon, 04 Jun 2012 21:14:40 -0700
+
+java-gnome (4.1.1-2) unstable; urgency=low
+
+  * Team upload
+  * Upload in unstable to fix the transition to libnotify (Closes: #630285)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 05 Aug 2011 16:38:43 +0200
+
+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.
+    - Fix description-synopsis-starts-with-article
+    - Fix needless-dependency-on-jre
+    - Bump Standards-Version to 3.9.2
+
+ -- Guillaume Mazoyer <respawneral at gmail.com>  Thu, 28 Jul 2011 21:07:13 +0200
+
+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 <respawneral at gmail.com>  Wed, 23 Feb 2011 17:29:16 +0100
+
+java-gnome (4.0.18-1) experimental; 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.
+    - 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.
+    - Bumped Standards-Version to 3.9.1.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 16 Jan 2011 09:44:09 +0100
+
+java-gnome (4.0.15-1) unstable; urgency=low
+
+  * Team upload
+  * New upstream release
+  * Change maintainers into Maintainers.
+  * Remove Thomas from Uploaders.
+  * Switch to source format 3.0.
+  * Update Standards-Version: 3.8.4.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 11 Apr 2010 21:28:43 +0200
+
+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 <onkarshinde at ubuntu.com>  Sat, 16 Jan 2010 19:19:07 +0530
+
+java-gnome (4.0.14-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/rules
+    - Add compiler flag -ffunction-sections if the architecture is hppa. Fixes
+      FTBFS on hppa. (Closes: #558999)
+  * debian/patches/01_take_screenshots.diff
+    - Revert the commenting of the code that launches file chooser dialog.
+      Not needed anymore as the glib bug that caused the FTBFS is fixed.
+  * debian/copyright
+    - Rewrite file according to DEP-5. Clarify licensing of some files which
+      are not part of the runtime.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com>  Mon, 28 Dec 2009 15:50:27 +0530
+
+java-gnome (4.0.13-3) unstable; urgency=low
+
+  * debian/rules
+    - Do not build docs on anything other than i386, amd64, powerpc.
+      Fixes FTBFS on Debian as well as Ubuntu buildd.
+  * debian/control
+    - Add 'DM-Upload-Allowed: yes' so that I can upload the package when I
+      become DM. :-)
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com>  Mon, 21 Sep 2009 20:06:40 +0530
+
+java-gnome (4.0.13-2) unstable; urgency=low
+
+  * debian/patches/01_take_screenshots.diff
+    - Comment out the code that launches file chooser dialog. It caused build
+      failure on buildd. (Closes: #546313)
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com>  Thu, 17 Sep 2009 23:24:56 +0530
+
+java-gnome (4.0.13-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control
+    - Add cdbs build-dependency.
+    - Bump GTK+ build dependency version as per upstream.
+    - Add build dependencies xvfb, xfonts-base, metacity, hicolor-icon-theme.
+      These are needed for screenshot generation during build.
+    - Add a -doc package which contains API documentation. (LP: #309023)
+    - Remove ${shlibs:Depends} dependency for -java package.
+    - Add myself to uploaders.
+    - Change standard version to 3.8.3.
+  * debian/rules
+    - Rewrite to build using cdbs. The file is simplified and very small now.
+    - Add configure argument specifying jni directory.
+  * debian/libjava-gnome-*.install
+    - Add files to use with cdbs.
+  * debian/patches/01_change_jni_library_location.diff
+    - Removed. Not needed anymore.
+  * debian/patches/01_take_screenshots.diff
+    - Small changes to upstream code that takes screenshots during build
+      process. The patch makes sure the process works inside pbuilder chroot.
+  * debian/README.source
+    - Add to comply with policy.
+  * debian/watch
+    - Make regular expression more compact.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com>  Mon, 07 Sep 2009 12:29:11 +0530
+
+java-gnome (4.0.12-1) unstable; urgency=low
+  
+  [ Manu Mahajan ]
+  * Update to latest upstream release 4.0.12 (LP: #380446)
+  * Split the binary package into two separate packages for java and jni files
+
+  [ Onkar Shinde ]
+  * debian/control
+    - Add various build dependencies as specified in configure file in upstream
+      source.
+    - Remove build dependency default-jdk-builddep. We do not build any -gcj
+      package.
+    - Add default-jre | java5-runtime as dependency since the target JVM
+      version is 1.5.
+  * debian/rules
+    - Remove the hard coded version of jni .so file.
+
+  [ Torsten Werner ]
+  * Change Section: java.
+  * Add get-orig-source target to debian/rules.
+  * Minor fix in debian/copyright: do not refer to unversioned GPL file.
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 20 Aug 2009 20:22:27 +0200
+
+java-gnome (4.0.9-2) unstable; urgency=low
+
+  [ Manu Mahajan ]
+  * Merged changes from Ubuntu package(4.0.9-1) courtesy of Hannes Wallnoefer
+
+ -- Manu Mahajan <manu at codepencil.com>  Sat, 20 Dec 2008 22:45:00 +0530
+
+java-gnome (4.0.9-1) unstable; urgency=low
+
+  [ Hannes Wallnoefer ]
+  * New upstream release 4.0.9
+  * Remove Cairo export patch, bug has been fixed upstream 
+    (Gnome bug #528282)
+
+ -- Hannes Wallnoefer <hannes at helma.at>  Wed, 03 Dec 2008 23:49:59 +0100
+
+java-gnome (4.0.7-1) unstable; urgency=low
+
+  [ Manu Mahajan ]
+  * Upgraded to upstream version 4.0.7
+  * Changed build dependency from java-gcj-compat-dev to default-jdk-builddep
+    Closes: #477867
+
+  [ Thomas Girard ]
+  * Switch to quilt for patch management
+  * Add Vcs-*: fields to debian/control
+  * Add Homepage: field to debian/control
+  * Apply patch to prevent export of Cairo backend functions. Thanks to
+    Loïc Minier for his invaluable help on this FTBFS bug. Closes: #476295
+  * Remove markdown section from debian/copyright; it's no longer distributed
+    in the tarball.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Sat, 10 May 2008 13:57:29 +0000
+
+java-gnome (4.0.6-1) unstable; urgency=low
+
+  [ Manu Mahajan ]
+  * Initial release, Closes: Bug#467442
+  * Changed location of libgtkjni from usr/lib to usr/lib/jni
+  * Tweaked the MakeFile to build with java-gcj-compat-dev
+
+  [ Thomas Girard ]
+  * Backport changeset 449: "Remove 15 warnings related to sentinels"
+
+ -- Manu Mahajan <manu at codepencil.com>  Mon, 24 Mar 2008 01:01:11 +0530
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..5c57668
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,83 @@
+Source: java-gnome
+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: cdbs,
+               debhelper (>= 9),
+               default-jdk,
+               hicolor-icon-theme,
+               junit,
+               libatk1.0-dev,
+               libcairo2-dev (>= 1.10),
+               libenchant-dev,
+               libglib2.0-dev (>= 2.28),
+               libgtk-3-dev (>= 3.4),
+               libgtksourceview-3.0-dev (>= 3.0),
+               libnotify-dev (>= 0.7),
+               libpango1.0-dev (>= 1.28),
+               librsvg2-dev (>= 2.32),
+               metacity,
+               xfonts-base,
+               xvfb,
+               dbus-x11,
+               python
+Standards-Version: 3.9.5
+Section: java
+Homepage: http://java-gnome.sourceforge.net/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java-gnome
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/java-gnome
+
+Package: libjava-gnome-java
+Architecture: all
+Depends: libjava-gnome-jni (>= ${source:Version}),
+         ${misc:Depends}
+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
+ 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
+ it.
+ .
+ This package contains the necessary JAR file.
+
+Package: libjava-gnome-jni
+Section: libs
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libjava-gnome-java (<< 4.0.11)
+Description: Java-gnome language bindings project JNI layer
+ 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
+ it.
+ .
+ This package contains the necessary JNI layer.
+
+Package: libjava-gnome-java-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: libjava-gnome-java
+Description: Java-gnome language bindings project documentation
+ 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
+ it.
+ .
+ This package contains the API documentation.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..e2058e2
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,73 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: java-gnome
+Upstream-Contact: java-gnome-hackers at lists.sourceforge.net
+Source: http://java-gnome.sourceforge.net/
+
+Files: *
+Copyright:
+ 2004-2012 Operational Dynamics Consulting Pty Ltd and Others
+ 1997-1998 Andrew Cowie
+ 1998-2005 The java-gnome Team
+ 2007 Vreixo Formoso Lopes
+ 2006 Emmanuele Bassi
+ 2001-2006 Jonathan Blandford
+ 1998-2006 James Henstridge, John Finlay, and Others
+License: GPL-2+ with Classpath Exception
+
+Files: src/generator/*
+Copyright:
+ 2004-2011 Operational Dynamics Consulting Pty Ltd.
+ 2007 Vreixo Formoso Lopes
+License: GPL-2+
+
+Files: tests/*
+Copyright:
+ 2004-2011 Operational Dynamics Consulting Pty Ltd.
+ 1997-1998 Andrew Cowie
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2008-2009 Manu Mahajan <manu at codepencil.com>
+License: GPL-2+
+
+Files: debian/rules debian/patches/*
+Copyright: 2009 Onkar Shinde <onkarshinde at ubuntu.com>
+License: GPL-2+
+
+License: GPL-2+ with Classpath Exception
+ java-gnome 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").
+ .
+ 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 GPL 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 of these
+ independent modules, and to copy and distribute the resulting
+ executable under terms of your choice, provided that you also meet,
+ for each linked independent module, the terms and conditions of the
+ license of that module. An independent module is a module which is
+ not derived from or based on this library. If you modify this
+ library, you may extend this exception to your version of the
+ library, but you are not obligated to do so. If you do not wish to
+ do so, delete this exceptionstatement from your version.
+ .
+ java-gnome 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 lose your
+ data, you're on your own.
+ .
+ You should have received a copy of the GNU General Public License
+ with the Debian GNU/Linux distribution in file
+ /usr/share/common-licenses/GPL-2. If not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+
+License: GPL-2+
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/libjava-gnome-java-doc.install b/debian/libjava-gnome-java-doc.install
new file mode 100644
index 0000000..8c85c32
--- /dev/null
+++ b/debian/libjava-gnome-java-doc.install
@@ -0,0 +1,3 @@
+HACKING.markdown /usr/share/doc/libjava-gnome-java/
+doc/api/ /usr/share/doc/libjava-gnome-java/
+doc/examples/ /usr/share/doc/libjava-gnome-java/
diff --git a/debian/libjava-gnome-java.docs b/debian/libjava-gnome-java.docs
new file mode 100644
index 0000000..c31bd40
--- /dev/null
+++ b/debian/libjava-gnome-java.docs
@@ -0,0 +1,2 @@
+NEWS.markdown
+README.markdown
diff --git a/debian/libjava-gnome-java.install b/debian/libjava-gnome-java.install
new file mode 100644
index 0000000..5f91143
--- /dev/null
+++ b/debian/libjava-gnome-java.install
@@ -0,0 +1 @@
+debian/tmp/usr/share/java/*.jar /usr/share/java/
diff --git a/debian/libjava-gnome-jni.install b/debian/libjava-gnome-jni.install
new file mode 100644
index 0000000..916bc3e
--- /dev/null
+++ b/debian/libjava-gnome-jni.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/jni/*.so /usr/lib/jni/
diff --git a/debian/patches/01_take_screenshots.diff b/debian/patches/01_take_screenshots.diff
new file mode 100644
index 0000000..b6756f7
--- /dev/null
+++ b/debian/patches/01_take_screenshots.diff
@@ -0,0 +1,62 @@
+## Description: enable screenshots taking for the documentation.
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: java-gnome-4.1.1/tests/screenshots/Harness.java
+===================================================================
+--- java-gnome-4.1.1.orig/tests/screenshots/Harness.java	2011-07-11 06:34:06.000000000 +0200
++++ java-gnome-4.1.1/tests/screenshots/Harness.java	2011-07-28 21:09:03.801856812 +0200
+@@ -91,7 +91,7 @@
+  */
+ public final class Harness
+ {
+-    private static final boolean USE_VIRTUAL_DISPLAY = false;
++    private static final boolean USE_VIRTUAL_DISPLAY = true;
+ 
+     public static void main(String[] args) throws IOException, InterruptedException {
+         final String DISPLAY;
+@@ -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");
+ 
+-                System.out.println("EXEC\tgnome-settings-daemon");
++                /*System.out.println("EXEC\tgnome-settings-daemon");
+                 settingsDaemon = r.exec("/usr/libexec/gnome-settings-daemon --display=" + DISPLAY
+                         + " --disable-crash-dialog");
+                 Thread.sleep(100);
+-                checkAlive(settingsDaemon, "gnome-settings-daemon");
++                checkAlive(settingsDaemon, "gnome-settings-daemon");*/
+             }
+ 
+             Gtk.init(new String[] {
+@@ -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,
+@@ -311,7 +311,7 @@
+             if (windowManager != null) {
+                 System.out.println("KILL\tmetacity");
+                 windowManager.destroy();
+-                windowManager.waitFor();
++                /*windowManager.waitFor();*/
+             }
+             if (settingsDaemon != null) {
+                 System.out.println("KILL\tgnome-settings-daemon");
diff --git a/debian/patches/02_build_python.diff b/debian/patches/02_build_python.diff
new file mode 100644
index 0000000..75fb680
--- /dev/null
+++ b/debian/patches/02_build_python.diff
@@ -0,0 +1,12 @@
+## Description: python2 env variable not foundable
+## Origin/Author: Guillaume Mazoyer
+Index: java-gnome-4.1.3/build/faster
+===================================================================
+--- java-gnome-4.1.3.orig/build/faster	2013-05-09 16:40:43.034285172 +0200
++++ java-gnome-4.1.3/build/faster	2013-05-09 16:42:59.802963352 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2
++#!/usr/bin/env python
+ # vim: set fileencoding=UTF-8
+ #
+ # java-gnome, a UI library for writing GTK and GNOME programs from Java!
diff --git a/debian/patches/03_build_doc_snapshots.diff b/debian/patches/03_build_doc_snapshots.diff
new file mode 100644
index 0000000..04443cc
--- /dev/null
+++ b/debian/patches/03_build_doc_snapshots.diff
@@ -0,0 +1,14 @@
+## Description: Fix accessibility bus address error for doc
+## Origin/Author: Guillaume Mazoyer
+Index: java-gnome-4.1.3/build/faster
+===================================================================
+--- java-gnome-4.1.3.orig/build/faster	2014-05-19 20:23:16.843587816 +0200
++++ java-gnome-4.1.3/build/faster	2014-05-19 20:23:30.223654164 +0200
+@@ -679,6 +679,7 @@ def compileDocumentation():
+ 
+ 
+ def takeSnapshots():
++	os.environ['NO_AT_BRIDGE'] = '1'
+ 	runJavaClass("Harness", "tmp/gtk-4.1.jar:tmp/tests/")
+ 
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f15239b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_take_screenshots.diff
+02_build_python.diff
+03_build_doc_snapshots.diff
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..5c6dfb4
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+# We ran the build in verbose mode so buildd log scanner can analyze the output
+# of the build.
+V=1
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/jni jdk=/usr/lib/jvm/default-java
+
+ifneq (,$(filter $(DEB_HOST_ARCH), i386 amd64 powerpc))
+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
+
+get-orig-source:
+	uscan --force-download --rename
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..4216fc2
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://ftp.gnome.org/pub/gnome/sources/java-gnome/([\d\.]+)/java-gnome-([\d\.]+)\.tar\.xz debian

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-gnome.git



More information about the pkg-java-commits mailing list