[java-gnome] 13/19: Imported Debian patch 4.1.1-1

Tony Mancill tmancill at moszumanska.debian.org
Wed Sep 10 04:12:43 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 b3c19e993b3552a3710be61e84e460f5100445df
Merge: 7bb1928 d22f0ff
Author: Guillaume Mazoyer <respawneral at gmail.com>
Date:   Thu Jul 28 21:07:13 2011 +0200

    Imported Debian patch 4.1.1-1

 .settings/org.eclipse.jdt.core.prefs               |  20 +-
 HACKING                                            |  12 +-
 NEWS                                               | 247 +++++--
 README                                             |  58 +-
 build/faster                                       |  18 +-
 configure                                          | 166 ++---
 debian/changelog                                   |  15 +
 debian/control                                     |  23 +-
 debian/patches/01_take_screenshots.diff            |  11 +-
 debian/patches/02_javadoc_workaround.patch         |  28 -
 debian/patches/03_libnotify_0_7.patch              | 175 -----
 debian/patches/series                              |   2 -
 debian/watch                                       |   2 +-
 doc/examples/START                                 |  40 +-
 ...poseEvent.java => ExampleDrawingGradients.java} |  37 +-
 doc/examples/cairo/ExampleDrawingOffscreen.java    |  82 ---
 doc/examples/cairo/ExampleDrawingPenguins.java     |  11 +-
 doc/examples/cairo/ExampleDrawingText.java         |  13 +-
 doc/examples/entry/ExampleSearchSomeone.java       |   5 +-
 doc/examples/notify/ExampleLowBattery.java         |   4 +-
 doc/examples/sourceview/ExampleEditor.java         |   4 +-
 doc/examples/textview/ExampleFontHeights.java      |   4 +-
 java-gnome.doap                                    |  24 +
 .../freedesktop/bindings/Internationalization.java |  63 +-
 .../org/freedesktop/bindings/Plumbing.java         |   9 +-
 src/bindings/org/freedesktop/bindings/Version.java |   4 +-
 src/bindings/org/freedesktop/cairo/Context.java    |  89 +--
 .../cairo/Filter.java}                             |  61 +-
 .../org/freedesktop/cairo/GdkCairoSupport.c        |  81 +--
 .../org/freedesktop/cairo/GdkCairoSupport.java     |  41 +-
 .../org/freedesktop/cairo/ImageSurface.java        |   4 +-
 src/bindings/org/freedesktop/cairo/Pattern.java    |  12 +-
 src/bindings/org/freedesktop/cairo/Plumbing.java   |  14 +-
 src/bindings/org/freedesktop/cairo/SVGSurface.java |  65 --
 src/bindings/org/freedesktop/cairo/Surface.java    |   4 +-
 src/bindings/org/freedesktop/cairo/SvgSurface.java |   4 +-
 .../org/freedesktop/cairo/XlibSurface.java         |  19 +-
 src/bindings/org/freedesktop/cairo/package.html    |   4 +-
 src/bindings/org/gnome/gdk/Colormap.java           |  50 --
 src/bindings/org/gnome/gdk/Drawable.java           |  98 ---
 src/bindings/org/gnome/gdk/EventExpose.java        |  57 --
 src/bindings/org/gnome/gdk/EventMask.java          |   5 +-
 src/bindings/org/gnome/gdk/GCValues.java           |  58 --
 .../org/gnome/gdk/GdkEventExposeOverride.java      |  61 --
 .../gdk/{InputCondition.java => GdkRGBAOverride.c} |  46 +-
 .../Plumbing.java => gdk/GdkRGBAOverride.java}     |  18 +-
 src/bindings/org/gnome/gdk/ModifierType.java       |   3 +-
 src/bindings/org/gnome/gdk/MouseButton.java        |  18 -
 src/bindings/org/gnome/gdk/Pixbuf.java             |   3 +
 src/bindings/org/gnome/gdk/Pixmap.java             | 101 ---
 src/bindings/org/gnome/gdk/Plumbing.java           |  11 +-
 .../org/gnome/gdk/{Color.java => RGBA.java}        |  85 +--
 src/bindings/org/gnome/gdk/Region.java             |  61 --
 src/bindings/org/gnome/gdk/Screen.java             |  25 +-
 src/bindings/org/gnome/gdk/Window.java             |  58 +-
 src/bindings/org/gnome/glade/Glade.java            | 176 -----
 src/bindings/org/gnome/glade/XML.java              |  98 ---
 src/bindings/org/gnome/glade/package.html          |  37 -
 src/bindings/org/gnome/glib/Object.java            |   4 -
 src/bindings/org/gnome/glib/Plumbing.java          |   5 +-
 src/bindings/org/gnome/gtk/AboutDialog.java        |  67 +-
 src/bindings/org/gnome/gtk/Action.java             |  85 ---
 src/bindings/org/gnome/gtk/Adjustment.java         |  42 +-
 .../{gdk/GCValuesMask.java => gtk/Align.java}      |  50 +-
 src/bindings/org/gnome/gtk/Allocation.java         |  33 +-
 src/bindings/org/gnome/gtk/Box.java                |  45 +-
 src/bindings/org/gnome/gtk/Builder.java            | 139 ++++
 src/bindings/org/gnome/gtk/Button.java             |  22 -
 src/bindings/org/gnome/gtk/Calendar.java           |  22 -
 src/bindings/org/gnome/gtk/CellRenderer.java       |  12 +-
 src/bindings/org/gnome/gtk/CellRendererAccel.java  |   9 +-
 .../org/gnome/gtk/CellRendererProgress.java        |  13 +-
 src/bindings/org/gnome/gtk/CellRendererText.java   |  13 +
 src/bindings/org/gnome/gtk/CellRendererToggle.java |  13 +-
 src/bindings/org/gnome/gtk/CellView.java           |  12 +-
 src/bindings/org/gnome/gtk/CheckMenuItem.java      |  17 -
 src/bindings/org/gnome/gtk/ColorButton.java        |  49 +-
 src/bindings/org/gnome/gtk/ComboBox.java           |  46 +-
 src/bindings/org/gnome/gtk/ComboBoxEntry.java      |  93 ---
 .../gtk/{TextComboBox.java => ComboBoxText.java}   |  40 +-
 src/bindings/org/gnome/gtk/Dialog.java             | 115 ++-
 src/bindings/org/gnome/gtk/DrawingArea.java        |   4 +-
 src/bindings/org/gnome/gtk/Editable.java           |   5 -
 src/bindings/org/gnome/gtk/Entry.java              | 109 +--
 src/bindings/org/gnome/gtk/FileFilter.java         |   4 +-
 .../gnome/gtk/{RadioButtonGroup.java => Grid.java} |  79 ++-
 .../org/gnome/gtk/GtkAboutDialogOverride.c         | 136 ----
 .../GtkAllocationOverride.c}                       |  53 +-
 .../gtk/{Item.java => GtkAllocationOverride.java}  |  24 +-
 src/bindings/org/gnome/gtk/GtkAssistantOverride.c  |   1 -
 .../org/gnome/gtk/GtkEntryCompletionOverride.c     |   3 +-
 ...ialogOverride.java => GtkRequisitionOverride.c} |  57 +-
 .../{Ruler.java => GtkRequisitionOverride.java}    |  31 +-
 .../org/gnome/gtk/GtkTreeModelFilterOverride.c     |   3 +-
 src/bindings/org/gnome/gtk/GtkWidgetOverride.c     |  68 +-
 src/bindings/org/gnome/gtk/GtkWidgetOverride.java  |  26 +-
 src/bindings/org/gnome/gtk/GtkWindowOverride.c     |   4 +-
 src/bindings/org/gnome/gtk/HRuler.java             |  48 --
 src/bindings/org/gnome/gtk/IconView.java           |  22 -
 src/bindings/org/gnome/gtk/Image.java              |  17 +-
 src/bindings/org/gnome/gtk/ImageMenuItem.java      |  13 -
 src/bindings/org/gnome/gtk/ImageType.java          |  26 +-
 src/bindings/org/gnome/gtk/InfoBar.java            |   6 +-
 src/bindings/org/gnome/gtk/Justification.java      |   6 +-
 src/bindings/org/gnome/gtk/MenuItem.java           |  21 +-
 src/bindings/org/gnome/gtk/Notebook.java           |  11 -
 src/bindings/org/gnome/gtk/Object.java             | 122 ----
 .../gnome/{gdk/Bitmap.java => gtk/Orientable.java} |  26 +-
 src/bindings/org/gnome/gtk/Paned.java              |  22 +-
 src/bindings/org/gnome/gtk/PaperSize.java          |   5 +-
 src/bindings/org/gnome/gtk/ProgressBar.java        |  22 +-
 src/bindings/org/gnome/gtk/Range.java              |  17 +-
 src/bindings/org/gnome/gtk/RecentFilter.java       |   4 +-
 src/bindings/org/gnome/gtk/Requisition.java        |  16 +-
 src/bindings/org/gnome/gtk/Scale.java              |  14 +-
 src/bindings/org/gnome/gtk/Scrollbar.java          |  15 +-
 src/bindings/org/gnome/gtk/Separator.java          |  23 +-
 .../gtk/{UpdateType.java => SizeRequestMode.java}  |  23 +-
 src/bindings/org/gnome/gtk/Spell.java              |  20 +-
 src/bindings/org/gnome/gtk/SpinButton.java         |  12 -
 .../gnome/gtk/{StateType.java => StateFlags.java}  |  24 +-
 src/bindings/org/gnome/gtk/StatusIcon.java         |  68 +-
 src/bindings/org/gnome/gtk/Statusbar.java          |  25 +-
 .../gnome/gtk/{Style.java => StyleContext.java}    |   6 +-
 src/bindings/org/gnome/gtk/Test.java               |  28 -
 src/bindings/org/gnome/gtk/TextComboBoxEntry.java  | 121 ----
 src/bindings/org/gnome/gtk/TextTag.java            | 148 +++-
 src/bindings/org/gnome/gtk/TextView.java           |  11 +-
 src/bindings/org/gnome/gtk/ToggleAction.java       |   8 -
 src/bindings/org/gnome/gtk/ToggleButton.java       |  11 -
 src/bindings/org/gnome/gtk/ToggleToolButton.java   |  11 -
 src/bindings/org/gnome/gtk/ToolButton.java         |  11 -
 src/bindings/org/gnome/gtk/Toolbar.java            |  25 +-
 src/bindings/org/gnome/gtk/Tooltip.java            |   4 +-
 src/bindings/org/gnome/gtk/TreeModel.java          |  12 -
 src/bindings/org/gnome/gtk/TreeModelFilter.java    |  28 -
 src/bindings/org/gnome/gtk/TreeSelection.java      |  11 -
 src/bindings/org/gnome/gtk/TreeView.java           |  50 --
 src/bindings/org/gnome/gtk/TreeViewColumn.java     |  10 +-
 src/bindings/org/gnome/gtk/VRuler.java             |  48 --
 src/bindings/org/gnome/gtk/Widget.java             | 625 +++++++++--------
 src/bindings/org/gnome/gtk/Window.java             |  40 +-
 src/bindings/org/gnome/notify/Notification.java    |  71 +-
 src/bindings/org/gnome/pango/Attribute.java        |   9 -
 src/bindings/org/gnome/pango/Context.java          |   3 +-
 src/bindings/org/gnome/pango/Layout.java           |  10 +-
 src/bindings/org/gnome/sourceview/Language.java    |   4 +-
 .../org/gnome/sourceview/LanguageManager.java      |   4 +-
 src/defs/CairoFilter.defs                          |  12 +
 src/defs/CairoPattern.defs                         |   9 +
 src/defs/GdkBitmap.defs                            |   5 -
 src/defs/GdkColor.defs                             |  41 --
 src/defs/GdkColormap.defs                          | 104 ---
 src/defs/GdkCursor.defs                            |  24 +-
 src/defs/GdkDevice.defs                            |   9 -
 src/defs/GdkDisplay.defs                           |   6 -
 src/defs/GdkDragContext.defs                       |  33 -
 src/defs/GdkDrawable.defs                          | 767 ---------------------
 src/defs/GdkEvent.defs                             |  15 -
 src/defs/GdkEventExpose.defs                       |  13 -
 src/defs/GdkGC.defs                                | 273 --------
 src/defs/GdkGCValues.defs                          |   5 -
 src/defs/GdkGCValuesMask.defs                      |  26 -
 src/defs/GdkInputCondition.defs                    |  11 -
 src/defs/GdkPangoRenderer.defs                     |  56 --
 src/defs/GdkPixbuf.defs                            |  96 ---
 src/defs/GdkPixmap.defs                            |  20 -
 src/defs/GdkRGBA.defs                              |  40 ++
 src/defs/GdkRegion.defs                            | 156 -----
 src/defs/GdkRgbCmap.defs                           |  11 -
 src/defs/GdkScreen.defs                            |  48 --
 src/defs/GdkSegment.defs                           |  11 -
 src/defs/GdkTrapezoid.defs                         |  13 -
 src/defs/GdkWindow.defs                            | 132 +---
 src/defs/GdkWindowAttributesType.defs              |   1 -
 src/defs/GladeXML.defs                             | 125 ----
 src/defs/GtkAboutDialog.defs                       |  13 +-
 src/defs/GtkAccelLabel.defs                        |   7 -
 src/defs/GtkAction.defs                            |  47 --
 src/defs/GtkAdjustment.defs                        |   4 +-
 src/defs/GtkAlign.defs                             |  11 +
 src/defs/GtkBindingSet.defs                        |   4 +-
 src/defs/GtkBox.defs                               |  32 +-
 src/defs/GtkBuilder.defs                           |  43 ++
 src/defs/GtkButton.defs                            |  54 --
 src/defs/GtkButtonBox.defs                         |  44 --
 src/defs/GtkCalendar.defs                          |   6 +-
 src/defs/GtkCalendarDisplayOptions.defs            |   2 +-
 src/defs/GtkCellRenderer.defs                      |   8 +-
 src/defs/GtkCellView.defs                          |  14 +-
 src/defs/GtkCheckMenuItem.defs                     |  20 -
 src/defs/GtkColorButton.defs                       |  18 +-
 src/defs/GtkColorSelection.defs                    |  20 -
 src/defs/GtkComboBox.defs                          |  64 +-
 src/defs/GtkComboBoxEntry.defs                     |  49 --
 src/defs/GtkComboBoxText.defs                      |  95 +++
 src/defs/GtkContainer.defs                         |  10 -
 src/defs/GtkCurve.defs                             |  76 --
 src/defs/GtkCurveType.defs                         |  12 -
 src/defs/GtkDialog.defs                            |  15 -
 src/defs/GtkDialogFlags.defs                       |   1 -
 src/defs/GtkDrawingArea.defs                       |  11 -
 src/defs/GtkEntry.defs                             |  46 --
 src/defs/GtkFileChooserDialog.defs                 |  15 -
 src/defs/GtkFileFilter.defs                        |   2 +-
 src/defs/GtkFixed.defs                             |  16 -
 src/defs/GtkFontSelection.defs                     |   7 -
 src/defs/GtkFontSelectionDialog.defs               |   7 -
 src/defs/GtkGammaCurve.defs                        |  22 -
 src/defs/GtkGrid.defs                              |  99 +++
 src/defs/GtkHRuler.defs                            |  14 -
 src/defs/GtkIMContext.defs                         |   2 +-
 src/defs/GtkIconSet.defs                           |  14 -
 src/defs/GtkIconView.defs                          |   8 +-
 src/defs/GtkImage.defs                             |  56 --
 src/defs/GtkImageType.defs                         |   4 +-
 src/defs/GtkItem.defs                              |  40 --
 src/defs/GtkLabel.defs                             |  20 -
 src/defs/GtkNotebook.defs                          |  43 --
 src/defs/GtkObject.defs                            |  42 --
 src/defs/GtkObjectFlags.defs                       |  15 -
 src/defs/GtkOrientable.defs                        |  19 +
 src/defs/GtkPaned.defs                             |  11 +-
 src/defs/GtkPlug.defs                              |   9 +-
 src/defs/GtkProgressBar.defs                       |  15 -
 src/defs/GtkRange.defs                             |  15 -
 src/defs/GtkRcStyle.defs                           |  41 --
 src/defs/GtkRecentFilter.defs                      |   2 +-
 src/defs/GtkRecentManager.defs                     |  15 -
 src/defs/GtkRuler.defs                             |  68 --
 src/defs/GtkScale.defs                             |  12 +-
 src/defs/GtkScrollbar.defs                         |  12 +-
 src/defs/GtkSelectionData.defs                     |   7 -
 src/defs/GtkSeparator.defs                         |  11 +-
 src/defs/GtkSizeRequestMode.defs                   |   9 +
 src/defs/GtkSocket.defs                            |   6 +-
 src/defs/GtkSourceView.defs                        |  58 --
 src/defs/GtkSpell.defs                             |   1 +
 src/defs/{GtkStateType.defs => GtkStateFlags.defs} |   7 +-
 src/defs/GtkStatusIcon.defs                        |  25 -
 src/defs/GtkStatusbar.defs                         |  15 -
 src/defs/GtkStyle.defs                             | 555 ---------------
 src/defs/GtkTextAttributes.defs                    |   1 -
 src/defs/GtkToggleButton.defs                      |  10 -
 src/defs/GtkToolbar.defs                           |  34 -
 src/defs/GtkTooltip.defs                           |   2 +-
 src/defs/GtkTreeViewColumn.defs                    |   2 +-
 src/defs/GtkUpdateType.defs                        |  11 -
 src/defs/GtkVRuler.defs                            |  14 -
 src/defs/GtkWidget.defs                            | 389 ++++-------
 src/defs/GtkWidgetFlags.defs                       |  28 -
 src/defs/GtkWindow.defs                            | 120 +---
 src/defs/NotifyNotification.defs                   |  42 --
 src/defs/PangoLayout.defs                          |   1 -
 src/jni/gnome_screenshot_utils.c                   |  23 +-
 tests/bindings/UnitTests.java                      |   4 +-
 tests/bindings/org/gnome/gdk/ValidateBoxeds.java   |  19 +-
 .../bindings/org/gnome/gtk/GraphicalTestCase.java  |   6 +-
 tests/bindings/org/gnome/gtk/ValidateComboBox.java |  46 +-
 .../org/gnome/gtk/ValidateInputMethods.java        |   2 +-
 .../bindings/org/gnome/gtk/ValidateProperties.java |  14 +-
 .../bindings/org/gnome/gtk/ValidateTextBuffer.java |   2 +-
 .../org/gnome/gtk/ValidateThreadStability.java     |   8 +-
 .../gnome/pango/ValidatePangoAttributeUsage.java   |  15 +-
 .../gnome/pango/ValidatePangoTextRendering.java    |  12 +-
 .../gnome/pango/ValidatePangoWrapBehaviour.java    |  11 +-
 .../gnome/unique/ValidateUniqueApplications.java   |   4 +-
 .../codegen/ValidateUtilityMethods.java            |   6 +-
 tests/prototype/Designer.java                      |  25 +-
 tests/prototype/ManualInput.java                   |  10 +-
 tests/prototype/PrototypeTransparency.java         | 111 ---
 tests/prototype/simple.glade                       |  18 -
 tests/prototype/simple.ui                          |  19 +
 tests/screenshots/Harness.java                     |  13 +-
 .../org/freedesktop/cairo/SnapshotCairo.java       |  11 +-
 ...TextComboBox.java => SnapshotComboBoxText.java} |  14 +-
 ...oxEntry.java => SnapshotComboBoxTextEntry.java} |  14 +-
 .../org/gnome/gtk/SnapshotEntryRed.java            |   6 +-
 .../org/gnome/gtk/SnapshotStatusbar.java           |   6 +-
 .../org/gnome/gtk/SnapshotTextViewSpelling.java    |   2 +-
 280 files changed, 2773 insertions(+), 8463 deletions(-)

diff --cc debian/changelog
index 89d5823,0000000..3becf25
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,185 -1,0 +1,200 @@@
++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 524ca16,0000000..8795820
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,83 -1,0 +1,80 @@@
 +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),
 +               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),
++               libglib2.0-dev (>= 2.28),
++               libgtk-3-dev (>= 3.0),
++               libgtksourceview-3.0-dev (>= 3.0),
++               libnotify-dev (>= 0.7),
 +               libpango1.0-dev (>= 1.28),
 +               librsvg2-dev (>= 2.32),
-                libunique-dev (>= 1.0.8),
++               libunique-3.0-dev (>= 3.0),
 +               metacity,
 +               quilt,
 +               xfonts-base,
 +               xvfb
- Standards-Version: 3.9.1
++Standards-Version: 3.9.2
 +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: default-jre | java5-runtime,
-          libjava-gnome-jni (>= ${source:Version}),
++Depends: libjava-gnome-jni (>= ${source:Version}),
 +         ${misc:Depends}
- Description: The java-gnome language bindings project
++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.
 +
 +Package: libjava-gnome-jni
 +Section: libs
 +Architecture: any
 +Depends: ${misc:Depends}, ${shlibs:Depends}
 +Replaces: libjava-gnome-java (<< 4.0.11)
- Description: The java-gnome language bindings project
++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.
 +
 +Package: libjava-gnome-java-doc
 +Section: doc
 +Architecture: all
 +Depends: ${misc:Depends}
 +Suggests: libjava-gnome-java
- Description: The java-gnome language bindings project
++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 API documentation.
diff --cc debian/patches/01_take_screenshots.diff
index 7762543,0000000..735b5db
mode 100644,000000..100644
--- a/debian/patches/01_take_screenshots.diff
+++ b/debian/patches/01_take_screenshots.diff
@@@ -1,59 -1,0 +1,62 @@@
- Index: java-gnome-4.0.18/tests/screenshots/Harness.java
++## Description: add some description
++## Origin/Author: add some origin or author
++## Bug: bug URL
++Index: java-gnome-4.1.1/tests/screenshots/Harness.java
 +===================================================================
- --- 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
++--- 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,
- @@ -306,7 +306,7 @@
++@@ -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/series
index 2f8f48b,0000000..5d7457e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,1 @@@
 +01_take_screenshots.diff
- 02_javadoc_workaround.patch
- 03_libnotify_0_7.patch
diff --cc debian/watch
index b816863,0000000..db3c220
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,2 @@@
 +version=3
- http://ftp.gnome.org/pub/gnome/sources/java-gnome/([\d\.]+)/java-gnome-([\d\.]+)\.tar\.gz debian
++http://ftp.gnome.org/pub/gnome/sources/java-gnome/([\d\.]+)/java-gnome-([\d\.]+)\.tar\.bz2 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