This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository java-gnome.
commit b63bdabddf348b33f1833176085c4ec4ad4f9357 Merge: 4e07af2 a0f9d06 Author: Onkar Shinde <[email protected]> Date: Mon Dec 28 15:50:27 2009 +0530 Imported Debian patch 4.0.14-1 NEWS | 144 +++++++++++ README | 24 +- build/faster | 2 +- configure | 35 ++- debian/changelog | 15 ++ debian/copyright | 64 +++-- debian/patches/01_take_screenshots.diff | 9 - debian/rules | 5 +- doc/examples/button/ExampleDocumentationLink.java | 114 +++++++++ doc/examples/keyboard/ExampleSnooping.java | 4 +- src/bindings/org/freedesktop/bindings/Version.java | 2 +- src/bindings/org/freedesktop/enchant/Broker.java | 31 +++ .../org/freedesktop/enchant/Dictionary.java | 112 +++++++++ src/bindings/org/freedesktop/enchant/Enchant.java | 129 ++++++++++ .../enchant/Entity.java} | 23 +- src/bindings/org/freedesktop/enchant/Plumbing.java | 51 ++++ src/bindings/org/gnome/gdk/Cursor.java | 92 ++++++- src/bindings/org/gnome/gdk/CursorType.java | 18 ++ src/bindings/org/gnome/gdk/Display.java | 9 +- src/bindings/org/gnome/gdk/Function.java | 4 +- src/bindings/org/gnome/gdk/GC.java | 4 +- src/bindings/org/gnome/gdk/GdkKeyvalOverride.java | 2 +- src/bindings/org/gnome/gdk/GdkPixbufOverride.c | 63 +++++ src/bindings/org/gnome/gdk/GdkPixbufOverride.java | 27 ++- src/bindings/org/gnome/gdk/Keyval.java | 34 +++ src/bindings/org/gnome/gdk/ModifierType.java | 48 +++- src/bindings/org/gnome/gdk/Pixbuf.java | 54 +++++ src/bindings/org/gnome/gdk/Plumbing.java | 1 + src/bindings/org/gnome/glib/Glib.java | 80 +----- src/bindings/org/gnome/glib/Object.java | 34 ++- src/bindings/org/gnome/glib/Plumbing.c | 43 ++++ src/bindings/org/gnome/glib/Plumbing.java | 11 +- src/bindings/org/gnome/gtk/AboutDialog.java | 87 +++++++ src/bindings/org/gnome/gtk/ComboBox.java | 9 + src/bindings/org/gnome/gtk/CustomPaperSize.java | 79 ++++++ src/bindings/org/gnome/gtk/Dialog.java | 41 +++- src/bindings/org/gnome/gtk/FatalError.java | 32 +++ src/bindings/org/gnome/gtk/Gtk.java | 33 ++- .../org/gnome/gtk/GtkAboutDialogOverride.c | 115 +++++++++ .../org/gnome/gtk/GtkAboutDialogOverride.java | 34 +++ src/bindings/org/gnome/gtk/GtkMain.c | 13 +- src/bindings/org/gnome/gtk/IMContext.java | 27 --- src/bindings/org/gnome/gtk/IMContextSimple.java | 27 --- src/bindings/org/gnome/gtk/IMMulticontext.java | 27 --- src/bindings/org/gnome/gtk/ImageMenuItem.java | 17 +- src/bindings/org/gnome/gtk/InputDialog.java | 36 --- src/bindings/org/gnome/gtk/InputMethod.java | 114 +++++++++ src/bindings/org/gnome/gtk/Justification.java | 8 +- src/bindings/org/gnome/gtk/Label.java | 4 +- src/bindings/org/gnome/gtk/LinkButton.java | 85 ++++++- .../{Curve.java => MulticontextInputMethod.java} | 27 ++- src/bindings/org/gnome/gtk/Plumbing.java | 10 +- src/bindings/org/gnome/gtk/Settings.java | 143 ++++++++++- .../{GammaCurve.java => SimpleInputMethod.java} | 26 +- src/bindings/org/gnome/gtk/Test.java | 124 ++++++++++ src/bindings/org/gnome/gtk/TextIter.java | 21 +- src/bindings/org/gnome/gtk/TextTag.java | 55 +++++ src/bindings/org/gnome/gtk/TextView.java | 12 + src/bindings/org/gnome/gtk/Toolbar.java | 4 +- src/bindings/org/gnome/gtk/TreeIter.java | 9 + src/bindings/org/gnome/gtk/TreeModelFilter.java | 6 +- src/bindings/org/gnome/gtk/Window.java | 2 +- src/bindings/org/gnome/pango/Attribute.java | 2 +- src/bindings/org/gnome/pango/LayoutLine.java | 23 ++ .../org/gnome/pango/PangoLayoutLineOverride.c | 145 +++++++++++ .../org/gnome/pango/PangoLayoutLineOverride.java | 52 ++++ src/defs/EnchantBroker.defs | 47 ++++ src/defs/EnchantDict.defs | 49 ++++ src/defs/GdkCursor.defs | 12 + src/defs/GdkCursorType.defs | 2 + src/defs/GdkKeyval.defs | 3 + src/defs/GtkAboutDialog.defs | 15 ++ src/defs/GtkButton.defs | 5 + src/defs/GtkCurve.defs | 1 + src/defs/GtkCurveType.defs | 1 + src/defs/GtkGammaCurve.defs | 1 + src/defs/GtkIMContext.defs | 2 +- src/defs/GtkIMContextSimple.defs | 2 +- src/defs/GtkIMMulticontext.defs | 2 +- src/defs/GtkImageMenuItem.defs | 9 + src/defs/GtkInputDialog.defs | 1 + src/defs/GtkLinkButton.defs | 37 ++- src/defs/GtkListStore.defs | 2 + src/defs/GtkNotebook.defs | 2 + src/defs/GtkPaperSize.defs | 14 ++ src/defs/GtkSettings.defs | 15 ++ src/defs/GtkTest.defs | 27 +++ src/defs/GtkTextBuffer.defs | 5 + src/defs/GtkToolbar.defs | 2 + src/defs/GtkTreeStore.defs | 2 + src/defs/PangoLayoutLine.defs | 16 +- .../codegen/FunctionGenerator.java | 4 +- .../com/operationaldynamics/codegen/Thing.java | 9 +- .../codegen/TypedefEnumThing.java | 28 +++ .../defsparser/EntityBlock.java | 18 +- .../operationaldynamics/defsparser/TypeBlock.java | 2 + src/jni/bindings_java_threads.c | 13 +- src/jni/bindings_java_util.c | 3 + src/util/missing.defs | 34 --- tests/bindings/UnitTests.java | 13 +- .../freedesktop/bindings/ValidateEnvironment.java | 6 +- .../bindings/ValidateInternationalization.java | 6 +- .../freedesktop/cairo/ValidateCairoContext.java | 4 +- .../freedesktop/cairo/ValidateCairoInternals.java | 4 +- .../freedesktop/cairo/ValidateDrawingToFile.java | 4 +- .../enchant/ValidateEnchantInternals.java | 263 ++++++++++++++++++++ tests/bindings/org/gnome/gdk/ValidateBoxeds.java | 6 +- .../org/gnome/gdk/ValidateImageHandling.java | 35 ++- .../org/gnome/gdk/ValidateKeyboardHandling.java | 6 +- .../org/gnome/gdk/ValidateScreensAndDisplays.java | 6 +- .../bindings/org/gnome/glib/ValidateConstants.java | 6 +- .../org/gnome/glib/ValidateGListMethods.java | 6 +- .../org/gnome/glib/ValidateMemoryManagement.java | 6 +- .../org/gnome/glib/ValidateReferenceCounting.java | 6 +- .../bindings/org/gnome/gtk/GraphicalTestCase.java | 270 +++++++++++++++++++++ tests/bindings/org/gnome/gtk/TestCaseGtk.java | 137 ----------- tests/bindings/org/gnome/gtk/ValidateArrow.java | 4 +- .../bindings/org/gnome/gtk/ValidateAssistant.java | 4 +- tests/bindings/org/gnome/gtk/ValidateComboBox.java | 4 +- tests/bindings/org/gnome/gtk/ValidateEntry.java | 2 +- .../org/gnome/gtk/ValidateEntryCompletion.java | 2 +- .../org/gnome/gtk/ValidateFileChoosing.java | 4 +- .../org/gnome/gtk/ValidateGlobalSettings.java | 121 +++++++++ tests/bindings/org/gnome/gtk/ValidateIconView.java | 4 +- .../org/gnome/gtk/ValidateInputMethods.java | 197 +++++++++++++++ .../org/gnome/gtk/ValidateLinkBehaviour.java | 54 +++++ .../org/gnome/gtk/ValidateNotebookBehaviour.java | 2 +- .../org/gnome/gtk/ValidateOutParameters.java | 4 +- tests/bindings/org/gnome/gtk/ValidatePacking.java | 2 +- tests/bindings/org/gnome/gtk/ValidatePrinting.java | 44 +++- .../bindings/org/gnome/gtk/ValidateProperties.java | 2 +- .../org/gnome/gtk/ValidateResponseType.java | 4 +- .../org/gnome/gtk/ValidateSignalEmission.java | 4 +- .../org/gnome/gtk/ValidateSnapshotUtilities.java | 4 +- .../bindings/org/gnome/gtk/ValidateTextBuffer.java | 30 ++- .../gnome/gtk/ValidateTextViewBorderWindows.java | 4 +- .../org/gnome/gtk/ValidateTextViewProperties.java | 4 +- .../org/gnome/gtk/ValidateTextViewSpelling.java | 2 +- .../bindings/org/gnome/gtk/ValidateTreeModel.java | 4 +- .../org/gnome/gtk/ValidateTreeModelFilter.java | 4 +- .../org/gnome/gtk/ValidateTreeModelSort.java | 4 +- .../bindings/org/gnome/gtk/ValidateTreeStore.java | 15 +- tests/bindings/org/gnome/gtk/ValidateTreeView.java | 4 +- tests/bindings/org/gnome/gtk/ValidateUnicode.java | 2 +- .../gnome/pango/ValidatePangoAttributeUsage.java | 4 +- .../gnome/pango/ValidatePangoTextRendering.java | 4 +- .../gnome/pango/ValidatePangoWrapBehaviour.java | 115 +++++++++ .../org/gnome/sourceview/ValidateSourceView.java | 4 +- .../gnome/unique/ValidateUniqueApplications.java | 4 +- tests/exploration/compose.c | 103 ++++++++ tests/exploration/enums.c | 4 + tests/prototype/ManualInput.java | 112 +++++++++ tests/prototype/MapleSyrup.jpg | Bin 0 -> 22016 bytes tests/screenshots/Harness.java | 4 +- .../org/gnome/gtk/SnapshotLinkButton.java | 55 +++++ 155 files changed, 4216 insertions(+), 634 deletions(-) diff --cc debian/changelog index 1e79480,0000000..7dc9159 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,117 -1,0 +1,132 @@@ ++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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Mon, 24 Mar 2008 01:01:11 +0530 diff --cc debian/copyright index f89f7e8,0000000..4fc86cc mode 100644,000000..100644 --- a/debian/copyright +++ b/debian/copyright @@@ -1,60 -1,0 +1,72 @@@ - This package was debianized by Manu Mahajan <[email protected]> on - Mon, 25 Feb 2008 00:43:11 +0530. - - It was downloaded from http://ftp.gnome.org/pub/gnome/sources/java-gnome/4.0/ - - Upstream Authors: - Andrew Cowie <[email protected]> - Srichand Pendyala <[email protected]> - Vreixo Formoso Lopes <[email protected]> - Sebastian Mancke <[email protected]> - - Copyright Holders: - Copyright (c) 2006-2008 Operational Dynamics Consulting Pty Ltd, and - Others. - Copyright (c) 2004-2008 Operational Dynamics Consulting Pty Ltd - Copyright (c) 1997-1998 Andrew Cowie - Copyright (c) 1998-2005 The java-gnome Team - Copyright (c) 2007 Vreixo Formoso Lopes - Copyright (C) 2006 Emmanuele Bassi - Copyright (C) 2001-2006 Jonathan Blandford - Copyright (c) 1998-2006 James Henstridge, John Finlay, and Others - - License: ++Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 ++Name: java-gnome ++Maintainer: [email protected] ++Source: http://java-gnome.sourceforge.net/ ++ ++Files: * ++Copyright: ++ 2004-2009 Operational Dynamics Consulting Pty Ltd. ++ 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-2009 Operational Dynamics Consulting Pty Ltd. ++ 2007 Vreixo Formoso Lopes ++License: GPL-2+ ++ ++Files: tests/* ++Copyright: ++ 2004-2009 Operational Dynamics Consulting Pty Ltd. ++ 1997-1998 Andrew Cowie ++License: GPL-2+ ++ ++Files: debian/* ++Copyright: 2008-2009 Manu Mahajan <[email protected]> ++License: GPL-2+ ++ ++Files: debian/rules, debian/patches/* ++Copyright: 2009 Onkar Shinde <[email protected]> ++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 /usr/share/common-licenses/GPL-2. - - The Debian packaging is (C) 2008, Manu Mahajan <[email protected]> - and is licensed under the GPL, see above. diff --cc debian/patches/01_take_screenshots.diff index 1ffd049,0000000..0478548 mode 100644,000000..100644 --- a/debian/patches/01_take_screenshots.diff +++ b/debian/patches/01_take_screenshots.diff @@@ -1,54 -1,0 +1,45 @@@ +Index: java-gnome-4.0.13/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 @@ + */ + 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; +@@ -112,11 +112,11 @@ + 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[] { - @@ -148,7 +148,7 @@ - SnapshotQuestionMessageDialog.class, - SnapshotTreeView.class, - SnapshotTreeStore.class, - - SnapshotFileChooserDialog.class, - + /*SnapshotFileChooserDialog.class,*/ - SnapshotAboutDialog.class, - SnapshotHScale.class, - SnapshotVScale.class, +@@ -162,7 +162,7 @@ + SnapshotContextLine.class, + SnapshotTextView.class, + SnapshotTextViewBorderWindows.class, +- SnapshotTextViewSpelling.class, ++ /*SnapshotTextViewSpelling.class,*/ + SnapshotContextArc.class, + SnapshotContextArcNegative.class, + SnapshotMatrixRotate.class, +@@ -230,7 +230,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/rules index 3c6e028,0000000..3d39264 mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,15 -1,0 +1,18 @@@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.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 ++endif ++ifneq (,$(filter $(DEB_HOST_ARCH), hppa)) ++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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
