Author: tgg
Date: 2007-04-25 15:13:08 +0000 (Wed, 25 Apr 2007)
New Revision: 3346
Added:
trunk/libgconf-java/debian/libgconf-cni.install
trunk/libgconf-java/debian/libgconf-cni.lintian
trunk/libgconf-java/debian/libgconf-java-doc.install
trunk/libgconf-java/debian/libgconf-jni.install
trunk/libgconf-java/debian/patches/
trunk/libgconf-java/debian/patches/01_late_javadoc.diff
trunk/libgconf-java/debian/patches/03_reduce_distclean.diff
trunk/libgconf-java/debian/patches/04_pkgconfig_for_jni.diff
trunk/libgconf-java/debian/patches/series
Removed:
trunk/libgconf-java/debian/libgconf-java-gcj.install
Modified:
trunk/libgconf-java/debian/changelog
trunk/libgconf-java/debian/compat
trunk/libgconf-java/debian/control
trunk/libgconf-java/debian/libgconf-java.install
Log:
redo the same stuff again for libgconf-java
Modified: trunk/libgconf-java/debian/changelog
===================================================================
--- trunk/libgconf-java/debian/changelog 2007-04-25 14:26:56 UTC (rev
3345)
+++ trunk/libgconf-java/debian/changelog 2007-04-25 15:13:08 UTC (rev
3346)
@@ -1,3 +1,25 @@
+libgconf-java (2.12.6-1) experimental; urgency=low
+
+ [Thomas Girard]
+ * Add myself to Uploaders.
+ * Merge Ubuntu changes:
+ o new package, libgconf-java-gcj, for gcj natively compiled classes
+ o new package, libgconf-java-doc, split from libgconf-java
+ * New packages, libgconf-jni and libgconf-cni, split from libgconf-java.
+ * Bump debhelper to 5.
+ * Bump standards version to 3.7.2.0
+ * New upstream release.
+ * Build with gcj from experimental.
+ * Rework build-dependencies:
+ o drop libgtk2.0-dev
+ o tighten libglib-java, libgtk-java and libgconf2-dev
+ o add quilt and autotools-dev
+
+ [Mark Howard]
+ * debian/watch: added
+
+ -- Thomas Girard <[EMAIL PROTECTED]> Wed, 25 Apr 2007 14:44:36 +0000
+
libgconf-java (2.12.5-0ubuntu1) feisty; urgency=low
* New upstream version.
Modified: trunk/libgconf-java/debian/compat
===================================================================
--- trunk/libgconf-java/debian/compat 2007-04-25 14:26:56 UTC (rev 3345)
+++ trunk/libgconf-java/debian/compat 2007-04-25 15:13:08 UTC (rev 3346)
@@ -1 +1 @@
-4
+5
Modified: trunk/libgconf-java/debian/control
===================================================================
--- trunk/libgconf-java/debian/control 2007-04-25 14:26:56 UTC (rev 3345)
+++ trunk/libgconf-java/debian/control 2007-04-25 15:13:08 UTC (rev 3346)
@@ -2,17 +2,18 @@
Section: libs
Priority: optional
Maintainer: Debian Java maintainers <[EMAIL PROTECTED]>
-Uploaders: Mark Howard <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4), gcj, java-gcj-compat-dev (>=
1.0.61-0ubuntu3), docbook-utils, cdbs, pkg-config, libgtk-java (>= 2.10),
libgconf2-dev, libglib-java (>= 0.4), libgtk2.0-dev (>= 2.8)
-Standards-Version: 3.6.1.0
+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, libgtk-java (>= 2.10.2),
libgtk-cni (>= 2.10.2), libgconf2-dev (>= 2.11.2), libglib-java (>= 0.4.2-4),
libglib-cni (>= 0.4.2), quilt (>= 0.29-2), autotools-dev
+Standards-Version: 3.7.2.0
Package: libgconf-java
Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
+Architecture: all
+Depends: libgconf-jni (>= ${source:Version}), libgtk-java (>= 2.10.2)
Replaces: libgtk2-java
+Recommends: libgconf-java-gcj
Conflicts: libgtk2-java
-Description: LIBGCONF bindings for Java
+Description: GConf 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,54 @@
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 libgconf support.
+ This package provides architecture-independant files for GConf bindings.
.
http://java-gnome.sf.net
+Package: libgconf-jni
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libgconf-java (<< 2.12.6-1)
+Description: GConf 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 libgconf
+ bindings.
+ .
+ http://java-gnome.sf.net
+
+Package: libgconf-cni
+Section: libs
+Architecture: any
+Depends: libgconf-jni (= ${binary:Version}), ${shlibs:Depends}
+Replaces: libgconf-java (<< 2.12.6-1)
+Description: GConf 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 libgconf bindings.
+ .
+ http://java-gnome.sf.net
+
Package: libgconf-java-gcj
Section: libs
Architecture: any
-Depends: libgconf-java (= ${Source-Version}), libgtk-java-gcj, java-gcj-compat
(>= 1.0.61-0ubuntu3), ${shlibs:Depends}
-Description: LIBGCONF bindings for Java (native code for use with gij)
+Depends: libgconf-java (= ${source:Version}), libgtk-java-gcj (>= 2.10.2),
${misc:Depends}, ${shlibs:Depends}
+Description: GConf 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
@@ -41,13 +81,15 @@
gnome libraries such as gnome-vfs, vte, libmozembed.
.
This package provides natively compiled code to run with gij.
+ .
+ http://java-gnome.sf.net
Package: libgconf-java-doc
Section: doc
Architecture: all
Depends: classpath-doc, libgtk-java-doc
Replaces: libgconf-java (<< 2.12.4)
-Description: LIBGCONF bindings for Java (API documentation)
+Description: GConf 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
@@ -58,3 +100,5 @@
gnome libraries such as gnome-vfs, vte, libmozembed.
.
This package contains the API documentation for the libgconf bindings.
+ .
+ http://java-gnome.sf.net
Added: trunk/libgconf-java/debian/libgconf-cni.install
===================================================================
--- trunk/libgconf-java/debian/libgconf-cni.install 2007-04-25 14:26:56 UTC
(rev 3345)
+++ trunk/libgconf-java/debian/libgconf-cni.install 2007-04-25 15:13:08 UTC
(rev 3346)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libgconfjava*.so usr/lib
Added: trunk/libgconf-java/debian/libgconf-cni.lintian
===================================================================
--- trunk/libgconf-java/debian/libgconf-cni.lintian 2007-04-25 14:26:56 UTC
(rev 3345)
+++ trunk/libgconf-java/debian/libgconf-cni.lintian 2007-04-25 15:13:08 UTC
(rev 3346)
@@ -0,0 +1 @@
+libgconf-cni: package-name-doesnt-match-sonames libgconfjava-2.12
Added: trunk/libgconf-java/debian/libgconf-java-doc.install
===================================================================
--- trunk/libgconf-java/debian/libgconf-java-doc.install 2007-04-25
14:26:56 UTC (rev 3345)
+++ trunk/libgconf-java/debian/libgconf-java-doc.install 2007-04-25
15:13:08 UTC (rev 3346)
@@ -0,0 +1,2 @@
+doc/api usr/share/doc/libgconf-java
+debian/tmp/usr/share/doc/libgconf-java*/examples usr/share/doc/libgconf-java
Deleted: trunk/libgconf-java/debian/libgconf-java-gcj.install
===================================================================
--- trunk/libgconf-java/debian/libgconf-java-gcj.install 2007-04-25
14:26:56 UTC (rev 3345)
+++ trunk/libgconf-java/debian/libgconf-java-gcj.install 2007-04-25
15:13:08 UTC (rev 3346)
@@ -1 +0,0 @@
-gconf*.jar.so usr/lib/gcj
Modified: trunk/libgconf-java/debian/libgconf-java.install
===================================================================
--- trunk/libgconf-java/debian/libgconf-java.install 2007-04-25 14:26:56 UTC
(rev 3345)
+++ trunk/libgconf-java/debian/libgconf-java.install 2007-04-25 15:13:08 UTC
(rev 3346)
@@ -1,3 +1 @@
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/lib*jni*.so usr/lib/jni
-debian/tmp/usr/share/java
+debian/tmp/usr/share/java/gconf*.jar
Added: trunk/libgconf-java/debian/libgconf-jni.install
===================================================================
--- trunk/libgconf-java/debian/libgconf-jni.install 2007-04-25 14:26:56 UTC
(rev 3345)
+++ trunk/libgconf-java/debian/libgconf-jni.install 2007-04-25 15:13:08 UTC
(rev 3346)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/lib*jni*.so usr/lib/jni
Added: trunk/libgconf-java/debian/patches/01_late_javadoc.diff
===================================================================
--- trunk/libgconf-java/debian/patches/01_late_javadoc.diff 2007-04-25
14:26:56 UTC (rev 3345)
+++ trunk/libgconf-java/debian/patches/01_late_javadoc.diff 2007-04-25
15:13:08 UTC (rev 3346)
@@ -0,0 +1,111 @@
+Index: libgconf-java-2.12.6/Makefile.am
+===================================================================
+--- libgconf-java-2.12.6.orig/Makefile.am 2007-04-25 13:51:44.000000000
+0000
++++ libgconf-java-2.12.6/Makefile.am 2007-04-25 13:52:09.000000000 +0000
+@@ -90,8 +90,6 @@
+ # build api docs
+ apidir = $(docbasedir)/libgconf-java-$(VERSION)/api
+
+-if BUILD_JAVADOC
+-ALL_LOCAL_DEPS += doc-stamp
+ doc-stamp: $(java_gconf_source_files)
+ $(JAVADOC) \
+ -d doc/api \
+@@ -104,7 +102,6 @@
+ -classpath $(CLASSPATH):$(srcdir)/src/java:src/java \
+ org.gnu.gconf
+ touch doc-stamp
+-endif
+ all-local: $(ALL_LOCAL_DEPS)
+
+ # install other docs
+@@ -120,19 +117,6 @@
+ mv -f gconf$(apiversion).jar gconf$(apiversion)-$(VERSION).jar
&& \
+ $(LN_S) gconf$(apiversion)-$(VERSION).jar gconf$(apiversion).jar
+
+-# install api documentation
+-if BUILD_JAVADOC
+- $(mkinstalldirs) $(DESTDIR)$(apidir)
+- @for dir in $(dest_gconf_javadoc_dirs); \
+- do \
+- $(mkinstalldirs) $(DESTDIR)$(apidir)/$${dir}; \
+- done
+- @for file in $(all_dest_gconf_javadoc_html_files); \
+- do \
+- $(INSTALL_DATA) doc/api/$${file} $(DESTDIR)$(apidir)/$${file}; \
+- done
+-endif
+-
+ # install examples
+ @for dir in $(examples); \
+ do \
+Index: libgconf-java-2.12.6/Makefile.in
+===================================================================
+--- libgconf-java-2.12.6.orig/Makefile.in 2007-04-25 13:52:11.000000000
+0000
++++ libgconf-java-2.12.6/Makefile.in 2007-04-25 13:53:21.000000000 +0000
+@@ -47,7 +47,6 @@
+ depcomp install-sh ltmain.sh missing
+ @[EMAIL PROTECTED] = gconf$(apiversion)-src.jar
+ @[EMAIL PROTECTED] = gconf$(apiversion)-src.jar
[EMAIL PROTECTED]@am__append_3 = doc-stamp
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+@@ -325,7 +324,7 @@
+ BUILT_SOURCES = gconf$(apiversion).jar gconf-java.pc \
+ doc/examples/runExample.sh src/java/org/gnu/gconf/Config.java
+ CLASSPATH = $(JGJAR):$(GTKJAR)
+-ALL_LOCAL_DEPS = $(am__append_2) $(am__append_3)
++ALL_LOCAL_DEPS = $(am__append_2)
+ @[EMAIL PROTECTED] = libgconfjni.la
+ @[EMAIL PROTECTED] = libgconfjava.la libgconfjni.la
+ java_gconf_source_files = \
+@@ -1138,18 +1137,18 @@
+
+ @[EMAIL PROTECTED](apiversion)-src.jar:
+ @BUILD_SRCJAR_TRUE@ $(JAR) cf $@ $(patsubst src/java/%.java,-C
$(top_srcdir)/src/java %.java,$(java_gconf_source_files))
[EMAIL PROTECTED]@doc-stamp: $(java_gconf_source_files)
[EMAIL PROTECTED]@ $(JAVADOC) \
[EMAIL PROTECTED]@ -d doc/api \
[EMAIL PROTECTED]@ $(JAVADOC_OPTIONS) \
[EMAIL PROTECTED]@ -sourcepath $(srcdir)/src/java \
[EMAIL PROTECTED]@ -windowtitle "Java-Gnome $(VERSION) API
Reference" \
[EMAIL PROTECTED]@ -doctitle "Java-Gnome $(VERSION) API Reference"
\
[EMAIL PROTECTED]@ -footer "$(JAVADOC_FOOTER)" \
[EMAIL PROTECTED]@ -public \
[EMAIL PROTECTED]@ -classpath
$(CLASSPATH):$(srcdir)/src/java:src/java \
[EMAIL PROTECTED]@ org.gnu.gconf
[EMAIL PROTECTED]@ touch doc-stamp
++doc-stamp: $(java_gconf_source_files)
++ $(JAVADOC) \
++ -d doc/api \
++ $(JAVADOC_OPTIONS) \
++ -sourcepath $(srcdir)/src/java \
++ -windowtitle "Java-Gnome $(VERSION) API Reference" \
++ -doctitle "Java-Gnome $(VERSION) API Reference" \
++ -footer "$(JAVADOC_FOOTER)" \
++ -public \
++ -classpath $(CLASSPATH):$(srcdir)/src/java:src/java \
++ org.gnu.gconf
++ touch doc-stamp
+ all-local: $(ALL_LOCAL_DEPS)
+
+ install-data-hook:
+@@ -1157,17 +1156,6 @@
+ mv -f gconf$(apiversion).jar gconf$(apiversion)-$(VERSION).jar
&& \
+ $(LN_S) gconf$(apiversion)-$(VERSION).jar gconf$(apiversion).jar
+
+-# install api documentation
[EMAIL PROTECTED]@ $(mkinstalldirs) $(DESTDIR)$(apidir)
[EMAIL PROTECTED]@ @for dir in $(dest_gconf_javadoc_dirs); \
[EMAIL PROTECTED]@ do \
[EMAIL PROTECTED]@ $(mkinstalldirs) $(DESTDIR)$(apidir)/$${dir}; \
[EMAIL PROTECTED]@ done
[EMAIL PROTECTED]@ @for file in $(all_dest_gconf_javadoc_html_files); \
[EMAIL PROTECTED]@ do \
[EMAIL PROTECTED]@ $(INSTALL_DATA) doc/api/$${file}
$(DESTDIR)$(apidir)/$${file}; \
[EMAIL PROTECTED]@ done
+-
+ # install examples
+ @for dir in $(examples); \
+ do \
Added: trunk/libgconf-java/debian/patches/03_reduce_distclean.diff
===================================================================
--- trunk/libgconf-java/debian/patches/03_reduce_distclean.diff 2007-04-25
14:26:56 UTC (rev 3345)
+++ trunk/libgconf-java/debian/patches/03_reduce_distclean.diff 2007-04-25
15:13:08 UTC (rev 3346)
@@ -0,0 +1,46 @@
+Index: libgconf-java-2.12.6/Makefile.am
+===================================================================
+--- libgconf-java-2.12.6.orig/Makefile.am 2007-04-25 14:01:24.000000000
+0000
++++ libgconf-java-2.12.6/Makefile.am 2007-04-25 14:01:40.000000000 +0000
+@@ -148,17 +148,7 @@
+ -rm -rf $(srcdir)/autom4te.cache
+
+ DISTCLEANFILES = \
+- gconf-java.pc \
+- $(srcdir)/Makefile.in \
+- $(srcdir)/aclocal.m4 \
+- $(srcdir)/compile \
+- $(srcdir)/config.guess \
+- $(srcdir)/config.sub \
+- $(srcdir)/configure \
+- $(srcdir)/depcomp \
+- $(srcdir)/install-sh \
+- $(srcdir)/ltmain.sh \
+- $(srcdir)/missing
++ gconf-java.pc
+
+ CLEANFILES += \
+ doc-stamp \
+Index: libgconf-java-2.12.6/Makefile.in
+===================================================================
+--- libgconf-java-2.12.6.orig/Makefile.in 2007-04-25 14:01:43.000000000
+0000
++++ libgconf-java-2.12.6/Makefile.in 2007-04-25 14:01:59.000000000 +0000
+@@ -388,17 +388,7 @@
+ $(example_files)
+
+ DISTCLEANFILES = \
+- gconf-java.pc \
+- $(srcdir)/Makefile.in \
+- $(srcdir)/aclocal.m4 \
+- $(srcdir)/compile \
+- $(srcdir)/config.guess \
+- $(srcdir)/config.sub \
+- $(srcdir)/configure \
+- $(srcdir)/depcomp \
+- $(srcdir)/install-sh \
+- $(srcdir)/ltmain.sh \
+- $(srcdir)/missing
++ gconf-java.pc
+
+ all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
Added: trunk/libgconf-java/debian/patches/04_pkgconfig_for_jni.diff
===================================================================
--- trunk/libgconf-java/debian/patches/04_pkgconfig_for_jni.diff
2007-04-25 14:26:56 UTC (rev 3345)
+++ trunk/libgconf-java/debian/patches/04_pkgconfig_for_jni.diff
2007-04-25 15:13:08 UTC (rev 3346)
@@ -0,0 +1,10 @@
+Index: libgconf-java-2.12.6/gconf-java.pc.in
+===================================================================
+--- libgconf-java-2.12.6.orig/gconf-java.pc.in 2007-04-25 14:02:33.000000000
+0000
++++ libgconf-java-2.12.6/gconf-java.pc.in 2007-04-25 14:02:57.000000000
+0000
+@@ -10,4 +10,5 @@
+ Version: @VERSION@
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
++jnilibs=-L${exec_prefix}/lib/jni -lgconfjni
+ Libs: [EMAIL PROTECTED]@ -lgconfjava
Added: trunk/libgconf-java/debian/patches/series
===================================================================
--- trunk/libgconf-java/debian/patches/series 2007-04-25 14:26:56 UTC (rev
3345)
+++ trunk/libgconf-java/debian/patches/series 2007-04-25 15:13:08 UTC (rev
3346)
@@ -0,0 +1,3 @@
+01_late_javadoc.diff
+03_reduce_distclean.diff
+04_pkgconfig_for_jni.diff
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
