[java-gnome] 18/19: Imported Debian patch 4.1.3-1
Tony Mancill
tmancill at moszumanska.debian.org
Wed Sep 10 04:12:44 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 1ab33d743b71c3179c9481b63d77b67dc9e4cccf
Merge: 98653e1 e9c2b79
Author: Guillaume Mazoyer <respawneral at gmail.com>
Date: Mon May 19 17:39:50 2014 +0200
Imported Debian patch 4.1.3-1
AUTHORS => AUTHORS.markdown | 2 +-
HACKING => HACKING.markdown | 136 +-----------
LICENCE => LICENCE.markdown | 0
Makefile | 14 +-
NEWS => NEWS.markdown | 15 +-
README => README.markdown | 41 ++--
build/faster | 4 +-
configure | 110 +++++-----
debian/README.Maintainer | 4 +
debian/README.source | 2 +-
debian/changelog | 26 ++-
debian/control | 9 +-
debian/libjava-gnome-java-doc.install | 2 +-
debian/libjava-gnome-java.docs | 4 +-
debian/patches/01_take_screenshots.diff | 2 +-
debian/patches/02_build_python.diff | 12 ++
debian/patches/02_unique_dependency.diff | 15 --
debian/patches/03_build_doc_snapshots.diff | 14 ++
debian/patches/series | 3 +-
debian/rules | 4 +
doc/examples/menu/ExampleSimpleMenu.java | 2 +-
doc/examples/tooltip/ExampleCustomTooltip.java | 130 ++++++++++++
doc/examples/tooltip/ExampleTreeViewTooltips.java | 190 +++++++++++++++++
doc/examples/unique/ExampleBasicApplication.java | 41 +++-
doc/examples/unique/ExampleThereCanBeOnlyOne.java | 115 -----------
src/bindings/org/freedesktop/bindings/Version.java | 4 +-
src/bindings/org/gnome/gdk/WindowState.java | 2 +
.../Response.java => glib/FormatSizeFlags.java} | 47 ++---
src/bindings/org/gnome/glib/Glib.java | 32 ++-
src/bindings/org/gnome/gtk/AcceleratorGroup.java | 2 +-
src/bindings/org/gnome/gtk/Application.java | 54 ++++-
.../ApplicationInhibitFlags.java} | 75 ++++---
src/bindings/org/gnome/gtk/Grid.java | 9 +
src/bindings/org/gnome/gtk/Tooltip.java | 114 ++++++++--
src/bindings/org/gnome/gtk/TreeView.java | 179 ++++++++++++++++
src/bindings/org/gnome/gtk/Widget.java | 49 +++++
.../org/gnome/sourceview/LanguageManager.java | 12 ++
src/bindings/org/gnome/unique/Application.java | 229 ---------------------
src/bindings/org/gnome/unique/Command.java | 132 ------------
src/bindings/org/gnome/unique/Plumbing.java | 42 ----
.../org/gnome/unique/UniqueCommandOverride.java | 54 -----
src/bindings/org/gnome/unique/package.html | 33 ---
src/defs/GApplicationFlags.defs | 1 -
src/defs/GFormatSizeFlags.defs | 10 +
src/defs/GdkWindowState.defs | 1 +
src/defs/GlibMisc.defs | 21 ++
src/defs/GtkAccelMap.defs | 2 +-
src/defs/GtkApplication.defs | 29 +++
src/defs/GtkApplicationInhibitFlags.defs | 11 +
src/defs/GtkGrid.defs | 9 +
src/defs/UniqueApp.defs | 46 -----
src/defs/UniqueCommand.defs | 17 --
src/defs/UniqueMessageData.defs | 42 ----
src/defs/UniqueResponse.defs | 13 --
.../com/operationaldynamics/codegen/Thing.java | 3 +-
.../enchant/ValidateEnchantInternals.java | 5 +-
.../org/gnome/gdk/ValidateImageHandling.java | 2 +-
.../org/gnome/glib/ValidateUtilityFunctions.java | 19 +-
.../org/gnome/gtk/ValidateStyleContext.java | 2 +-
.../gnome/gtk/ValidateTextViewBorderWindows.java | 4 +-
.../org/gnome/gtk/ValidateUniqueApplications.java | 33 ++-
.../gnome/rsvg/ValidateVectorIllustrations.java | 2 +-
62 files changed, 1166 insertions(+), 1072 deletions(-)
diff --cc debian/README.Maintainer
index 0000000,0000000..d44667b
new file mode 100644
--- /dev/null
+++ b/debian/README.Maintainer
@@@ -1,0 -1,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 --cc debian/README.source
index 19adb32,0000000..968d681
mode 100644,000000..100644
--- a/debian/README.source
+++ b/debian/README.source
@@@ -1,4 -1,0 +1,4 @@@
- This package uses quilt in order to apply patches to the upstream source.
++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 --cc debian/changelog
index 732ad9d,0000000..45d1b0f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,242 -1,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 compatability patch from Fedora.
++ * 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 --cc debian/control
index c7e122b,0000000..5c57668
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,84 -1,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 (>= 5),
++ 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),
- libunique-3.0-dev (>= 3.0),
+ metacity,
+ xfonts-base,
+ xvfb,
++ dbus-x11,
+ python
- Standards-Version: 3.9.3
++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
- DM-Upload-Allowed: yes
+
+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 ncessary JNI layer.
++ 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 --cc debian/libjava-gnome-java-doc.install
index 69e460a,0000000..8c85c32
mode 100644,000000..100644
--- a/debian/libjava-gnome-java-doc.install
+++ b/debian/libjava-gnome-java-doc.install
@@@ -1,3 -1,0 +1,3 @@@
- HACKING /usr/share/doc/libjava-gnome-java/
++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 --cc debian/libjava-gnome-java.docs
index 50bd824,0000000..c31bd40
mode 100644,000000..100644
--- a/debian/libjava-gnome-java.docs
+++ b/debian/libjava-gnome-java.docs
@@@ -1,2 -1,0 +1,2 @@@
- NEWS
- README
++NEWS.markdown
++README.markdown
diff --cc debian/patches/01_take_screenshots.diff
index 735b5db,0000000..b6756f7
mode 100644,000000..100644
--- a/debian/patches/01_take_screenshots.diff
+++ b/debian/patches/01_take_screenshots.diff
@@@ -1,62 -1,0 +1,62 @@@
- ## Description: add some description
++## 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 --cc debian/patches/02_build_python.diff
index 0000000,0000000..75fb680
new file mode 100644
--- /dev/null
+++ b/debian/patches/02_build_python.diff
@@@ -1,0 -1,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 --cc debian/patches/03_build_doc_snapshots.diff
index 0000000,0000000..04443cc
new file mode 100644
--- /dev/null
+++ b/debian/patches/03_build_doc_snapshots.diff
@@@ -1,0 -1,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 --cc debian/patches/series
index 8fa64a4,0000000..f15239b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
+01_take_screenshots.diff
- 02_unique_dependency.diff
++02_build_python.diff
++03_build_doc_snapshots.diff
diff --cc debian/rules
index c50e36b,0000000..5c6dfb4
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,18 -1,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
--
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