[pkg-java] r13349 - in trunk/java-gnome/debian: . patches
Guillaume Mazoyer
gmazoyer-guest at alioth.debian.org
Wed Feb 23 16:34:32 UTC 2011
Author: gmazoyer-guest
Date: 2011-02-23 16:34:30 +0000 (Wed, 23 Feb 2011)
New Revision: 13349
Added:
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/copyright
trunk/java-gnome/debian/libjava-gnome-java-doc.install
trunk/java-gnome/debian/patches/series
Log:
java-gnome 4.0.19
Modified: trunk/java-gnome/debian/changelog
===================================================================
--- trunk/java-gnome/debian/changelog 2011-02-22 21:35:23 UTC (rev 13348)
+++ trunk/java-gnome/debian/changelog 2011-02-23 16:34:30 UTC (rev 13349)
@@ -1,3 +1,15 @@
+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).
Modified: trunk/java-gnome/debian/control
===================================================================
--- trunk/java-gnome/debian/control 2011-02-22 21:35:23 UTC (rev 13348)
+++ trunk/java-gnome/debian/control 2011-02-23 16:34:30 UTC (rev 13349)
@@ -1,8 +1,30 @@
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: debhelper (>= 5), cdbs, default-jdk, junit, libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.22), libcairo2-dev (>= 1.10), libpango1.0-dev (>= 1.28), libatk1.0-dev, libgtksourceview2.0-dev (>= 2.6.1), libnotify-dev (>= 0.4.5), libgtkspell-dev (>= 2.0.15), libunique-dev (>= 1.0.8), libglade2-dev, librsvg2-dev, xvfb, xfonts-base, metacity, hicolor-icon-theme
+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.4.5),
+ 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/
@@ -12,32 +34,34 @@
Package: libjava-gnome-java
Architecture: all
-Depends: ${misc:Depends}, libjava-gnome-jni (>= ${source:Version})
+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
@@ -46,14 +70,14 @@
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.
Modified: trunk/java-gnome/debian/copyright
===================================================================
--- trunk/java-gnome/debian/copyright 2011-02-22 21:35:23 UTC (rev 13348)
+++ trunk/java-gnome/debian/copyright 2011-02-23 16:34:30 UTC (rev 13349)
@@ -35,35 +35,35 @@
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.
Modified: trunk/java-gnome/debian/libjava-gnome-java-doc.install
===================================================================
--- trunk/java-gnome/debian/libjava-gnome-java-doc.install 2011-02-22 21:35:23 UTC (rev 13348)
+++ trunk/java-gnome/debian/libjava-gnome-java-doc.install 2011-02-23 16:34:30 UTC (rev 13349)
@@ -1,3 +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/
Added: trunk/java-gnome/debian/patches/02_javadoc_workaround.patch
===================================================================
--- trunk/java-gnome/debian/patches/02_javadoc_workaround.patch (rev 0)
+++ trunk/java-gnome/debian/patches/02_javadoc_workaround.patch 2011-02-23 16:34:30 UTC (rev 13349)
@@ -0,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 "
Added: trunk/java-gnome/debian/patches/03_libnotify_0_7.patch
===================================================================
--- trunk/java-gnome/debian/patches/03_libnotify_0_7.patch (rev 0)
+++ trunk/java-gnome/debian/patches/03_libnotify_0_7.patch 2011-02-23 16:34:30 UTC (rev 13349)
@@ -0,0 +1,149 @@
+## 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-20 22:05:19.334711005 +0100
++++ java-gnome-4.0.19/src/bindings/org/gnome/notify/Notification.java 2011-02-20 22:04:25.642711002 +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-20 22:05:18.846710996 +0100
++++ java-gnome-4.0.19/src/defs/NotifyNotification.defs 2011-02-20 22:01:33.650710998 +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")
Modified: trunk/java-gnome/debian/patches/series
===================================================================
--- trunk/java-gnome/debian/patches/series 2011-02-22 21:35:23 UTC (rev 13348)
+++ trunk/java-gnome/debian/patches/series 2011-02-23 16:34:30 UTC (rev 13349)
@@ -1 +1,3 @@
01_take_screenshots.diff
+02_javadoc_workaround.patch
+03_libnotify_0_7.patch
More information about the pkg-java-commits
mailing list