Author: onkarshinde-guest
Date: 2009-09-09 15:32:07 +0000 (Wed, 09 Sep 2009)
New Revision: 10330
Added:
trunk/java-gnome/debian/README.source
trunk/java-gnome/debian/libjava-gnome-java-doc.install
trunk/java-gnome/debian/libjava-gnome-java.install
trunk/java-gnome/debian/libjava-gnome-jni.install
trunk/java-gnome/debian/patches/
trunk/java-gnome/debian/patches/01_take_screenshots.diff
trunk/java-gnome/debian/patches/series
Modified:
trunk/java-gnome/debian/changelog
trunk/java-gnome/debian/control
trunk/java-gnome/debian/rules
Log:
Added -doc package. :-)
Added: trunk/java-gnome/debian/README.source
===================================================================
--- trunk/java-gnome/debian/README.source (rev 0)
+++ trunk/java-gnome/debian/README.source 2009-09-09 15:32:07 UTC (rev
10330)
@@ -0,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.
Modified: trunk/java-gnome/debian/changelog
===================================================================
--- trunk/java-gnome/debian/changelog 2009-09-08 20:51:31 UTC (rev 10329)
+++ trunk/java-gnome/debian/changelog 2009-09-09 15:32:07 UTC (rev 10330)
@@ -2,15 +2,26 @@
* 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.
- - Bump GTK+ build dependency version as per upstream.
- - Remove quilt build dependency. Not needed anymore.
- - Change standard version to 3.8.3. No changes needed.
+ - Change standard version to 3.8.3.
* debian/rules
- - Pass argument to configure for specifying jni directory.
- - Remove unnecessary code.
- * debian/patches
+ - 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.
Modified: trunk/java-gnome/debian/control
===================================================================
--- trunk/java-gnome/debian/control 2009-09-08 20:51:31 UTC (rev 10329)
+++ trunk/java-gnome/debian/control 2009-09-09 15:32:07 UTC (rev 10330)
@@ -2,7 +2,7 @@
Priority: optional
Maintainer: Debian Java maintainers
<[email protected]>
Uploaders: Manu Mahajan <[email protected]>, Thomas Girard
<[email protected]>, Onkar Shinde <[email protected]>
-Build-Depends: debhelper (>= 5), 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
+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/
@@ -11,7 +11,7 @@
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
@@ -38,3 +38,21 @@
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.
Added: trunk/java-gnome/debian/libjava-gnome-java-doc.install
===================================================================
--- trunk/java-gnome/debian/libjava-gnome-java-doc.install
(rev 0)
+++ trunk/java-gnome/debian/libjava-gnome-java-doc.install 2009-09-09
15:32:07 UTC (rev 10330)
@@ -0,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/
Added: trunk/java-gnome/debian/libjava-gnome-java.install
===================================================================
--- trunk/java-gnome/debian/libjava-gnome-java.install
(rev 0)
+++ trunk/java-gnome/debian/libjava-gnome-java.install 2009-09-09 15:32:07 UTC
(rev 10330)
@@ -0,0 +1 @@
+debian/tmp/usr/share/java/*.jar /usr/share/java/
Added: trunk/java-gnome/debian/libjava-gnome-jni.install
===================================================================
--- trunk/java-gnome/debian/libjava-gnome-jni.install
(rev 0)
+++ trunk/java-gnome/debian/libjava-gnome-jni.install 2009-09-09 15:32:07 UTC
(rev 10330)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/jni/*.so /usr/lib/jni/
Added: trunk/java-gnome/debian/patches/01_take_screenshots.diff
===================================================================
--- trunk/java-gnome/debian/patches/01_take_screenshots.diff
(rev 0)
+++ trunk/java-gnome/debian/patches/01_take_screenshots.diff 2009-09-09
15:32:07 UTC (rev 10330)
@@ -0,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");
Added: trunk/java-gnome/debian/patches/series
===================================================================
--- trunk/java-gnome/debian/patches/series (rev 0)
+++ trunk/java-gnome/debian/patches/series 2009-09-09 15:32:07 UTC (rev
10330)
@@ -0,0 +1 @@
+01_take_screenshots.diff
Modified: trunk/java-gnome/debian/rules
===================================================================
--- trunk/java-gnome/debian/rules 2009-09-08 20:51:31 UTC (rev 10329)
+++ trunk/java-gnome/debian/rules 2009-09-09 15:32:07 UTC (rev 10330)
@@ -1,73 +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.
-.config:
- dh_testdir
- # Add here commands to configure the package.
- ./configure --prefix=/usr --libdir=/usr/lib/jni
jdk=/usr/lib/jvm/default-java
+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
-build: build-stamp
-build-stamp: .config
- dh_testdir
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/jni
jdk=/usr/lib/jvm/default-java
+DEB_MAKE_ENVVARS += DISPLAY=":99"
+DEB_MAKE_BUILD_TARGET += doc
- # 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
-
- 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
-
-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
-
get-orig-source:
uscan --force-download --rename
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
