Author: gmazoyer-guest Date: 2012-08-30 13:57:09 +0000 (Thu, 30 Aug 2012) New Revision: 16285
Added: trunk/java-gnome/debian/patches/02_unique_dependency.diff Removed: trunk/java-gnome/debian/patches/02_java7_compat.diff Modified: trunk/java-gnome/debian/changelog trunk/java-gnome/debian/control trunk/java-gnome/debian/patches/series trunk/java-gnome/debian/watch Log: java-gnome: new upstream release. Modified: trunk/java-gnome/debian/changelog =================================================================== --- trunk/java-gnome/debian/changelog 2012-08-25 04:04:08 UTC (rev 16284) +++ trunk/java-gnome/debian/changelog 2012-08-30 13:57:09 UTC (rev 16285) @@ -1,3 +1,17 @@ +java-gnome (4.1.2-1) unstable; urgency=low + + * New upstream release. + * debian/control + - Bump GTK required version to 3.4. + * debian/patches/02_java7_compat.diff + - Remove no longer needed patch (fixed upstream). + * debian/patches/02_unique_dependency.diff + - Add patch to fix the libunique dependency. + * debian/watch + - Upstream provides only .xz tarballs. + + -- Guillaume Mazoyer <[email protected]> Thu, 30 Aug 2012 15:51:50 +0200 + java-gnome (4.1.1-4) unstable; urgency=low * Team upload. Modified: trunk/java-gnome/debian/control =================================================================== --- trunk/java-gnome/debian/control 2012-08-25 04:04:08 UTC (rev 16284) +++ trunk/java-gnome/debian/control 2012-08-30 13:57:09 UTC (rev 16285) @@ -13,7 +13,7 @@ libcairo2-dev (>= 1.10), libenchant-dev, libglib2.0-dev (>= 2.28), - libgtk-3-dev (>= 3.0), + libgtk-3-dev (>= 3.4), libgtksourceview-3.0-dev (>= 3.0), libnotify-dev (>= 0.7), libpango1.0-dev (>= 1.28), Deleted: trunk/java-gnome/debian/patches/02_java7_compat.diff =================================================================== --- trunk/java-gnome/debian/patches/02_java7_compat.diff 2012-08-25 04:04:08 UTC (rev 16284) +++ trunk/java-gnome/debian/patches/02_java7_compat.diff 2012-08-30 13:57:09 UTC (rev 16285) @@ -1,32 +0,0 @@ -Description: Compatability with Java7. -Origin: http://pkgs.fedoraproject.org/gitweb/?p=java-gnome.git;a=commitdiff;h=4abfc555d053923e270cdff9ff23ce97c00a2ff3#patch1 - ---- java-gnome-4.1.1/src/bindings/org/gnome/glib/Plumbing.java.orig 2011-07-11 06:34:06.000000000 +0200 -+++ java-gnome-4.1.1/src/bindings/org/gnome/glib/Plumbing.java 2011-12-15 21:18:02.130046113 +0100 -@@ -153,7 +153,7 @@ - * Retrieve an array of appropriate Java Boxeds for the given array of - * pointers. - */ -- protected static Boxed[] boxedArrayFor(final Class<?> type, final long[] pointers, Boxed[] boxeds) { -+ protected static Boxed[] boxedArrayFor(final Class<? extends Boxed> type, final long[] pointers, Boxed[] boxeds) { - if (pointers == null) { - return null; - } -@@ -170,7 +170,7 @@ - * @throw ClassCastException if the GType pointed by given pointer is not - * a GBoxed. - */ -- protected static Boxed boxedFor(Class<?> type, final long pointer) { -+ protected static Boxed boxedFor(Class<? extends Boxed> type, final long pointer) { - Boxed proxy; - - if (pointer == 0L) { -@@ -202,7 +202,7 @@ - * - * @see #boxedFor(Class, long) - */ -- protected static void fillBoxedArray(Class<?> type, Boxed[] boxeds, long[] pointers) { -+ protected static void fillBoxedArray(Class<? extends Boxed> type, Boxed[] boxeds, long[] pointers) { - if (pointers == null) { - return; - } Added: trunk/java-gnome/debian/patches/02_unique_dependency.diff =================================================================== --- trunk/java-gnome/debian/patches/02_unique_dependency.diff (rev 0) +++ trunk/java-gnome/debian/patches/02_unique_dependency.diff 2012-08-30 13:57:09 UTC (rev 16285) @@ -0,0 +1,13 @@ +Index: java-gnome-4.1.2/build/faster +=================================================================== +--- java-gnome-4.1.2.orig/build/faster 2012-08-30 05:44:57.000000000 +0200 ++++ java-gnome-4.1.2/build/faster 2012-08-30 15:34:56.762487244 +0200 +@@ -63,7 +63,7 @@ + hashFile = "tmp/.hashes" + lockFile = "tmp/.build" + +-GNOME_MODULES = "gthread-2.0 glib-2.0 gtk+-3.0 gtk+-unix-print-3.0 gtksourceview-3.0 libnotify enchant librsvg-2.0" ++GNOME_MODULES = "gthread-2.0 glib-2.0 gtk+-3.0 gtk+-unix-print-3.0 gtksourceview-3.0 libnotify enchant librsvg-2.0 unique-3.0" + + # + # Armour against multiple simultaneous invocations. Modified: trunk/java-gnome/debian/patches/series =================================================================== --- trunk/java-gnome/debian/patches/series 2012-08-25 04:04:08 UTC (rev 16284) +++ trunk/java-gnome/debian/patches/series 2012-08-30 13:57:09 UTC (rev 16285) @@ -1,2 +1,2 @@ 01_take_screenshots.diff -02_java7_compat.diff +02_unique_dependency.diff Modified: trunk/java-gnome/debian/watch =================================================================== --- trunk/java-gnome/debian/watch 2012-08-25 04:04:08 UTC (rev 16284) +++ trunk/java-gnome/debian/watch 2012-08-30 13:57:09 UTC (rev 16285) @@ -1,2 +1,2 @@ version=3 -http://ftp.gnome.org/pub/gnome/sources/java-gnome/([\d\.]+)/java-gnome-([\d\.]+)\.tar\.bz2 debian +http://ftp.gnome.org/pub/gnome/sources/java-gnome/([\d\.]+)/java-gnome-([\d\.]+)\.tar\.xz debian _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

