[pkg-java] r5902 - in trunk/classpath/debian: . lintian patches
mkoch at alioth.debian.org
mkoch at alioth.debian.org
Thu Feb 28 19:53:53 UTC 2008
Author: mkoch
Date: 2008-02-28 19:53:52 +0000 (Thu, 28 Feb 2008)
New Revision: 5902
Added:
trunk/classpath/debian/lintian/
trunk/classpath/debian/lintian/gcjwebplugin
Removed:
trunk/classpath/debian/classpath.links
trunk/classpath/debian/patches/configure-with-glibj-none.diff
trunk/classpath/debian/patches/examples-disable.diff
Modified:
trunk/classpath/debian/changelog
trunk/classpath/debian/control
trunk/classpath/debian/gcjwebplugin.install
trunk/classpath/debian/rules
Log:
classpath (2:0.97-1) unstable; urgency=low
* New upstream release.
- JAP GUI works now. Closes: #349062.
* debian/control (classpath): Depend on classpath-common (>= 2:0.97).
* debian/control (gcjwebplugin): Recommend iceweasel instead of
mozilla-firefox by default.
* Add XB-Npp-* headers from Ubuntu.
* Removed debian/classpath.links: Obsolete.
-- Michael Koch <konqueror at gmx.de> Wed, 27 Feb 2008 23:26:22 +0100
Modified: trunk/classpath/debian/changelog
===================================================================
--- trunk/classpath/debian/changelog 2008-02-28 09:11:26 UTC (rev 5901)
+++ trunk/classpath/debian/changelog 2008-02-28 19:53:52 UTC (rev 5902)
@@ -1,10 +1,14 @@
-classpath (2:0.96.1-2) UNRELEASED; urgency=low
+classpath (2:0.97-1) unstable; urgency=low
+ * New upstream release.
+ - JAP GUI works now. Closes: #349062.
+ * debian/control (classpath): Depend on classpath-common (>= 2:0.97).
* debian/control (gcjwebplugin): Recommend iceweasel instead of
mozilla-firefox by default.
* Add XB-Npp-* headers from Ubuntu.
+ * Removed debian/classpath.links: Obsolete.
- -- Michael Koch <konqueror at gmx.de> Mon, 14 Jan 2008 09:51:05 +0100
+ -- Michael Koch <konqueror at gmx.de> Wed, 27 Feb 2008 23:26:22 +0100
classpath (2:0.96.1-1) unstable; urgency=low
Deleted: trunk/classpath/debian/classpath.links
===================================================================
--- trunk/classpath/debian/classpath.links 2008-02-28 09:11:26 UTC (rev 5901)
+++ trunk/classpath/debian/classpath.links 2008-02-28 19:53:52 UTC (rev 5902)
@@ -1 +0,0 @@
-usr/lib/classpath/libjawtgnu.so usr/lib/classpath/libjawt.so
Modified: trunk/classpath/debian/control
===================================================================
--- trunk/classpath/debian/control 2008-02-28 09:11:26 UTC (rev 5901)
+++ trunk/classpath/debian/control 2008-02-28 19:53:52 UTC (rev 5902)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Michael Koch <konqueror at gmx.de>, Arnaud Vandyck <avdyk at debian.org>, John Leuner <jewel at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ecj, zip, libgtk2.0-dev, libgconf2-dev, libart-2.0-dev, libx11-dev, libice-dev, libxt-dev, libxtst-dev, libasound2-dev, libcairo2-dev, dpatch, libqt4-dev (>= 4.1.0), dssi-dev, ladspa-sdk, libjack0.100.0-dev, libxul-dev, libmagic-dev
+Build-Depends: debhelper (>= 4.0.0), ecj, zip, libgtk2.0-dev, libgconf2-dev, libart-2.0-dev, libx11-dev, libice-dev, libxt-dev, libxtst-dev, libasound2-dev, libcairo2-dev, dpatch, libqt4-dev (>= 4.1.0), dssi-dev, ladspa-sdk, libjack0.100.0-dev, libxul-dev, libmagic-dev, gcj
Build-Depends-Indep: gjdoc (>= 0.7.5-4)
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/classpath
@@ -12,7 +12,7 @@
Package: classpath
Architecture: any
-Depends: libgcj-common, classpath-common (>= 2:0.13-1), classpath-gtkpeer (= ${binary:Version}), ${shlibs:Depends}
+Depends: libgcj-common, classpath-common (>= 2:0.97), classpath-gtkpeer (= ${binary:Version}), ${shlibs:Depends}
Conflicts: libgcj3 (<= 1:3.2-0pre1), jamvm (<< 1.4.3), cacao (<< 0.96)
Description: clean room standard Java libraries
GNU classpath provides a free replacement for Sun's proprietary class
@@ -30,7 +30,7 @@
Depends: ${shlibs:Depends}
Replaces: classpath (<< 2:0.92-1)
Conflicts: classpath (<< 2:0.92-1)
-Description: clean room standard Java libraries - GTK AWT peer
+Description: clean room standard Java libraries - GTK+ AWT peer
GNU classpath provides a free replacement for Sun's proprietary class
libraries so that the GNU system can run programs written in the Java
language.
@@ -41,7 +41,7 @@
GNU Classpath can be used to run Java applications without depending on
proprietary software.
.
- This package contains the GTK AWT peer to run GUI applications.
+ This package contains the GTK+ AWT peer to run GUI applications.
Package: classpath-qtpeer
Architecture: any
@@ -134,10 +134,10 @@
Architecture: any
Section: net
Depends: ${shlibs:Depends}, cacao | jamvm
-Recommends: iceweasel | www-browser
XB-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a
XB-Npp-Name: GCJ Web Browser Plugin
-XB-Npp-MimeType: application/x-java-vm, application/x-java-applet, application/x-java-applet;version=1.1, application/x-java-applet;version=1.1.1, application/x-java-applet;version=1.1.2, application/x-java-applet;version=1.1.3, application/x-java-applet;version=1.2, application/x-java-applet;version=1.2.1, application/x-java-applet;version=1.2.2, application/x-java-applet;version=1.3, application/x-java-applet;version=1.3.1, application/x-java-applet;version=1.4, application/x-java-applet;version=1.4.1, application/x-java-applet;version=1.4.2, application/x-java-applet;jpi-version=1.4.2_01, application/x-java-bean, application/x-java-bean;version=1.1, application/x-java-bean;version=1.1.1, application/x-java-bean;version=1.1.2, application/x-java-bean;version=1.1.3, application/x-java-bean;version=1.2, application/x-java-bean;version=1.2.1, application/x-java-bean;version=1.2.2, application/x-java-bean;version=1.3, application/x-java-bean;version=1.3.1, application/x-java-bean;version=1.4, application/x-java-bean;version=1.4.1, application/x-java-bean;version=1.4.2, application/x-java-bean;jpi-version=1.4.2_01
+XB-Npp-MimeType: application/x-java-vm, application/x-java-applet, application/x-java-applet;version=1.1, application/x-java-applet;version=1.1.1, application/x-java-applet;version=1.1.2, application/x-java-applet;version=1.1.3, application/x-java-applet;version=1.2, application/x-java-applet;version=1.2.1, application/x-java-applet;version=1.2.2, application/x-java-applet;version=1.3, application/x-java-applet;version=1.3.1, application/x-java-applet;version=1.4, application/x-java-applet;version=1.4.1, application/x-java-applet;version=1.4.2, application/x-java-applet;jpi-version=1.4.2_01, application/x-java-bean, application/x-java-bean;version=1.1, application/x-java-bean;version=1.1.1, application/x-java-bean;version=1.1.2, application/x-java-bean;version=1.1.3, application/x-java-bean;version=1.2, application/x-java-bean;version=1.2.1, application/x-java-bean;version=1.2.2, application/x-java-bean;version=1.3, application/x-java-bean;version=1.3.1, application/x-java-bean;version=1.4, application/x-java-bean;version=1.4.1, application/x-java-bean;version=1.4.2, application/x-java-bean;jpi-version=1.4.2_01
+Recommends: iceweasel | www-browser
Description: web browser plugin to execute Java (tm) applets
gcjwebplugin is a little web browser plugin to execute Java applets.
It is targeted for Mozilla and compatible browsers that support the NPAPI.
Modified: trunk/classpath/debian/gcjwebplugin.install
===================================================================
--- trunk/classpath/debian/gcjwebplugin.install 2008-02-28 09:11:26 UTC (rev 5901)
+++ trunk/classpath/debian/gcjwebplugin.install 2008-02-28 19:53:52 UTC (rev 5902)
@@ -4,3 +4,5 @@
usr/lib/classpath/libgcjwebplugin.la usr/lib/classpath
usr/lib/classpath/libgcjwebplugin.so usr/lib/classpath
+
+../lintian/gcjwebplugin /usr/share/lintian/overrides
Added: trunk/classpath/debian/lintian/gcjwebplugin
===================================================================
--- trunk/classpath/debian/lintian/gcjwebplugin (rev 0)
+++ trunk/classpath/debian/lintian/gcjwebplugin 2008-02-28 19:53:52 UTC (rev 5902)
@@ -0,0 +1,3 @@
+gcjwebplugin: unknown-field-in-control npp-applications
+gcjwebplugin: unknown-field-in-control npp-mimetype
+gcjwebplugin: unknown-field-in-control npp-name
Deleted: trunk/classpath/debian/patches/configure-with-glibj-none.diff
===================================================================
--- trunk/classpath/debian/patches/configure-with-glibj-none.diff 2008-02-28 09:11:26 UTC (rev 5901)
+++ trunk/classpath/debian/patches/configure-with-glibj-none.diff 2008-02-28 19:53:52 UTC (rev 5902)
@@ -1,14 +0,0 @@
---- configure.orig 2004-11-15 07:32:01.000000000 +0000
-+++ configure 2004-11-15 07:33:09.000000000 +0000
-@@ -25406,11 +25406,6 @@
- install_class_files=no
-
- fi;
-- if test "x${ZIP}" = x && test "x${install_class_files}" = xno; then
-- { { echo "$as_me:$LINENO: error: you need to either install class files or glibj.zip" >&5
--echo "$as_me: error: you need to either install class files or glibj.zip" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-
-
- if test "x${ZIP}" != x; then
Deleted: trunk/classpath/debian/patches/examples-disable.diff
===================================================================
--- trunk/classpath/debian/patches/examples-disable.diff 2008-02-28 09:11:26 UTC (rev 5901)
+++ trunk/classpath/debian/patches/examples-disable.diff 2008-02-28 19:53:52 UTC (rev 5902)
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2004-11-15 07:38:45.000000000 +0000
-+++ Makefile.in 2004-11-15 07:39:13.000000000 +0000
-@@ -234,7 +234,7 @@
- target_vendor = @target_vendor@
-
- # lib first, to compile .class files before native code, last examples
--SUBDIRS = lib doc include native resource examples
-+SUBDIRS = lib doc include native resource
- EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath LICENSE ChangeLog-2003
- all: all-recursive
-
Modified: trunk/classpath/debian/rules
===================================================================
--- trunk/classpath/debian/rules 2008-02-28 09:11:26 UTC (rev 5901)
+++ trunk/classpath/debian/rules 2008-02-28 19:53:52 UTC (rev 5902)
@@ -34,6 +34,7 @@
--infodir=\$${prefix}/share/info \
--disable-dependency-tracking \
--with-glibj=both \
+ --disable-examples \
--with-gjdoc \
--enable-plugin \
--enable-qt-peer \
@@ -53,6 +54,7 @@
--infodir=\$${prefix}/share/info \
--disable-dependency-tracking \
--with-glibj=zip \
+ --disable-examples \
--enable-gtk-cairo \
--enable-qt-peer \
$(OPT_ALSA) \
@@ -116,7 +118,7 @@
# Move examples
mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/classpath-doc
- mv $(CURDIR)/debian/tmp/usr/share/classpath/examples $(CURDIR)/debian/tmp/usr/share/doc/classpath-doc/examples
+# mv $(CURDIR)/debian/tmp/usr/share/classpath/examples $(CURDIR)/debian/tmp/usr/share/doc/classpath-doc/examples
# Install javadocs
cp -r $(CURDIR)/doc/api/html $(CURDIR)/debian/tmp/usr/share/doc/classpath-doc/api
More information about the pkg-java-commits
mailing list