Author: gmazoyer-guest Date: 2011-07-30 09:37:37 +0000 (Sat, 30 Jul 2011) New Revision: 13891
Removed: trunk/java-gnome/debian/patches/02_javadoc_workaround.patch trunk/java-gnome/debian/patches/03_libnotify_0_7.patch Modified: trunk/java-gnome/debian/changelog trunk/java-gnome/debian/control trunk/java-gnome/debian/patches/01_take_screenshots.diff trunk/java-gnome/debian/patches/series Log: java-gnome: new upstream release 4.1.1 Modified: trunk/java-gnome/debian/changelog =================================================================== --- trunk/java-gnome/debian/changelog 2011-07-30 05:45:56 UTC (rev 13890) +++ trunk/java-gnome/debian/changelog 2011-07-30 09:37:37 UTC (rev 13891) @@ -1,3 +1,15 @@ +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. + + -- Guillaume Mazoyer <respawne...@gmail.com> Thu, 28 Jul 2011 21:07:13 +0200 + java-gnome (4.0.19-1) experimental; urgency=low * New upstream release. Modified: trunk/java-gnome/debian/control =================================================================== --- trunk/java-gnome/debian/control 2011-07-30 05:45:56 UTC (rev 13890) +++ trunk/java-gnome/debian/control 2011-07-30 09:37:37 UTC (rev 13891) @@ -12,15 +12,13 @@ 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, Modified: trunk/java-gnome/debian/patches/01_take_screenshots.diff =================================================================== --- trunk/java-gnome/debian/patches/01_take_screenshots.diff 2011-07-30 05:45:56 UTC (rev 13890) +++ trunk/java-gnome/debian/patches/01_take_screenshots.diff 2011-07-30 09:37:37 UTC (rev 13891) @@ -1,7 +1,10 @@ -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 @@ -48,7 +51,7 @@ SnapshotContextArc.class, SnapshotContextArcNegative.class, SnapshotMatrixRotate.class, -@@ -306,7 +306,7 @@ +@@ -311,7 +311,7 @@ if (windowManager != null) { System.out.println("KILL\tmetacity"); windowManager.destroy(); Deleted: trunk/java-gnome/debian/patches/02_javadoc_workaround.patch =================================================================== --- trunk/java-gnome/debian/patches/02_javadoc_workaround.patch 2011-07-30 05:45:56 UTC (rev 13890) +++ trunk/java-gnome/debian/patches/02_javadoc_workaround.patch 2011-07-30 09:37:37 UTC (rev 13891) @@ -1,28 +0,0 @@ -## 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 " Deleted: trunk/java-gnome/debian/patches/03_libnotify_0_7.patch =================================================================== --- trunk/java-gnome/debian/patches/03_libnotify_0_7.patch 2011-07-30 05:45:56 UTC (rev 13890) +++ trunk/java-gnome/debian/patches/03_libnotify_0_7.patch 2011-07-30 09:37:37 UTC (rev 13891) @@ -1,175 +0,0 @@ -## 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. Modified: trunk/java-gnome/debian/patches/series =================================================================== --- trunk/java-gnome/debian/patches/series 2011-07-30 05:45:56 UTC (rev 13890) +++ trunk/java-gnome/debian/patches/series 2011-07-30 09:37:37 UTC (rev 13891) @@ -1,3 +1 @@ 01_take_screenshots.diff -02_javadoc_workaround.patch -03_libnotify_0_7.patch _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits