[pkg-java] r10333 - trunk/classpath/debian
Michael Koch
mkoch at alioth.debian.org
Fri Sep 11 09:16:33 UTC 2009
Author: mkoch
Date: 2009-09-11 09:16:33 +0000 (Fri, 11 Sep 2009)
New Revision: 10333
Added:
trunk/classpath/debian/README.source
Removed:
trunk/classpath/debian/jikes-classpath.install
trunk/classpath/debian/jikes-classpath.links
trunk/classpath/debian/jikes-classpath.postinst
trunk/classpath/debian/jikes-classpath.prerm
Modified:
trunk/classpath/debian/changelog
trunk/classpath/debian/classpath.install
trunk/classpath/debian/control
trunk/classpath/debian/rules
Log:
classpath (2:0.98-3) unstable; urgency=low
* Apply patch from Cyril Brulebois to support the kfreebsd flavors
(Closes: #540977).
* Use --disable-Werror (Closes: 505596).
* debian/control: Added ${misc:Depends} to all Depends.
* debian/control: Added dpkg (>= 1.15.4) | install-info to Depends
of classpath-common.
* debian/control: Get rid of jikes-classpath package as jikes is gone.
* debian/README.source: New file.
* Updated Standards-Version to 3.8.3.
-- Michael Koch <konqueror at gmx.de> Sat, 05 Sep 2009 20:20:49 +0200
Added: trunk/classpath/debian/README.source
===================================================================
--- trunk/classpath/debian/README.source (rev 0)
+++ trunk/classpath/debian/README.source 2009-09-11 09:16:33 UTC (rev 10333)
@@ -0,0 +1,6 @@
+This package uses dpatch to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/dpatch/README.source.gz for a detailed explanation.
+
Modified: trunk/classpath/debian/changelog
===================================================================
--- trunk/classpath/debian/changelog 2009-09-11 05:30:04 UTC (rev 10332)
+++ trunk/classpath/debian/changelog 2009-09-11 09:16:33 UTC (rev 10333)
@@ -1,3 +1,17 @@
+classpath (2:0.98-3) unstable; urgency=low
+
+ * Apply patch from Cyril Brulebois to support the kfreebsd flavors
+ (Closes: #540977).
+ * Use --disable-Werror (Closes: 505596).
+ * debian/control: Added ${misc:Depends} to all Depends.
+ * debian/control: Added dpkg (>= 1.15.4) | install-info to Depends
+ of classpath-common.
+ * debian/control: Get rid of jikes-classpath package as jikes is gone.
+ * debian/README.source: New file.
+ * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 05 Sep 2009 20:20:49 +0200
+
classpath (2:0.98-2) unstable; urgency=low
* Fix build failure when building only arch:any packages
Modified: trunk/classpath/debian/classpath.install
===================================================================
--- trunk/classpath/debian/classpath.install 2009-09-11 05:30:04 UTC (rev 10332)
+++ trunk/classpath/debian/classpath.install 2009-09-11 09:16:33 UTC (rev 10333)
@@ -1,3 +1,4 @@
usr/lib/classpath/libgconfpeer*
-usr/lib/classpath/libgj*
+# Now installed conditionally from debian/rules:
+# usr/lib/classpath/libgj*
usr/lib/classpath/libj*
Modified: trunk/classpath/debian/control
===================================================================
--- trunk/classpath/debian/control 2009-09-11 05:30:04 UTC (rev 10332)
+++ trunk/classpath/debian/control 2009-09-11 09:16:33 UTC (rev 10333)
@@ -5,14 +5,14 @@
Uploaders: Michael Koch <konqueror at gmx.de>, Arnaud Vandyck <avdyk at debian.org>, John Leuner <jewel at debian.org>
Build-Depends: debhelper (>= 5), ecj [!alpha !arm !hppa !hurd-i386], gcj [!alpha !arm !hppa !hurd-i386], zip, libgtk2.0-dev, libgconf2-dev, libart-2.0-dev, libx11-dev, libice-dev, libxt-dev, libxtst-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libcairo2-dev, dpatch, libqt4-dev (>= 4.1.0), dssi-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], xulrunner-dev (>= 1.9), libmagic-dev
Build-Depends-Indep: gjdoc (>= 0.7.9)
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/classpath
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/classpath
Homepage: http://www.classpath.org/
Package: classpath
Architecture: any
-Depends: libgcj-common, classpath-common (>= 2:0.97), classpath-gtkpeer (= ${binary:Version}), ${shlibs:Depends}
+Depends: libgcj-common, classpath-common (>= 2:0.97), classpath-gtkpeer (= ${binary:Version}), ${shlibs:Depends}, ${misc: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
@@ -27,7 +27,7 @@
Package: classpath-gtkpeer
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: classpath (<< 2:0.92-1)
Conflicts: classpath (<< 2:0.92-1)
Description: clean room standard Java libraries - GTK+ AWT peer
@@ -45,7 +45,7 @@
Package: classpath-qtpeer
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: classpath (<< 2:0.92-1)
Conflicts: classpath (<< 2:0.92-1)
Description: clean room standard Java libraries - QT AWT peer
@@ -63,6 +63,7 @@
Package: classpath-common
Architecture: all
+Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends}
Conflicts: libgcj3 (<= 1:3.2-0pre1), jamvm (<< 1.3.2-2), , classpath (<< 2:0.97.2) , gcjwebplugin (<< 2:0.97.2)
Replaces: classpath (<= 2:0.07-2)
Description: clean room standard Java libraries - architecture independent files
@@ -80,6 +81,7 @@
Package: classpath-common-unzipped
Architecture: all
+Depends: ${misc:Depends}
Description: clean room standard Java libraries - architecture independent files
GNU classpath provides a free replacement for Sun's proprietary class
libraries so that the GNU system can run programs written in the Java
@@ -96,6 +98,7 @@
Package: classpath-doc
Architecture: all
Section: doc
+Depends: ${misc:Depends}
Description: clean room standard Java libraries - free Java API documentation
GNU classpath provides a free replacement for Sun's proprietary class
libraries so that the GNU system can run programs written in the Java
@@ -110,30 +113,10 @@
This package contains the documentation is generated from the GNU Classpath
implementation of the Java runtime libraries.
-Package: jikes-classpath
-Architecture: all
-Section: devel
-Depends: jikes, classpath, java-common
-Provides: java-compiler
-Description: clean room standard Java libraries - wrapper for jikes
- 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.
- .
- GNU Classpath makes it possible to compile DFSG-free programs written
- in the Java language without depending on proprietary class libraries.
- .
- GNU Classpath can be used to run Java applications without depending on
- proprietary software.
- .
- This package provides a jikes wrapper called jikes-classpath that will
- include GNU Java's classes from the classpath package in jikes'
- bootclasspath.
-
#Package: gcjwebplugin
#Architecture: any
#Section: net
-#Depends: ${shlibs:Depends}, cacao | jamvm
+#Depends: ${shlibs:Depends}, cacao | jamvm, ${misc:Depends}
#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
Deleted: trunk/classpath/debian/jikes-classpath.install
===================================================================
--- trunk/classpath/debian/jikes-classpath.install 2009-09-11 05:30:04 UTC (rev 10332)
+++ trunk/classpath/debian/jikes-classpath.install 2009-09-11 09:16:33 UTC (rev 10333)
@@ -1 +0,0 @@
-usr/bin/jikes-classpath
Deleted: trunk/classpath/debian/jikes-classpath.links
===================================================================
--- trunk/classpath/debian/jikes-classpath.links 2009-09-11 05:30:04 UTC (rev 10332)
+++ trunk/classpath/debian/jikes-classpath.links 2009-09-11 09:16:33 UTC (rev 10333)
@@ -1 +0,0 @@
-usr/share/man/man1/jikes.1.gz usr/share/man/man1/jikes-classpath.1.gz
Deleted: trunk/classpath/debian/jikes-classpath.postinst
===================================================================
--- trunk/classpath/debian/jikes-classpath.postinst 2009-09-11 05:30:04 UTC (rev 10332)
+++ trunk/classpath/debian/jikes-classpath.postinst 2009-09-11 09:16:33 UTC (rev 10333)
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
- configure)
- update-alternatives \
- --install /usr/bin/javac javac /usr/bin/jikes-classpath 10 \
- --slave /usr/share/man/man1/javac.1.gz javac.1.gz \
- /usr/share/man/man1/jikes.1.gz
- ;;
-esac
-
-#DEBHELPER#
-
Deleted: trunk/classpath/debian/jikes-classpath.prerm
===================================================================
--- trunk/classpath/debian/jikes-classpath.prerm 2009-09-11 05:30:04 UTC (rev 10332)
+++ trunk/classpath/debian/jikes-classpath.prerm 2009-09-11 09:16:33 UTC (rev 10333)
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
- upgrade | remove)
- update-alternatives --remove javac /usr/bin/jikes-classpath
- ;;
-esac
-
-#DEBHELPER#
Modified: trunk/classpath/debian/rules
===================================================================
--- trunk/classpath/debian/rules 2009-09-11 05:30:04 UTC (rev 10332)
+++ trunk/classpath/debian/rules 2009-09-11 09:16:33 UTC (rev 10333)
@@ -33,6 +33,7 @@
--includedir=\$${prefix}/include/classpath \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
+ --disable-Werror \
--disable-dependency-tracking \
--with-glibj=both \
--enable-examples \
@@ -54,6 +55,7 @@
--includedir=\$${prefix}/include/classpath \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
+ --disable-Werror \
--disable-dependency-tracking \
--with-glibj=both \
--disable-tools \
@@ -145,6 +147,13 @@
dh_testdir
dh_testroot
dh_install -a --sourcedir=debian/tmp
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+ # Install alsa & dssi bits, only on Linux (previously:
+ # usr/lib/classpath/libgj* in classpath.install, but let's
+ # make it explicit).
+ dh_install -pclasspath --source=debian/tmp usr/lib/classpath/libgjsmalsa.*
+ dh_install -pclasspath --source=debian/tmp usr/lib/classpath/libgjsmdssi.*
+endif
dh_installdocs -a
dh_installexamples -a
dh_installman -a
More information about the pkg-java-commits
mailing list