Author: tgg Date: 2007-04-09 14:12:38 +0000 (Mon, 09 Apr 2007) New Revision: 3154
Added: trunk/glib-java/debian/libglib-java-doc.doc-base trunk/glib-java/debian/libglib-java-doc.install trunk/glib-java/debian/libglib-java-gcj.install trunk/glib-java/debian/libglib-java.install Removed: trunk/glib-java/debian/glib-java.install trunk/glib-java/debian/libglib-java.lintian Modified: trunk/glib-java/debian/control trunk/glib-java/debian/rules Log: continue merge with Ubuntu Modified: trunk/glib-java/debian/control =================================================================== --- trunk/glib-java/debian/control 2007-04-09 13:37:30 UTC (rev 3153) +++ trunk/glib-java/debian/control 2007-04-09 14:12:38 UTC (rev 3154) @@ -2,17 +2,18 @@ Section: libs Priority: optional Maintainer: Debian Java maintainers <[email protected]> -Uploaders: Mark Howard <[EMAIL PROTECTED]> -Build-Depends: debhelper (>> 5), gcj, java-gcj-compat-dev, docbook-utils, cdbs (>= 0.4.34), pkg-config, libglib2.0-dev +Uploaders: Mark Howard <[EMAIL PROTECTED]>, Thomas Girard <[EMAIL PROTECTED]> +Build-Depends: debhelper (>> 5), gcj, java-gcj-compat-dev (>= 1.0.65-6), docbook-utils, cdbs (>= 0.4.34), pkg-config, libglib2.0-dev (>= 2.12.0) Standards-Version: 3.7.2.0 Package: libglib-java Section: libs -Architecture: any -Depends: ${shlibs:Depends} +Architecture: all +Depends: libglib-jni (>= ${source:Version}) Replaces: libgtk2-java, glib-java +Recommends: libglib-java-gcj Conflicts: libgtk2-java -Description: GLIB bindings for Java +Description: GLib bindings for Java The Java-Gnome project provides a framework for creating Gtk and Gnome applications using Java. This covers the entire gtk and gnome API, so you can create true gnome applications, which work just like any other desktop @@ -22,15 +23,79 @@ as stock icons, and file chooser buttons; or if you want to use additional gnome libraries such as gnome-vfs, vte, libmozembed. . - This package provides glib support. + This package provides architecture-independant files for GLib bindings. . - These Debian packages provide both java bytecode for running in a JVM and - natively compiled code (gcj) to run applications directly. Java-Gnome is also - available for windows platforms if you want cross-platform compatibility. - Java-Gnome is now API stable - if you develop an application for java-gnome - 2.x, it will work with java-gnome 2.(x+2). It is also regularly updated to the - latest bindings - it is part of the official gnome bindings release and - follows the gnome release schedule. + http://java-gnome.sf.net + +Package: libglib-jni +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Replaces: libglib-java (<< 0.4.2-2) +Description: GLib bindings for Java (native library) + The Java-Gnome project provides a framework for creating Gtk and Gnome + applications using Java. This covers the entire gtk and gnome API, so you can + create true gnome applications, which work just like any other desktop + application. Most other Java UI toolkits such as SWT or swing provide at most + compatibility layers so that your app will look like gnome appliactions. You + should use java-gnome if you want to use standard gtk and gnome features such + as stock icons, and file chooser buttons; or if you want to use additional + gnome libraries such as gnome-vfs, vte, libmozembed. . + This package provides the architecture-dependant library for GLib bindings. + . http://java-gnome.sf.net +Package: libglib-cni +Section: libs +Architecture: any +Depends: libglib-jni (= ${binary:Version}), ${shlibs:Depends} +Conflicts: libglib-java (<< 0.4.2-2) +Description: GLib bindings for Java (native code) + The Java-Gnome project provides a framework for creating Gtk and Gnome + applications using Java. This covers the entire gtk and gnome API, so you can + create true gnome applications, which work just like any other desktop + application. Most other Java UI toolkits such as SWT or swing provide at most + compatibility layers so that your app will look like gnome appliactions. You + should use java-gnome if you want to use standard gtk and gnome features such + as stock icons, and file chooser buttons; or if you want to use additional + gnome libraries such as gnome-vfs, vte, libmozembed. + . + This package provides natively compiled code for GLib bindings. + . + http://java-gnome.sf.net + +Package: libglib-java-gcj +Section: libs +Architecture: any +Depends: libglib-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} +Description: GLib bindings for Java (native code for use with gij) + The Java-Gnome project provides a framework for creating Gtk and Gnome + applications using Java. This covers the entire gtk and gnome API, so you can + create true gnome applications, which work just like any other desktop + application. Most other Java UI toolkits such as SWT or swing provide at most + compatibility layers so that your app will look like gnome appliactions. You + should use java-gnome if you want to use standard gtk and gnome features such + as stock icons, and file chooser buttons; or if you want to use additional + gnome libraries such as gnome-vfs, vte, libmozembed. + . + This package provides natively compiled code to run with gij. + . + http://java-gnome.sf.net + +Package: libglib-java-doc +Section: doc +Architecture: all +Depends: classpath-doc +Replaces: libglib-java (<< 0.4.2-2) +Description: GLib bindings for Java (API documentation) + The Java-Gnome project provides a framework for creating Gtk and Gnome + applications using Java. This covers the entire gtk and gnome API, so you can + create true gnome applications, which work just like any other desktop + application. Most other Java UI toolkits such as SWT or swing provide at most + compatibility layers so that your app will look like gnome appliactions. You + should use java-gnome if you want to use standard gtk and gnome features such + as stock icons, and file chooser buttons; or if you want to use additional + gnome libraries such as gnome-vfs, vte, libmozembed. + . + This package contains the API documentation for the GLib bindings. Deleted: trunk/glib-java/debian/glib-java.install =================================================================== --- trunk/glib-java/debian/glib-java.install 2007-04-09 13:37:30 UTC (rev 3153) +++ trunk/glib-java/debian/glib-java.install 2007-04-09 14:12:38 UTC (rev 3154) @@ -1 +0,0 @@ -debian/tmp/usr/* Added: trunk/glib-java/debian/libglib-java-doc.doc-base =================================================================== --- trunk/glib-java/debian/libglib-java-doc.doc-base 2007-04-09 13:37:30 UTC (rev 3153) +++ trunk/glib-java/debian/libglib-java-doc.doc-base 2007-04-09 14:12:38 UTC (rev 3154) @@ -0,0 +1,9 @@ +Document: libglib-java-doc +Title: Programmer API for GLib Java bindings +Author: Jeffrey S. Morgan <[EMAIL PROTECTED]> +Abstract: Javadocs programmer API for the GLib Java bindings +Section: Programming + +Format: HTML +Index: /usr/share/doc/libglib-java/api/index.html +Files: /usr/share/doc/libglib-java/api/*.html Added: trunk/glib-java/debian/libglib-java-doc.install =================================================================== --- trunk/glib-java/debian/libglib-java-doc.install 2007-04-09 13:37:30 UTC (rev 3153) +++ trunk/glib-java/debian/libglib-java-doc.install 2007-04-09 14:12:38 UTC (rev 3154) @@ -0,0 +1 @@ +doc/api usr/share/doc/libglib-java Added: trunk/glib-java/debian/libglib-java-gcj.install =================================================================== --- trunk/glib-java/debian/libglib-java-gcj.install 2007-04-09 13:37:30 UTC (rev 3153) +++ trunk/glib-java/debian/libglib-java-gcj.install 2007-04-09 14:12:38 UTC (rev 3154) @@ -0,0 +1 @@ +glib*.jar.so usr/lib/gcj Copied: trunk/glib-java/debian/libglib-java.install (from rev 3152, trunk/glib-java/debian/glib-java.install) =================================================================== --- trunk/glib-java/debian/glib-java.install 2007-04-03 14:21:15 UTC (rev 3152) +++ trunk/glib-java/debian/libglib-java.install 2007-04-09 14:12:38 UTC (rev 3154) @@ -0,0 +1,5 @@ +debian/tmp/usr/share/java/glib*.jar +debian/tmp/usr/share/glib-java +debian/tmp/usr/include +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/lib/lib*jni*.so usr/lib/jni Deleted: trunk/glib-java/debian/libglib-java.lintian =================================================================== --- trunk/glib-java/debian/libglib-java.lintian 2007-04-09 13:37:30 UTC (rev 3153) +++ trunk/glib-java/debian/libglib-java.lintian 2007-04-09 14:12:38 UTC (rev 3154) @@ -1,4 +0,0 @@ -# this package isn't big enough to have separate -java and -jni binary packages. -# Following java naming conventions for binary packages. - -libglib-java: package-name-doesnt-match-sonames libglibjni-0.2 libglibjava-0.2 Modified: trunk/glib-java/debian/rules =================================================================== --- trunk/glib-java/debian/rules 2007-04-09 13:37:30 UTC (rev 3153) +++ trunk/glib-java/debian/rules 2007-04-09 14:12:38 UTC (rev 3154) @@ -2,22 +2,52 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -include /usr/share/cdbs/1/rules/utils.mk -include /usr/share/cdbs/1/class/gnome.mk -CFLAGS = -I/usr/lib/jvm/java-gcj/include +base = libglib-java +jar = glib0.4.jar -binary-post-install/libglib-java:: - mv debian/libglib-java/usr/share/doc/glib-java-*/* \ - debian/libglib-java/usr/share/doc/libglib-java/ - rmdir debian/libglib-java/usr/share/doc/glib-java-* - rm -f debian/libglib-java/usr/share/doc/libglib-java/COPYING* - rm -f debian/libglib-java/usr/share/doc/libglib-java/INSTALL* - rm -f debian/libglib-java/usr/share/doc/libglib-java/NEWS* - mkdir -p debian/libglib-java/usr/share/lintian/overrides - cp debian/libglib-java.lintian debian/libglib-java/usr/share/lintian/overrides/libglib-java +include /usr/share/gcj/debian_defaults +DEB_HOST_ARCH ?= $(shell dpkg-architecture qDEB_HOST_ARCH) +ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs))) + with_native := yes +endif + +DEB_CONFIGURE_EXTRA_FLAGS = --without-javadocs + +DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/ \ + docdir='$$(datadir)/doc/$(base)' \ + apidir='$$(datadir)/doc/$(base)-doc/api' + +DEB_COMPRESS_EXCLUDE = .java + +common-post-build-indep:: + $(MAKE) doc-stamp \ + JAVADOC=gjdoc \ + JAVADOC_OPTIONS='' \ + JAVADOC_FOOTER='' + +binary-post-install/$(base):: + sed -i -e 's/-[0-9.]*\.jar$$/.jar/' \ + debian/$(base)/usr/lib/pkgconfig/glib-java.pc + +binary-post-install/$(base)-gcj:: + rm -rf debian/$(base)-gcj/usr/share/doc/$(base)-gcj + ln -s $(base) \ + debian/$(base)-gcj/usr/share/doc/$(base)-gcj +ifeq ($(with_native),yes) + dh_nativejava -p$(base)-gcj +endif + +binary-post-install/$(base)-doc:: + cd debian/$(base)-doc/usr/share/doc/$(base)-doc \ + && rm -f changelog + +binary-predeb/$(base):: + rm -f debian/$(base)/DEBIAN/shlibs + clean:: - -rm -rf doc/api/ - find -name *.Plo | xargs rm -f + rm -rf doc/api + rm -f $(jar).so + find -name *.Plo | xargs -r rm -f _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
