This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository java-gnome.
commit 11ea931ffeaf76cc40c9a29bf52ad08548aabe28 Merge: 308b7e6 f449055 Author: Onkar Shinde <[email protected]> Date: Mon Sep 7 12:29:11 2009 +0530 Imported Debian patch 4.0.13-1 HACKING | 6 +- NEWS | 70 ++++- README | 20 +- build/faster | 1 + configure | 10 +- debian/README.source | 4 + debian/changelog | 29 ++ debian/control | 26 +- debian/libjava-gnome-java-doc.install | 3 + debian/libjava-gnome-java.install | 1 + debian/libjava-gnome-jni.install | 1 + debian/patches/01_change_jni_library_location.diff | 11 - debian/patches/01_take_screenshots.diff | 45 +++ debian/patches/series | 2 +- debian/rules | 80 +----- debian/watch | 2 +- .../{completion => entry}/ExampleLoginPrompt.java | 2 +- doc/examples/entry/ExampleSearchSomeone.java | 202 ++++++++++++++ doc/examples/treeview/ExampleTrailHeads.java | 6 +- .../org/freedesktop/bindings/Environment.c | 28 +- .../freedesktop/bindings/Internationalization.c | 20 +- src/bindings/org/freedesktop/bindings/Plumbing.c | 4 +- src/bindings/org/freedesktop/bindings/Time.c | 17 +- src/bindings/org/freedesktop/bindings/Version.java | 2 +- src/bindings/org/gnome/gdk/GdkPixbufOverride.c | 2 +- src/bindings/org/gnome/gdk/ModifierType.java | 10 +- src/bindings/org/gnome/gdk/Pixbuf.java | 2 +- src/bindings/org/gnome/glib/GObject.c | 24 +- src/bindings/org/gnome/glib/GValue.c | 16 +- src/bindings/org/gnome/gtk/Entry.java | 307 ++++++++++++++++++++- src/bindings/org/gnome/gtk/EntryIconPosition.java | 41 +++ src/bindings/org/gnome/gtk/GtkMain.c | 6 +- src/bindings/org/gnome/gtk/GtkTextBufferOverride.c | 42 +++ .../org/gnome/gtk/GtkTextBufferOverride.java | 14 + src/bindings/org/gnome/gtk/GtkTreeModelOverride.c | 84 +++--- src/bindings/org/gnome/gtk/Label.java | 22 ++ src/bindings/org/gnome/gtk/MenuShell.java | 22 +- src/bindings/org/gnome/gtk/Spell.java | 1 + src/bindings/org/gnome/gtk/TextBuffer.java | 54 +++- src/bindings/org/gnome/gtk/TextIter.java | 24 +- src/bindings/org/gnome/gtk/TextView.java | 7 +- src/bindings/org/gnome/notify/NotifyMainOverride.c | 3 +- .../org/gnome/notify/NotifyNotificationOverride.c | 17 +- src/bindings/org/gnome/pango/EllipsizeMode.java | 37 ++- src/bindings/org/gnome/pango/RiseAttribute.java | 34 +++ src/defs/GtkEntry.defs | 252 +++++++++++++++++ src/defs/GtkEntryIconPosition.defs | 10 + src/defs/PangoAttribute.defs | 19 +- .../codegen/FunctionGenerator.java | 4 +- .../operationaldynamics/codegen/StringThing.java | 8 +- .../com/operationaldynamics/codegen/Thing.java | 4 +- src/jni/bindings_java.h | 8 +- src/jni/bindings_java_convert.c | 8 +- src/jni/bindings_java_signal.c | 6 +- src/jni/bindings_java_util.c | 132 ++++++++- tests/bindings/UnitTests.java | 4 + tests/bindings/org/gnome/gtk/ValidateEntry.java | 45 +++ .../bindings/org/gnome/gtk/ValidateTextBuffer.java | 8 +- tests/bindings/org/gnome/gtk/ValidateUnicode.java | 75 +++++ tests/screenshots/Harness.java | 6 +- .../org/gnome/gtk/SnapshotEntryIcon.java | 40 +++ .../org/gnome/gtk/SnapshotEntryRed.java | 2 +- 62 files changed, 1704 insertions(+), 288 deletions(-) diff --cc debian/README.source index 0000000,0000000..19adb32 new file mode 100644 --- /dev/null +++ b/debian/README.source @@@ -1,0 -1,0 +1,4 @@@ ++This package uses quilt in order to apply patches to the upstream source. ++Patches are stored in debian/patches. ++ ++Please refer to /usr/share/doc/quilt/README.source for further details. diff --cc debian/changelog index 56b8063,0000000..c0a796c mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,69 -1,0 +1,98 @@@ ++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 7423221,0000000..5e3863a mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,40 -1,0 +1,58 @@@ +Source: java-gnome +Priority: optional +Maintainer: Debian Java maintainers <[email protected]> - Uploaders: Manu Mahajan <[email protected]>, Thomas Girard <[email protected]> - Build-Depends: debhelper (>= 5), default-jdk, junit, libgtk2.0-dev (>= 2.14), 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, quilt - Standards-Version: 3.8.2 ++Uploaders: Manu Mahajan <[email protected]>, Thomas Girard <[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, quilt, xvfb, xfonts-base, metacity, hicolor-icon-theme ++Standards-Version: 3.8.3 +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 + +Package: libjava-gnome-java +Architecture: all - Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java5-runtime, libjava-gnome-jni ++Depends: ${misc:Depends}, default-jre | java5-runtime, libjava-gnome-jni +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 + 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: ${shlibs:Depends}, ${misc: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 + 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 ++ 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/libjava-gnome-java-doc.install index 0000000,0000000..7c6fdf0 new file mode 100644 --- /dev/null +++ b/debian/libjava-gnome-java-doc.install @@@ -1,0 -1,0 +1,3 @@@ ++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/libjava-gnome-java.install index 0000000,0000000..5f91143 new file mode 100644 --- /dev/null +++ b/debian/libjava-gnome-java.install @@@ -1,0 -1,0 +1,1 @@@ ++debian/tmp/usr/share/java/*.jar /usr/share/java/ diff --cc debian/libjava-gnome-jni.install index 0000000,0000000..916bc3e new file mode 100644 --- /dev/null +++ b/debian/libjava-gnome-jni.install @@@ -1,0 -1,0 +1,1 @@@ ++debian/tmp/usr/lib/jni/*.so /usr/lib/jni/ diff --cc debian/patches/01_take_screenshots.diff index 0000000,0000000..a204b2f new file mode 100644 --- /dev/null +++ b/debian/patches/01_take_screenshots.diff @@@ -1,0 -1,0 +1,45 @@@ ++Index: java-gnome-4.0.13/tests/screenshots/Harness.java ++=================================================================== ++--- java-gnome-4.0.13.orig/tests/screenshots/Harness.java 2009-09-09 19:02:00.000000000 +0530 +++++ java-gnome-4.0.13/tests/screenshots/Harness.java 2009-09-09 19:23:36.000000000 +0530 ++@@ -66,7 +66,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; ++@@ -112,11 +112,11 @@ ++ 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[] { ++@@ -162,7 +162,7 @@ ++ SnapshotContextLine.class, ++ SnapshotTextView.class, ++ SnapshotTextViewBorderWindows.class, ++- SnapshotTextViewSpelling.class, +++ /*SnapshotTextViewSpelling.class,*/ ++ SnapshotContextArc.class, ++ SnapshotContextArcNegative.class, ++ SnapshotMatrixRotate.class, ++@@ -230,7 +230,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 c24981f,0000000..5d7457e mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,1 -1,0 +1,1 @@@ - 01_change_jni_library_location.diff ++01_take_screenshots.diff diff --cc debian/rules index ad6fcb4,0000000..63ad624 mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,80 -1,0 +1,12 @@@ +#!/usr/bin/make -f - # -*- makefile -*- - # Sample debian/rules that uses debhelper. - # This file was originally written by Joey Hess and Craig Small. - # As a special exception, when this file is copied by dh-make into a - # dh-make output file, you may use that output file without restriction. - # This special exception was added by Craig Small in version 0.37 of dh-make. + - QUILT_STAMPFN = patch-stamp - include /usr/share/quilt/quilt.make ++include /usr/share/cdbs/1/rules/debhelper.mk ++include /usr/share/cdbs/1/class/autotools.mk ++include /usr/share/cdbs/1/rules/patchsys-quilt.mk + - .config: patch-stamp - dh_testdir - # Add here commands to configure the package. - ./configure --prefix=/usr jdk=/usr/lib/jvm/default-java - - build: build-stamp - build-stamp: .config - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - - touch $@ - - clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - $(MAKE) distclean - - -test -f patch-stamp && $(MAKE) -f debian/rules unpatch - - dh_clean - - install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - # Add here commands to install the package into debian/tmp - $(MAKE) DESTDIR=debian/tmp install - # We don't install this one - -rm -f debian/tmp/usr/lib/libgtkjava-4.0.so - - libjava-gnome-jni: build install - dh_install -plibjava-gnome-jni debian/tmp/usr/lib/jni/libgtkjni-*.so - - libjava-gnome-java: build install - $(MAKE) DESTDIR=debian/libjava-gnome-java install - rm -rf debian/libjava-gnome-java/usr/lib - - # Build architecture-independent files here. - binary-indep: build install - - - # Build architecture-dependent files here. - binary-arch: build install libjava-gnome-jni libjava-gnome-java - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_install - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - - binary: binary-indep binary-arch - .PHONY: build clean binary-indep binary-arch binary install patch unpatch ++DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/jni jdk=/usr/lib/jvm/default-java ++DEB_MAKE_ENVVARS += DISPLAY=":99" ++DEB_MAKE_BUILD_TARGET += doc + +get-orig-source: + uscan --force-download --rename diff --cc debian/watch index 01af464,0000000..6ebee11 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/([[:digit:].]+)/java-gnome-([[:digit:].]+)\.tar\.gz ++http://ftp.gnome.org/pub/gnome/sources/java-gnome/([\d\.]+)/java-gnome-([\d\.]+)\.tar\.gz debian uupdate -- 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
