This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository java-gnome.
commit 7bb19289128093eedfe7a0740a197068873c3bab Merge: 1c22ec9 0231079 Author: Guillaume Mazoyer <[email protected]> Date: Wed Feb 23 17:29:16 2011 +0100 Imported Debian patch 4.0.19-1 .settings/org.eclipse.jdt.core.prefs | 6 +- AUTHORS | 7 +- NEWS | 366 +++++++ README | 30 +- build/faster | 6 +- configure | 368 +++++-- debian/changelog | 31 + debian/control | 70 +- debian/copyright | 48 +- debian/libjava-gnome-java-doc.install | 2 +- debian/patches/01_take_screenshots.diff | 53 +- debian/patches/02_javadoc_workaround.patch | 28 + debian/patches/03_libnotify_0_7.patch | 175 ++++ debian/patches/series | 2 + .../cairo/ExampleDrawingInExposeEvent.java | 2 +- doc/examples/cairo/ExampleDrawingPenguins.java | 85 ++ doc/examples/cairo/ExampleLinedPaper.java | 4 +- doc/examples/entry/ExampleLoginPrompt.java | 3 +- doc/examples/entry/ExampleSearchSomeone.java | 10 +- doc/examples/menu/ExampleSimpleMenu.java | 176 ++-- doc/examples/menu/ExampleToolbar.java | 3 +- doc/examples/textview/ExampleInstantMessenger.java | 12 +- doc/examples/treeview/ExampleTrailHeads.java | 10 +- .../org/freedesktop/bindings/Environment.c | 39 +- .../org/freedesktop/bindings/Environment.java | 43 +- src/bindings/org/freedesktop/bindings/Flag.java | 16 + .../freedesktop/bindings/Internationalization.c | 50 + .../freedesktop/bindings/Internationalization.java | 75 ++ src/bindings/org/freedesktop/bindings/Time.c | 4 +- src/bindings/org/freedesktop/bindings/Version.java | 4 +- .../cairo/CairoPatternOverride.c} | 48 +- .../{Operator.java => CairoPatternOverride.java} | 44 +- .../org/freedesktop/cairo/CairoSurfaceOverride.c | 142 +++ .../cairo/CairoSurfaceOverride.java} | 38 +- src/bindings/org/freedesktop/cairo/Context.java | 109 ++- .../cairo/{Operator.java => Extend.java} | 48 +- .../cairo/{Operator.java => FillRule.java} | 28 +- .../org/freedesktop/cairo/FontOptions.java | 21 +- .../org/freedesktop/cairo/GdkCairoSupport.c | 39 + .../org/freedesktop/cairo/GdkCairoSupport.java | 9 + .../cairo/{Operator.java => HintStyle.java} | 58 +- .../cairo/{Operator.java => MimeType.java} | 57 +- src/bindings/org/freedesktop/cairo/Operator.java | 207 +++- src/bindings/org/freedesktop/cairo/Pattern.java | 25 + src/bindings/org/freedesktop/cairo/Plumbing.c | 9 + .../cairo/RecordingSurface.java} | 21 +- src/bindings/org/freedesktop/cairo/Surface.java | 74 ++ src/bindings/org/freedesktop/enchant/Enchant.java | 81 +- .../freedesktop/enchant/EnchantBrokerOverride.c | 139 +++ .../enchant/EnchantBrokerOverride.java} | 35 +- src/bindings/org/freedesktop/icons/ActionIcon.java | 253 +++++ .../org/freedesktop/icons/ApplicationIcon.java | 110 +++ .../org/freedesktop/icons/CategoryIcon.java | 87 ++ src/bindings/org/freedesktop/icons/DeviceIcon.java | 105 ++ .../GdkCairoSupport.java => icons/EmblemIcon.java} | 78 +- src/bindings/org/freedesktop/icons/FaceIcon.java | 92 ++ .../icons/Helper.java} | 58 +- src/bindings/org/freedesktop/icons/Icon.java | 106 ++ src/bindings/org/freedesktop/icons/MimeIcon.java | 93 ++ .../Version.java => icons/PlaceIcon.java} | 78 +- src/bindings/org/freedesktop/icons/StateIcon.java | 191 ++++ src/bindings/org/gnome/gdk/Color.java | 25 + src/bindings/org/gnome/gdk/Cursor.java | 47 +- src/bindings/org/gnome/gdk/EventMask.java | 60 +- src/bindings/org/gnome/gdk/ModifierType.java | 42 +- src/bindings/org/gnome/gdk/Region.java | 3 + src/bindings/org/gnome/gdk/Window.java | 47 + src/bindings/org/gnome/glade/Glade.java | 6 - src/bindings/org/gnome/glade/XML.java | 16 +- src/bindings/org/gnome/glib/GObject.java | 8 +- src/bindings/org/gnome/glib/Glib.java | 40 + src/bindings/org/gnome/glib/Plumbing.java | 12 +- src/bindings/org/gnome/gtk/AboutDialog.java | 14 +- src/bindings/org/gnome/gtk/AcceleratorGroup.java | 121 +++ src/bindings/org/gnome/gtk/Action.java | 126 ++- .../gnome/{gdk/GC.java => gtk/Activatable.java} | 40 +- src/bindings/org/gnome/gtk/Adjustment.java | 62 +- src/bindings/org/gnome/gtk/Alignment.java | 42 + src/bindings/org/gnome/gtk/Assistant.java | 55 ++ src/bindings/org/gnome/gtk/Box.java | 4 +- src/bindings/org/gnome/gtk/Button.java | 10 +- src/bindings/org/gnome/gtk/ButtonBoxStyle.java | 7 + src/bindings/org/gnome/gtk/CellRendererAccel.java | 9 +- src/bindings/org/gnome/gtk/CellRendererPixbuf.java | 10 + .../org/gnome/gtk/CellRendererProgress.java | 11 + .../{AccelGroup.java => CellRendererSpinner.java} | 10 +- src/bindings/org/gnome/gtk/CellRendererText.java | 21 + src/bindings/org/gnome/gtk/CellRendererToggle.java | 15 +- src/bindings/org/gnome/gtk/Clipboard.java | 11 + .../gtk/{Scrollbar.java => DataColumnIcon.java} | 26 +- .../org/gnome/gtk/DataColumnReference.java | 2 +- src/bindings/org/gnome/gtk/Dialog.java | 45 + src/bindings/org/gnome/gtk/Editable.java | 30 + src/bindings/org/gnome/gtk/Entry.java | 67 +- .../gtk/{AccelGroup.java => EntryBuffer.java} | 4 +- src/bindings/org/gnome/gtk/FontButton.java | 18 + src/bindings/org/gnome/gtk/Gtk.java | 52 +- .../gtk/GtkAssistantOverride.c} | 125 ++- .../{gdk/GC.java => gtk/GtkAssistantOverride.java} | 38 +- src/bindings/org/gnome/gtk/GtkWidgetOverride.c | 23 - src/bindings/org/gnome/gtk/GtkWidgetOverride.java | 17 +- src/bindings/org/gnome/gtk/HScrollbar.java | 25 +- src/bindings/org/gnome/gtk/IconSize.java | 1 - src/bindings/org/gnome/gtk/Image.java | 25 + src/bindings/org/gnome/gtk/ImageMenuItem.java | 15 +- src/bindings/org/gnome/gtk/InfoBar.java | 220 +++++ src/bindings/org/gnome/gtk/Justification.java | 2 +- src/bindings/org/gnome/gtk/Label.java | 4 +- src/bindings/org/gnome/gtk/ListStore.java | 6 +- src/bindings/org/gnome/gtk/Menu.java | 14 + src/bindings/org/gnome/gtk/MenuItem.java | 49 +- src/bindings/org/gnome/gtk/Object.java | 59 ++ .../gtk/{HScrollbar.java => OffscreenWindow.java} | 8 +- src/bindings/org/gnome/gtk/RadioAction.java | 7 +- src/bindings/org/gnome/gtk/RadioButton.java | 15 +- src/bindings/org/gnome/gtk/Scale.java | 19 + src/bindings/org/gnome/gtk/Scrollbar.java | 17 +- src/bindings/org/gnome/gtk/ScrolledWindow.java | 17 + .../org/gnome/{gdk/GC.java => gtk/Spinner.java} | 51 +- src/bindings/org/gnome/gtk/StatusIcon.java | 11 +- src/bindings/org/gnome/gtk/Test.java | 8 +- src/bindings/org/gnome/gtk/TextBuffer.java | 71 +- src/bindings/org/gnome/gtk/TextComboBox.java | 2 +- src/bindings/org/gnome/gtk/TextComboBoxEntry.java | 2 +- src/bindings/org/gnome/gtk/TextView.java | 6 +- src/bindings/org/gnome/gtk/ToggleAction.java | 17 +- src/bindings/org/gnome/gtk/ToolItem.java | 26 +- .../gtk/{HScrollbar.java => ToolItemGroup.java} | 6 +- .../gtk/{HScrollbar.java => ToolPalette.java} | 6 +- ...AccelGroup.java => ToolPaletteDragTargets.java} | 10 +- src/bindings/org/gnome/gtk/ToolbarStyle.java | 6 +- src/bindings/org/gnome/gtk/TreeModel.java | 49 +- src/bindings/org/gnome/gtk/TreeView.java | 32 + src/bindings/org/gnome/gtk/TreeViewColumn.java | 37 + src/bindings/org/gnome/gtk/VScrollbar.java | 25 +- src/bindings/org/gnome/gtk/Widget.java | 173 +++- src/bindings/org/gnome/gtk/WidgetFlags.java | 56 -- src/bindings/org/gnome/gtk/Window.java | 14 +- src/bindings/org/gnome/notify/Notification.java | 29 +- src/bindings/org/gnome/notify/NotifyMainOverride.c | 2 +- src/bindings/org/gnome/pango/Context.java | 16 +- src/bindings/org/gnome/pango/Font.java | 60 +- src/bindings/org/gnome/pango/FontDescription.java | 4 + src/bindings/org/gnome/pango/Layout.java | 12 +- src/bindings/org/gnome/pango/Underline.java | 8 - .../{gdk/Region.java => rsvg/DimensionData.java} | 50 +- src/bindings/org/gnome/rsvg/Handle.java | 202 ++++ .../{gtk/VScrollbar.java => rsvg/Plumbing.java} | 18 +- .../gnome/{gtk/HScrollbar.java => rsvg/Rsvg.java} | 31 +- .../org/gnome/rsvg/RsvgDimensionDataOverride.c | 54 ++ .../org/gnome/rsvg/RsvgDimensionDataOverride.java | 37 + src/defs/CairoContext.defs | 52 + src/defs/CairoExtend.defs | 11 + src/defs/CairoFillRule.defs | 9 + src/defs/CairoFontOptions.defs | 9 + src/defs/CairoHintStyle.defs | 12 + src/defs/CairoPattern.defs | 9 + src/defs/EnchantBroker.defs | 9 + src/defs/GdkDrawable.defs | 38 + src/defs/GdkGC.defs | 1 + src/defs/GdkPangoRenderer.defs | 1 + src/defs/GdkWindow.defs | 7 + src/defs/GladeXML.defs | 5 +- src/defs/GlibMisc.defs | 20 + src/defs/GtkAccelGroup.defs | 2 +- src/defs/GtkAccelMap.defs | 4 +- src/defs/GtkAction.defs | 29 + src/defs/GtkActivatable.defs | 71 ++ src/defs/GtkAdjustment.defs | 14 + src/defs/GtkAssistant.defs | 7 + src/defs/GtkButtonBoxStyle.defs | 1 + src/defs/GtkCellRenderer.defs | 70 ++ src/defs/GtkCellRendererSpinner.defs | 14 + src/defs/GtkCellRendererToggle.defs | 15 + src/defs/GtkCellView.defs | 1 + src/defs/GtkDialog.defs | 9 + src/defs/GtkEntry.defs | 40 + src/defs/GtkEntryBuffer.defs | 120 +++ src/defs/GtkFileChooser.defs | 15 + src/defs/GtkHScrollbar.defs | 2 +- src/defs/GtkIconView.defs | 15 + src/defs/GtkImageMenuItem.defs | 8 + src/defs/GtkInfoBar.defs | 101 ++ src/defs/GtkLabel.defs | 51 +- src/defs/GtkMenu.defs | 14 + src/defs/GtkMenuItem.defs | 6 + src/defs/GtkNotebook.defs | 19 + src/defs/GtkObjectFlags.defs | 1 + src/defs/GtkOffscreenWindow.defs | 26 + src/defs/GtkPaned.defs | 6 + src/defs/GtkPrintContext.defs | 12 + src/defs/GtkPrintOperation.defs | 51 + src/defs/GtkRange.defs | 64 ++ src/defs/GtkSpinner.defs | 26 + src/defs/GtkStatusIcon.defs | 34 + src/defs/GtkStatusbar.defs | 6 + src/defs/GtkStyle.defs | 18 + src/defs/GtkToolItem.defs | 24 + src/defs/GtkToolItemGroup.defs | 146 +++ src/defs/GtkToolPalette.defs | 185 ++++ src/defs/GtkToolPaletteDragTargets.defs | 10 + src/defs/GtkTooltip.defs | 10 + src/defs/GtkVScrollbar.defs | 2 +- src/defs/GtkViewport.defs | 6 + src/defs/GtkWidget.defs | 222 +++++ src/defs/GtkWidgetFlags.defs | 1 + src/defs/GtkWindow.defs | 21 + src/defs/PangoCairoFcFont.defs | 5 + src/defs/PangoFcFont.defs | 5 + src/defs/PangoFont.defs | 12 + src/defs/RsvgDimensionData.defs | 12 + src/defs/RsvgHandle.defs | 134 +++ src/defs/RsvgMain.defs | 33 + .../codegen/FunctionGenerator.java | 6 + .../com/operationaldynamics/codegen/Thing.java | 2 + .../operationaldynamics/codegen/TypeGenerator.java | 4 +- .../operationaldynamics/defsparser/DefsParser.java | 10 +- .../defsparser/SetterBlock.java | 4 +- src/jni/bindings_java_signal.c | 26 +- src/jni/bindings_java_util.c | 39 +- src/util/demux/definitions.py | 2 +- tests/bindings/UnitTests.java | 7 +- .../bindings/com/operationaldynamics/ui/Align.java | 2 +- .../freedesktop/bindings/ValidateEnvironment.java | 8 + .../bindings/ValidateInternationalization.java | 21 +- .../freedesktop/cairo/ValidateCairoContext.java | 93 +- .../freedesktop/cairo/ValidateCairoInternals.java | 167 ++++ .../enchant/ValidateEnchantInternals.java | 64 +- .../org/freedesktop/icons/ValidateIconItems.java | 56 ++ .../org/gnome/gdk/ValidateKeyboardHandling.java | 23 + .../org/gnome/glib/ValidateMemoryManagement.java | 5 +- .../org/gnome/glib/ValidateUtilityFunctions.java | 53 +- .../bindings/org/gnome/gtk/GraphicalTestCase.java | 2 +- .../bindings/org/gnome/gtk/ValidateAssistant.java | 73 +- tests/bindings/org/gnome/gtk/ValidateEntry.java | 29 +- .../org/gnome/gtk/ValidateEntryCompletion.java | 25 +- tests/bindings/org/gnome/gtk/ValidateIconView.java | 6 +- .../bindings/org/gnome/gtk/ValidateProperties.java | 39 + .../org/gnome/gtk/ValidateSignalEmission.java | 38 +- .../bindings/org/gnome/gtk/ValidateTextBuffer.java | 3 +- .../gnome/gtk/ValidateTextViewBorderWindows.java | 5 - .../bindings/org/gnome/gtk/ValidateTreeModel.java | 16 +- .../org/gnome/gtk/ValidateTreeModelFilter.java | 6 +- .../org/gnome/gtk/ValidateTreeModelSort.java | 3 +- .../bindings/org/gnome/gtk/ValidateTreeStore.java | 9 +- .../org/gnome/pango/ValidatePangoFonts.java | 140 +++ tests/bindings/org/gnome/rsvg/Linux_Tux.svg | 1015 ++++++++++++++++++++ .../gnome/rsvg/ValidateVectorIllustrations.java | 117 +++ .../gnome/unique/ValidateUniqueApplications.java | 5 +- tests/exploration/accelerators.c | 30 + .../codegen/ValidateThingUsage.java | 9 +- .../defsparser/ValidateBlockUsage.java | 6 +- .../defsparser/ValidateDefsParsing.java | 68 +- .../prototype/PrototypeTransparency.java | 79 +- tests/screenshots/Harness.java | 130 ++- .../org/freedesktop/cairo/Illustration.java | 83 ++ .../freedesktop/cairo/IllustrationOperator.java | 49 + .../freedesktop/cairo/IllustrationOperatorAdd.java | 33 + .../cairo/IllustrationOperatorAtop.java | 33 + .../cairo/IllustrationOperatorClear.java | 33 + .../cairo/IllustrationOperatorDest.java | 33 + .../cairo/IllustrationOperatorDestAtop.java | 33 + .../cairo/IllustrationOperatorDestIn.java | 33 + .../cairo/IllustrationOperatorDestOut.java | 33 + .../cairo/IllustrationOperatorDestOver.java | 33 + .../freedesktop/cairo/IllustrationOperatorIn.java | 33 + .../freedesktop/cairo/IllustrationOperatorOut.java | 33 + .../cairo/IllustrationOperatorOver.java | 33 + .../cairo/IllustrationOperatorSaturate.java | 33 + .../cairo/IllustrationOperatorSource.java | 33 + .../freedesktop/cairo/IllustrationOperatorXOR.java | 33 + .../org/gnome/gtk/SnapshotAboutDialog.java | 12 +- .../org/gnome/gtk/SnapshotComboBox.java | 3 +- .../screenshots/org/gnome/gtk/SnapshotInfoBar.java | 54 ++ .../org/gnome/gtk/SnapshotTreeView.java | 6 +- 275 files changed, 10940 insertions(+), 1223 deletions(-) diff --cc debian/changelog index 3e35adf,0000000..89d5823 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,154 -1,0 +1,185 @@@ ++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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[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/control index ef14077,0000000..524ca16 mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,59 -1,0 +1,83 @@@ +Source: java-gnome +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> - Uploaders: Manu Mahajan <[email protected]>, Onkar Shinde <[email protected]> - Build-Depends: debhelper (>= 5), cdbs, default-jdk, junit, libgtk2.0-dev (>= 2.16), 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 - Standards-Version: 3.8.4 ++Uploaders: Manu Mahajan <[email protected]>, ++ Onkar Shinde <[email protected]>, ++ Guillaume Mazoyer <[email protected]> ++Build-Depends: cdbs, ++ debhelper (>= 5), ++ default-jdk, ++ hicolor-icon-theme, ++ junit, ++ libatk1.0-dev, ++ libcairo2-dev (>= 1.10), ++ libenchant-dev, ++ libglade2-dev, ++ libglib2.0-dev (>= 2.22), ++ libgtk2.0-dev (>= 2.22), ++ libgtksourceview2.0-dev (>= 2.6.1), ++ libgtkspell-dev (>= 2.0.15), ++ libnotify-dev (>= 0.7.1), ++ libpango1.0-dev (>= 1.28), ++ librsvg2-dev (>= 2.32), ++ libunique-dev (>= 1.0.8), ++ metacity, ++ quilt, ++ xfonts-base, ++ xvfb ++Standards-Version: 3.9.1 +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: ${misc:Depends}, default-jre | java5-runtime, libjava-gnome-jni ++Depends: default-jre | java5-runtime, ++ libjava-gnome-jni (>= ${source:Version}), ++ ${misc:Depends} +Description: The 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 ++ 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 ++ 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. + +Package: libjava-gnome-jni +Section: libs +Architecture: any - Depends: ${shlibs:Depends}, ${misc:Depends} ++Depends: ${misc:Depends}, ${shlibs:Depends} +Replaces: libjava-gnome-java (<< 4.0.11) +Description: The 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 ++ 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 ++ 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. + +Package: libjava-gnome-java-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Suggests: libjava-gnome-java +Description: The 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 ++ 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 ++ 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/copyright index 4fc86cc,0000000..19ff254 mode 100644,000000..100644 --- a/debian/copyright +++ b/debian/copyright @@@ -1,72 -1,0 +1,72 @@@ +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. ++ 2004-2011 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. ++ 2004-2011 Operational Dynamics Consulting Pty Ltd. + 2007 Vreixo Formoso Lopes +License: GPL-2+ + +Files: tests/* +Copyright: - 2004-2009 Operational Dynamics Consulting Pty Ltd. ++ 2004-2011 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 ++ 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 ++ 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 ++ 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 ++ 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 ++ 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. diff --cc debian/libjava-gnome-java-doc.install index 7c6fdf0,0000000..69e460a 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/ +doc/api/ /usr/share/doc/libjava-gnome-java/ +doc/examples/ /usr/share/doc/libjava-gnome-java/ - HACKING /usr/share/doc/libjava-gnome-java/ diff --cc debian/patches/01_take_screenshots.diff index 3054961,0000000..7762543 mode 100644,000000..100644 --- a/debian/patches/01_take_screenshots.diff +++ b/debian/patches/01_take_screenshots.diff @@@ -1,54 -1,0 +1,59 @@@ - 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 + { +- 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; - @@ -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"); + +- 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[] { - @@ -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(); +- windowManager.waitFor(); ++ /*windowManager.waitFor();*/ + } + if (settingsDaemon != null) { + System.out.println("KILL\tgnome-settings-daemon"); diff --cc debian/patches/02_javadoc_workaround.patch index 0000000,0000000..aa4c762 new file mode 100644 --- /dev/null +++ b/debian/patches/02_javadoc_workaround.patch @@@ -1,0 -1,0 +1,28 @@@ ++## Description: javadoc generation fix ++## Origin/Author: Andrew Cowie ++Index: java-gnome-4.0.19/build/faster ++=================================================================== ++--- java-gnome-4.0.19.orig/build/faster 2011-02-16 00:11:34.828588913 +0100 +++++ java-gnome-4.0.19/build/faster 2011-02-16 00:11:32.188570530 +0100 ++@@ -648,7 +648,6 @@ ++ cmd += "-quiet " ++ ++ cmd += "-d doc/api " ++- cmd += "-classpath tmp/bindings " ++ cmd += "-public " ++ cmd += "-nodeprecated " ++ cmd += "-source 1.5 " ++@@ -664,11 +663,11 @@ ++ cmd += "-breakiterator " ++ cmd += "-stylesheetfile src/bindings/stylesheet.css " ++ cmd += "-overview src/bindings/overview.html " ++- cmd += "-sourcepath src/bindings " +++ cmd += "-sourcepath src/bindings:generated/bindings " ++ cmd += "-encoding UTF-8 " ++ cmd += "-subpackages org " ++ cmd += "-exclude org.freedesktop.bindings " ++- cmd += "-noqualifier java.*:com.sun.* " +++ cmd += "-noqualifier 'java.*:com.sun.*' " ++ cmd += "src/bindings/org/freedesktop/bindings/Time.java " ++ cmd += "src/bindings/org/freedesktop/bindings/Version.java " ++ cmd += "src/bindings/org/freedesktop/bindings/Internationalization.java " diff --cc debian/patches/03_libnotify_0_7.patch index 0000000,0000000..584bf85 new file mode 100644 --- /dev/null +++ b/debian/patches/03_libnotify_0_7.patch @@@ -1,0 -1,0 +1,175 @@@ ++## Description: Fix to compile with libnotify 0.7 ++## Origin/Author: Guillaume Mazoyer ++Index: java-gnome-4.0.19/src/bindings/org/gnome/notify/Notification.java ++=================================================================== ++--- java-gnome-4.0.19.orig/src/bindings/org/gnome/notify/Notification.java 2011-02-14 07:47:43.000000000 +0100 +++++ java-gnome-4.0.19/src/bindings/org/gnome/notify/Notification.java 2011-03-15 22:59:41.081900002 +0100 ++@@ -80,41 +80,7 @@ ++ */ ++ ++ public Notification(String summary, String body, String icon) { ++- super(NotifyNotification.createNotification(summary, body, icon, null)); ++- } ++- ++- /** ++- * Create a new notification. ++- * ++- * <p> ++- * The summary appears on the titlebar of notification and body appears as ++- * its text. Icon may be a string defining a theme icon or the filename ++- * identifying the icon that appears next to text. Attach identifies the ++- * widget that the notification relates to. ++- * ++- * <p> ++- * Note that all but summary can be <code>null</code>. ++- * ++- * @since 4.0.12 ++- * @deprecated In GNOME 3, notifications will be independent of widgets and status icons. ++- * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility ++- */ ++- ++- public Notification(String summary, String body, String icon, Widget attach) { ++- super(NotifyNotification.createNotification(summary, body, icon, attach)); ++- } ++- ++- /** ++- * Create a new notification attached to a {@link StatusIcon}. See ++- * {@link #Notification(String,String,String,Widget) Notification()} for ++- * other parameters. ++- * ++- * @since 4.0.12 ++- * @deprecated In GNOME 3, notifications will be independent of widgets and status icons. ++- * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility ++- */ ++- public Notification(String summary, String body, String icon, StatusIcon statusIcon) { ++- super(NotifyNotification.createNotificationWithStatusIcon(summary, body, icon, statusIcon)); +++ super(NotifyNotification.createNotification(summary, body, icon)); ++ } ++ ++ /** ++@@ -131,39 +97,6 @@ ++ } ++ ++ /** ++- * Attaches Notification to a Widget setting hints to its location. ++- * ++- * @since 4.0.12 ++- * @deprecated In GNOME 3, notifications will be independent of widgets and status icons. ++- * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility ++- */ ++- public void attach(Widget attach) { ++- NotifyNotification.attachToWidget(this, attach); ++- } ++- ++- /** ++- * Attaches Notification to a {@link StatusIcon} setting hints to its ++- * location. ++- * ++- * @since 4.0.12 ++- * @deprecated In GNOME 3, notifications will be independent of widgets and status icons. ++- * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility ++- */ ++- public void attach(StatusIcon statusIcon) { ++- NotifyNotification.attachToStatusIcon(this, statusIcon); ++- } ++- ++- /** ++- * Sets the position of the notification to display on screen. ++- * ++- * @since 4.0.12 ++- * @deprecated In GNOME 3 ++- */ ++- public void setGeometryHints(Screen screen, int x, int y) { ++- NotifyNotification.setGeometryHints(this, screen, x, y); ++- } ++- ++- /** ++ * Display the notification on screen. ++ * ++ * @since 4.0.12 ++Index: java-gnome-4.0.19/src/defs/NotifyNotification.defs ++=================================================================== ++--- java-gnome-4.0.19.orig/src/defs/NotifyNotification.defs 2011-02-14 07:47:43.000000000 +0100 +++++ java-gnome-4.0.19/src/defs/NotifyNotification.defs 2011-03-15 22:59:41.081900002 +0100 ++@@ -15,19 +15,6 @@ ++ '("const-gchar*" "summary") ++ '("const-gchar*" "body" (null-ok)) ++ '("const-gchar*" "icon" (null-ok)) ++- '("GtkWidget*" "attach" (null-ok)) ++- ) ++-) ++- ++-(define-function notify_notification_new_with_status_icon ++- (is-constructor-of "NotifyNotification") ++- (c-name "notify_notification_new_with_status_icon") ++- (return-type "NotifyNotification*") ++- (parameters ++- '("const-gchar*" "summary") ++- '("const-gchar*" "body" (null-ok)) ++- '("const-gchar*" "icon" (null-ok)) ++- '("GtkStatusIcon*" "status_icon") ++ ) ++ ) ++ ++@@ -42,35 +29,6 @@ ++ ) ++ ) ++ ++-(define-method attach_to_widget ++- (of-object "NotifyNotification") ++- (c-name "notify_notification_attach_to_widget") ++- (return-type "none") ++- (parameters ++- '("GtkWidget*" "attach") ++- ) ++-) ++- ++-(define-method attach_to_status_icon ++- (of-object "NotifyNotification") ++- (c-name "notify_notification_attach_to_status_icon") ++- (return-type "none") ++- (parameters ++- '("GtkStatusIcon*" "status_icon") ++- ) ++-) ++- ++-(define-method set_geometry_hints ++- (of-object "NotifyNotification") ++- (c-name "notify_notification_set_geometry_hints") ++- (return-type "none") ++- (parameters ++- '("GdkScreen*" "screen") ++- '("gint" "x") ++- '("gint" "y") ++- ) ++-) ++- ++ (define-method show ++ (of-object "NotifyNotification") ++ (c-name "notify_notification_show") ++Index: java-gnome-4.0.19/configure ++=================================================================== ++--- java-gnome-4.0.19.orig/configure 2011-02-14 07:47:43.000000000 +0100 +++++ java-gnome-4.0.19/configure 2011-03-15 22:59:41.081900002 +0100 ++@@ -917,7 +917,7 @@ ++ "libgtksourceview2.0-dev"); ++ ++ check_system_library(@gnomedev_libs, ++- "libnotify >= 0.4.5 libnotify < 0.7.0", +++ "libnotify >= 0.7.0", ++ "LibNotify", ++ "libnotify-dev"); ++ ++Index: java-gnome-4.0.19/doc/examples/notify/ExampleLowBattery.java ++=================================================================== ++--- java-gnome-4.0.19.orig/doc/examples/notify/ExampleLowBattery.java 2011-03-15 23:02:58.757900004 +0100 +++++ java-gnome-4.0.19/doc/examples/notify/ExampleLowBattery.java 2011-03-15 23:00:53.505900004 +0100 ++@@ -61,7 +61,7 @@ ++ */ ++ ++ notification = new Notification("Low Battery Example", "Your battery is low!", ++- "messagebox_warning", icon); +++ "messagebox_warning"); ++ ++ /* ++ * Quit the application after notification disappears. diff --cc debian/patches/series index 5d7457e,0000000..2f8f48b mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,1 -1,0 +1,3 @@@ +01_take_screenshots.diff ++02_javadoc_workaround.patch ++03_libnotify_0_7.patch -- 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
