[pkg-java] r3312 - in trunk/libglade-java/debian: . patches

Thomas Girard tgg at alioth.debian.org
Mon Apr 23 19:25:16 UTC 2007 

Author: tgg
Date: 2007-04-23 19:25:16 +0000 (Mon, 23 Apr 2007)
New Revision: 3312

Added:
   trunk/libglade-java/debian/libglade-java-doc.doc-base
   trunk/libglade-java/debian/libglade-java-doc.install
Removed:
   trunk/libglade-java/debian/patches/01-no-version-in-installdir.diff
Modified:
   trunk/libglade-java/debian/control
   trunk/libglade-java/debian/libglade-java.install
   trunk/libglade-java/debian/rules
Log:
pass #1: merge with Ubuntu


Modified: trunk/libglade-java/debian/control
===================================================================
--- trunk/libglade-java/debian/control	2007-04-23 13:34:41 UTC (rev 3311)
+++ trunk/libglade-java/debian/control	2007-04-23 19:25:16 UTC (rev 3312)
@@ -2,15 +2,16 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Mark Howard <mh at debian.org>
-Build-Depends: debhelper (>> 4), gcj, java-gcj-compat-dev, docbook-utils, cdbs, pkg-config, libgnome-java (>= 2.12), libgtk-java (>= 2.8), libglib-java, libgnome2-dev, libglade2-dev, libgnomeui-dev, libgnomecanvas2-dev
-Standards-Version: 3.6.1.0
+Uploaders: Mark Howard <mh at debian.org>, Thomas Girard <thomas.g.girard at free.fr>
+Build-Depends: debhelper (>> 4), gcj, java-gcj-compat-dev (>= 1.0.65-6), docbook-utils, cdbs, pkg-config, libgnome-java (>= 2.12.6), libgtk-java (>= 2.10), libglib-java (>= 0.4), libgnome2-dev, libglade2-dev, libgnomeui-dev, libgnomecanvas2-dev
+Standards-Version: 3.7.2
 
 Package: libglade-java
 Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
+Architecture: all
+Depends: libgnome-java (>= 2.12.6)
 Replaces: libgtk2-java
+Recommends: libglade-java-gcj
 Conflicts: libgtk2-java
 Description: LIBGLADE bindings for Java
  The Java-Gnome project provides a framework for creating Gtk and Gnome
@@ -24,13 +25,37 @@
  .
  This package provides libglade support.
  .
- 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: libglade-java-gcj
+Section: libs
+Architecture: any
+Depends: libglade-java (>= ${Source-Version}), libgnome-java-gcj, ${misc:Depends}, ${shlibs:Depends}
+Description: LIBGLADE 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.
+
+Package: libglade-java-doc
+Section: doc
+Architecture: all
+Depends: classpath-doc, libgnome-java-doc
+Replaces: libglade-java (<< 2.12.5)
+Description: LIBGLADE 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 libglade bindings.

Added: trunk/libglade-java/debian/libglade-java-doc.doc-base
===================================================================
--- trunk/libglade-java/debian/libglade-java-doc.doc-base	2007-04-23 13:34:41 UTC (rev 3311)
+++ trunk/libglade-java/debian/libglade-java-doc.doc-base	2007-04-23 19:25:16 UTC (rev 3312)
@@ -0,0 +1,9 @@
+Document: libglade-java-doc
+Title: Programmer API for LIBGLADE Java bindings
+Author: Jeffrey S. Morgan <kuzman at gmail.com>
+Abstract: Javadocs programmer API for the LIBGLADE Java bindings
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libglade-java/api/index.html
+Files: /usr/share/doc/libglade-java/api/*.html

Added: trunk/libglade-java/debian/libglade-java-doc.install
===================================================================
--- trunk/libglade-java/debian/libglade-java-doc.install	2007-04-23 13:34:41 UTC (rev 3311)
+++ trunk/libglade-java/debian/libglade-java-doc.install	2007-04-23 19:25:16 UTC (rev 3312)
@@ -0,0 +1,2 @@
+doc/api usr/share/doc/libglade-java
+debian/tmp/usr/share/doc/libglade-java*/examples usr/share/doc/libglade-java

Modified: trunk/libglade-java/debian/libglade-java.install
===================================================================
--- trunk/libglade-java/debian/libglade-java.install	2007-04-23 13:34:41 UTC (rev 3311)
+++ trunk/libglade-java/debian/libglade-java.install	2007-04-23 19:25:16 UTC (rev 3312)
@@ -1 +1,3 @@
-debian/tmp/usr/*
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share/java
+debian/tmp/usr/lib/lib*jni*.so usr/lib/jni

Deleted: trunk/libglade-java/debian/patches/01-no-version-in-installdir.diff
===================================================================
--- trunk/libglade-java/debian/patches/01-no-version-in-installdir.diff	2007-04-23 13:34:41 UTC (rev 3311)
+++ trunk/libglade-java/debian/patches/01-no-version-in-installdir.diff	2007-04-23 19:25:16 UTC (rev 3312)
@@ -1,37 +0,0 @@
---- Makefile.in.orig	2005-06-12 13:13:17.000000000 +0100
-+++ Makefile.in	2005-06-12 13:13:56.000000000 +0100
-@@ -236,7 +236,7 @@
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--distdir = $(PACKAGE)-$(VERSION)
-+distdir = $(PACKAGE)
- top_distdir = $(distdir)
- am__remove_distdir = \
-   { test ! -d $(distdir) \
-@@ -540,13 +540,13 @@
- pkgconfig_DATA = glade-java.pc
- 
- # install examples script
--exampledir = $(datadir)/doc/libglade-java-$(VERSION)/examples
-+exampledir = $(datadir)/doc/libglade-java/examples
- 
- # build api docs
--apidir = $(datadir)/doc/libglade-java-$(VERSION)/api
-+apidir = $(datadir)/doc/libglade-java/api
- 
- # install other docs
--docdir = $(datadir)/doc/libglade-java-$(VERSION)
-+docdir = $(datadir)/doc/libglade-java
- doc_DATA = $(srcdir)/AUTHORS $(srcdir)/COPYING \
- 	$(srcdir)/NEWS $(srcdir)/README 
- 
-@@ -1745,7 +1745,7 @@
- 	done
- 
- uninstall-local:
--	-rm -rf $(DESTDIR)$(datadir)/doc/libglade-java-$(VERSION)
-+	-rm -rf $(DESTDIR)$(datadir)/doc/libglade-java
- 	-rm -f $(DESTDIR)$(glade_jardir)/glade$(apiversion)-$(VERSION).jar
- 
- clean-local:

Modified: trunk/libglade-java/debian/rules
===================================================================
--- trunk/libglade-java/debian/rules	2007-04-23 13:34:41 UTC (rev 3311)
+++ trunk/libglade-java/debian/rules	2007-04-23 19:25:16 UTC (rev 3312)
@@ -5,16 +5,48 @@
 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 = libglade-java
+jar  = glade2.12.jar
 
-binary-post-install/libglade-java::
-	-mv debian/libglade-java/usr/share/doc/libglade-java-*/* \
-		debian/libglade-java/usr/share/doc/libglade-java/
-	-rmdir debian/libglade-java/usr/share/doc/libglade-java-*
-	rm -f debian/libglade-java/usr/share/doc/libglade-java/COPYING*
-	rm -f debian/libglade-java/usr/share/doc/libglade-java/INSTALL*
+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 --without-gcj-compile
+
+DEB_MAKE_INSTALL_TARGET  := install DESTDIR=$(CURDIR)/debian/tmp/ \
+	docdir='$$(datadir)/doc/$(base)' \
+	apidir='$$(datadir)/doc/$(base)-doc/api'
+
+DEB_DH_MAKESHLIBS_ARGS_ALL = -Xlibgladejni
+DEB_COMPRESS_EXCLUDE = .java .glade
+
+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/glade-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
+
 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

More information about the pkg-java-commits mailing list