[pkg-java] r3313 - trunk/libglade-java/debian
Thomas Girard
tgg at alioth.debian.org
Mon Apr 23 20:33:22 UTC 2007
Author: tgg
Date: 2007-04-23 20:33:22 +0000 (Mon, 23 Apr 2007)
New Revision: 3313
Added:
trunk/libglade-java/debian/libglade-cni.install
trunk/libglade-java/debian/libglade-cni.lintian
trunk/libglade-java/debian/libglade-jni.install
Modified:
trunk/libglade-java/debian/changelog
trunk/libglade-java/debian/compat
trunk/libglade-java/debian/control
trunk/libglade-java/debian/libglade-java.install
trunk/libglade-java/debian/rules
Log:
mimick other packages
Modified: trunk/libglade-java/debian/changelog
===================================================================
--- trunk/libglade-java/debian/changelog 2007-04-23 19:25:16 UTC (rev 3312)
+++ trunk/libglade-java/debian/changelog 2007-04-23 20:33:22 UTC (rev 3313)
@@ -1,10 +1,60 @@
-libglade-java (2.12.4-2) UNRELEASED; urgency=low
+libglade-java (2.12.8-1) experimental; urgency=low
+ [Thomas Girard]
+ * Add myself to Uploaders.
+ * Merge with Ubuntu:
+ o new packages libglade-java-doc, libglade-java-gcj
+ o bump standards
+ o tighten build-dependencies on java-gcj-compat-dev, libgnome-java,
+ libgtk-java and libglib-java.
+ * New upstream release.
+ * Bump debhelper level and build-dependency.
+ * New packages, libglade-cni and libglade-jni.
- * NOT RELEASED YET
- * debian/watch: added
+ [Mark Howard]
+ * debian/watch: added.
- -- Mark Howard <mh at debian.org> Thu, 28 Sep 2006 21:39:31 +0100
+ -- Thomas Girard <thomas.g.girard at free.fr> Mon, 23 Apr 2007 18:28:57 +0000
+libglade-java (2.12.7-0ubuntu3) feisty; urgency=low
+
+ * Fix typo in last dependency change.
+
+ -- Matthias Klose <doko at ubuntu.com> Mon, 8 Jan 2007 10:10:13 +0000
+
+libglade-java (2.12.7-0ubuntu2) feisty; urgency=low
+
+ * Tighten (build-)dependency on libgnome-java.
+
+ -- Matthias Klose <doko at ubuntu.com> Sun, 7 Jan 2007 10:51:34 +0000
+
+libglade-java (2.12.7-0ubuntu1) feisty; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at ubuntu.com> Sat, 6 Jan 2007 21:09:56 +0000
+
+libglade-java (2.12.6-0ubuntu1) edgy; urgency=low
+
+ * New upstream release.
+ * Build using dh_nativejava.
+
+ -- Matthias Klose <doko at ubuntu.com> Mon, 9 Oct 2006 22:05:27 +0200
+
+libglade-java (2.12.5-0ubuntu1) edgy; urgency=low
+
+ * New upstream release
+ * Makefile.am: Unconditionalize the doc-stamp target, remove the
+ install-data-hook.
+ * Split out libglade-java-doc. Configure --without-javadocs, because gjdoc
+ fails on some architectures.
+ * Split out libglade-java-gcj.
+ * Configure --without-gcj-compile; rebuild the natively compiled for gcj
+ from bytecode instead from source using using -fjni -findirect-dispatch.
+ * Do not install a shlibs file for the jni library.
+ * Register the API docs.
+
+ -- Matthias Klose <doko at ubuntu.com> Wed, 16 Aug 2006 23:16:50 +0000
+
libglade-java (2.12.4-1) unstable; urgency=low
* New upstream release
@@ -38,6 +88,7 @@
* Initial release.
-- root <natem at natemccallum.com> Sun, 8 Jan 2006 19:37:16 +0000
+
libglade-java (2.10.1-1) unstable; urgency=low
* New upstream release. Closes: #316156
Modified: trunk/libglade-java/debian/compat
===================================================================
--- trunk/libglade-java/debian/compat 2007-04-23 19:25:16 UTC (rev 3312)
+++ trunk/libglade-java/debian/compat 2007-04-23 20:33:22 UTC (rev 3313)
@@ -1 +1 @@
-4
+5
Modified: trunk/libglade-java/debian/control
===================================================================
--- trunk/libglade-java/debian/control 2007-04-23 19:25:16 UTC (rev 3312)
+++ trunk/libglade-java/debian/control 2007-04-23 20:33:22 UTC (rev 3313)
@@ -3,13 +3,13 @@
Priority: optional
Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
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
+Build-Depends: debhelper (>> 5), 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, quilt (>= 0.29-2), autotools-dev
Standards-Version: 3.7.2
Package: libglade-java
Section: libs
Architecture: all
-Depends: libgnome-java (>= 2.12.6)
+Depends: libglade-jni (>= ${source:Version}), libgnome-java (>= 2.12.6)
Replaces: libgtk2-java
Recommends: libglade-java-gcj
Conflicts: libgtk2-java
@@ -27,6 +27,43 @@
.
http://java-gnome.sf.net
+Package: libglade-jni
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libglade-java (<< 2.12.8-1)
+Description: LIBGLADE 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 files for glade support.
+ .
+ http://java-gnome.sf.net
+
+Package: libglade-cni
+Section: libs
+Architecture: any
+Depends: libglade-jni (= ${binary:Version}), ${shlibs:Depends}
+Description: LIBGLADE 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 glade support.
+ .
+ http://java-gnome.sf.net
+
Package: libglade-java-gcj
Section: libs
Architecture: any
@@ -42,12 +79,14 @@
gnome libraries such as gnome-vfs, vte, libmozembed.
.
This package provides natively compiled code to run with gij.
+ .
+ http://java-gnome.sf.net
Package: libglade-java-doc
Section: doc
Architecture: all
Depends: classpath-doc, libgnome-java-doc
-Replaces: libglade-java (<< 2.12.5)
+Replaces: libglade-java (<< 2.12.8-1)
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
@@ -59,3 +98,6 @@
gnome libraries such as gnome-vfs, vte, libmozembed.
.
This package contains the API documentation for the libglade bindings.
+ .
+ http://java-gnome.sf.net
+
Added: trunk/libglade-java/debian/libglade-cni.install
===================================================================
--- trunk/libglade-java/debian/libglade-cni.install 2007-04-23 19:25:16 UTC (rev 3312)
+++ trunk/libglade-java/debian/libglade-cni.install 2007-04-23 20:33:22 UTC (rev 3313)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libgladejava*.so usr/lib
Added: trunk/libglade-java/debian/libglade-cni.lintian
===================================================================
--- trunk/libglade-java/debian/libglade-cni.lintian 2007-04-23 19:25:16 UTC (rev 3312)
+++ trunk/libglade-java/debian/libglade-cni.lintian 2007-04-23 20:33:22 UTC (rev 3313)
@@ -0,0 +1 @@
+libglade-cni: package-name-doesnt-match-sonames libgladejava-2.12
Modified: trunk/libglade-java/debian/libglade-java.install
===================================================================
--- trunk/libglade-java/debian/libglade-java.install 2007-04-23 19:25:16 UTC (rev 3312)
+++ trunk/libglade-java/debian/libglade-java.install 2007-04-23 20:33:22 UTC (rev 3313)
@@ -1,3 +1 @@
-debian/tmp/usr/lib/pkgconfig
debian/tmp/usr/share/java
-debian/tmp/usr/lib/lib*jni*.so usr/lib/jni
Added: trunk/libglade-java/debian/libglade-jni.install
===================================================================
--- trunk/libglade-java/debian/libglade-jni.install 2007-04-23 19:25:16 UTC (rev 3312)
+++ trunk/libglade-java/debian/libglade-jni.install 2007-04-23 20:33:22 UTC (rev 3313)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/lib*jni*.so usr/lib/jni
Modified: trunk/libglade-java/debian/rules
===================================================================
--- trunk/libglade-java/debian/rules 2007-04-23 19:25:16 UTC (rev 3312)
+++ trunk/libglade-java/debian/rules 2007-04-23 20:33:22 UTC (rev 3313)
@@ -1,12 +1,18 @@
#!/usr/bin/make -f
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
+# make sure we'll run patched distclean: target *before* unpatching
+# because upstream distclean: removes files we want to keep
+clean:: distclean-first
+
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
base = libglade-java
jar = glade2.12.jar
+jni = libglade-jni
+cni = libglade-cni
include /usr/share/gcj/debian_defaults
@@ -15,13 +21,15 @@
with_native := yes
endif
-DEB_CONFIGURE_EXTRA_FLAGS = --without-javadocs --without-gcj-compile
+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_DH_MAKESHLIBS_ARGS_ALL = -Xlibgladejni
+DEB_DH_MAKESHLIBS_ARGS_$(jni) = -n -V "$(jni) (>= 2.12.8)"
+DEB_DH_MAKESHLIBS_ARGS_$(cni) = -V "$(cni) (>= 2.12.8)"
+DEB_DH_SHLIBDEPS_ARGS_$(jni) = -l/usr/lib/jni
DEB_COMPRESS_EXCLUDE = .java .glade
common-post-build-indep::
@@ -30,11 +38,15 @@
JAVADOC_OPTIONS='' \
JAVADOC_FOOTER=''
-binary-post-install/$(base)::
+binary-post-install/$(jni)::
sed -i -e 's/-[0-9.]*\.jar$$/.jar/' \
debian/$(base)/usr/lib/pkgconfig/glade-java.pc
-binary-post-install/$(base)-gcj::
+binary-post-install/$(cni)::
+ mkdir -p debian/$(cni)/usr/share/lintian/overrides
+ cp debian/$(cni).lintian debian/$(cni)/usr/share/lintian/overrides/$(cni)
+
+binary-post-install/$(base)-gcj:: binary-post-install/$(base)
rm -rf debian/$(base)-gcj/usr/share/doc/$(base)-gcj
ln -s $(base) \
debian/$(base)-gcj/usr/share/doc/$(base)-gcj
@@ -43,10 +55,14 @@
endif
binary-post-install/$(base)-doc::
- cd debian/$(base)-doc/usr/share/doc/$(base)-doc \
- && rm -f changelog
+ rm -f debian/$(base)-doc/usr/share/doc/$(base)-doc/changelog
+ rm -f debian/$(base)-doc/usr/share/doc/$(base)/examples/runExample.sh.in
clean::
rm -rf doc/api
- rm -f $(jar).so
find -name *.Plo | xargs -r rm -f
+
+DEB_PHONY_RULES += distclean-first
+
+distclean-first:
+ -test -f debian/stamp-patched && $(DEB_MAKE_INVOKE) -k distclean
More information about the pkg-java-commits
mailing list