CVS kaffe/debian
Wolfgang B??r
wbaer-guest at haydn.debian.org
Sun Jul 24 20:17:02 UTC 2005
Update of /cvsroot/pkg-java/kaffe/debian
In directory haydn:/tmp/cvs-serv16484/debian
Modified Files:
FileActions changelog control kaffe.postinst kaffe.preinst
kaffe.prerm rules
Log Message:
preparing 1.1.5-4, changed files
--- /cvsroot/pkg-java/kaffe/debian/FileActions 2005/04/11 17:14:41 1.5
+++ /cvsroot/pkg-java/kaffe/debian/FileActions 2005/07/24 20:17:02 1.6
@@ -18,16 +18,16 @@
############## runtime library ###################
-File: usr/lib/kaffe/jthreads/jre/lib/rt.jar
-Target: usr/share/kaffe-common/lib/rt.jar
+File: usr/lib/kaffe/jthreads/jre/lib/{rt.jar,tools.jar,gmpjavamath.jar}
+Target: usr/share/kaffe-common/lib
Action: move-link
-File: usr/lib/kaffe/pthreads/jre/lib/rt.jar
-Target: usr/share/kaffe-common/lib/rt.jar
+File: usr/lib/kaffe/pthreads/jre/lib/{rt.jar,tools.jar,gmpjavamath.jar}
+Target: usr/share/kaffe-common/lib
Action: link
-File: usr/lib/kaffe/pthreads-profile/jre/lib/rt.jar
-Target: usr/share/kaffe-common/lib/rt.jar
+File: usr/lib/kaffe/pthreads-profile/jre/lib/{rt.jar,tools.jar,gmpjavamath.jar}
+Target: usr/share/kaffe-common/lib
Action: link
##################################################
--- /cvsroot/pkg-java/kaffe/debian/changelog 2005/04/20 16:59:26 1.9
+++ /cvsroot/pkg-java/kaffe/debian/changelog 2005/07/24 20:17:02 1.10
@@ -1,3 +1,33 @@
+kaffe (2:1.1.5-4) unstable; urgency=low
+
+ * C++ transition (closes: #318511, #318785)
+ + rebuilt against libgmp3-dev
+ + debian/control + rules: removed gcc-3.4/g++-3.4 as compiler
+ * Changed libpng3-dev (transitional package) to libpng12-dev
+ * Removed shlibs.local - not needed anymore
+ * Cleaned debian directory - removed unused files (still available in our cvs)
+ * Added and installed lintian overrides file for pthreads-profile to
+ fix lintian error unstripped-binary (which is explicitly excluded in dh_strip)
+
+ * Build pthreads-profile only on specific systems (closes: #305608)
+ + Define SYSTEMS to include pthreads-profile in rules.i386 only
+ + Reworked install target to iterate over defined systems in SYSTEMS
+
+ * Kaffe specific changes:
+ + Reworked kaffe commands linking in alternatives system to reduce needed link
+ dereferences - fixes too many levels of symbolic links (closes: #317513)
+ + Only link (not copy) tools.jar/gmpjavamath.jar to the runtimes
+ + Enabled --with-profiling --enable-xprofiling for pthreads-profile build
+ + Removed duplicated --with-jikes flages in configure
+ + Cleaned up debian/rules
+
+ * Standards-Version 3.6.2 - no changes
+ * Added myself to uploaders
+
+ * Upload sponsored by Arnaud Vandyck
+
+ -- Wolfgang Baer <WBaer at gmx.de> Sat, 16 Jul 2005 13:32:59 +0200
+
kaffe (2:1.1.5-3) unstable; urgency=low
* Added myself to uploaders
--- /cvsroot/pkg-java/kaffe/debian/control 2005/04/20 13:04:11 1.2
+++ /cvsroot/pkg-java/kaffe/debian/control 2005/07/24 20:17:02 1.3
@@ -2,9 +2,9 @@
Section: interpreters
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Ean R. Schuessler <ean at novare.net>, Arnaud Vandyck <avdyk at debian.org>, Adam Heath <doogie at brainfood.com>, Michael Koch <konqueror at gmx.de>, Jeroen van Wolffelaar <jeroen at wolffelaar.nl>
-Build-Depends: debhelper (>= 4.1), xlibs-dev, libpng3-dev, libjpeg62-dev, libungif4-dev, zlib1g-dev, libgmp3-dev, xutils, dbs, zip, jikes, libgtk2.0-dev, libart-2.0-dev, libxml2-dev, libxslt1-dev, gcc-3.4, g++-3.4, libasound2-dev, libesd0-dev
-Standards-Version: 3.6.1
+Uploaders: Ean R. Schuessler <ean at novare.net>, Arnaud Vandyck <avdyk at debian.org>, Adam Heath <doogie at brainfood.com>, Michael Koch <konqueror at gmx.de>, Jeroen van Wolffelaar <jeroen at wolffelaar.nl>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends: debhelper (>= 4.1), xlibs-dev, libpng12-dev, libjpeg62-dev, libungif4-dev, zlib1g-dev, libgmp3-dev, xutils, dbs, zip, jikes, libgtk2.0-dev, libart-2.0-dev, libxml2-dev, libxslt1-dev, libasound2-dev, libesd0-dev
+Standards-Version: 3.6.2
Package: kaffe
Architecture: all
--- /cvsroot/pkg-java/kaffe/debian/kaffe.postinst 2005/04/11 17:14:42 1.3
+++ /cvsroot/pkg-java/kaffe/debian/kaffe.postinst 2005/07/24 20:17:02 1.4
@@ -1,10 +1,12 @@
#!/bin/sh
set -e
+# changed alternative system to save 3 link dereferences
+# therefore we now link the kaffe commands against kaffe-system
if [ "$1" = "configure" ];then
for file in jar java javac javadoc javah javap native2ascii rmic rmiregistry serialver ; do
update-alternatives --quiet \
- --install /usr/bin/$file $file /usr/lib/kaffe/bin/$file 300 \
+ --install /usr/bin/$file $file /etc/alternatives/kaffe-system/bin/$file 300 \
--slave /usr/share/man/man1/$file.1.gz $file.1.gz /usr/share/man/man1/$file.kaffe.1.gz \
|| true
--- /cvsroot/pkg-java/kaffe/debian/kaffe.preinst 2005/04/11 17:19:09 1.1
+++ /cvsroot/pkg-java/kaffe/debian/kaffe.preinst 2005/07/24 20:17:02 1.2
@@ -1,8 +1,9 @@
#!/bin/sh
set -e
+# changed the alternative link to save 3 link dereferences - remove the old links
if [ "$1" = "upgrade" ] ; then
- for file in appletviewer javakey ; do
+ for file in appletviewer jar java javac javadoc javah javakey javap jdb native2ascii rmic rmiregistry serialver ; do
update-alternatives --remove $file /usr/lib/kaffe/bin/$file || true
update-alternatives --auto $file || true
done
--- /cvsroot/pkg-java/kaffe/debian/kaffe.prerm 2005/04/03 21:03:05 1.1.1.1
+++ /cvsroot/pkg-java/kaffe/debian/kaffe.prerm 2005/07/24 20:17:02 1.2
@@ -1,11 +1,14 @@
#!/bin/sh
set -e
+# changed alternative system to save 3 link dereferences
+# therefore we now link the kaffe commands against kaffe-system
if [ "$1" != "upgrade" ] ; then
for file in appletviewer jar java javac javadoc javah javakey javap jdb native2ascii rmic rmiregistry serialver ; do
- update-alternatives --remove $file /usr/lib/kaffe/bin/$file || true
+ update-alternatives --remove $file /etc/alternatives/kaffe-system/bin/$file || true
update-alternatives --auto $file || true
done
fi
+
#DEBHELPER#
--- /cvsroot/pkg-java/kaffe/debian/rules 2005/04/20 13:04:11 1.5
+++ /cvsroot/pkg-java/kaffe/debian/rules 2005/07/24 20:17:02 1.6
@@ -6,6 +6,7 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
colon := :
comma := ,
@@ -15,40 +16,33 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# these values can be overwritten in the rules.$(DEB_BUILD_GNU_TYPE) files
KAFFE_JIKES := 1
KAFFE_GCJ :=
-export CC=/usr/bin/gcc-3.4
-export CXX=/usr/bin/g++-3.4
+ENABLE_SOUND := yes
+SYSTEMS := jthreads pthreads
+jthreads-PRIORITY := 0
+pthreads-PRIORITY := 1000
+pthreads-profile-PRIORITY := -1000
+
+# uncomment for sarge backports
+#export CC=/usr/bin/gcc-3.4
+#export CXX=/usr/bin/g++-3.4
# Include any additional architecture specific rules
-sinclude debian/rules.$(DEB_BUILD_GNU_TYPE)
+sinclude debian/rules.$(DEB_HOST_ARCH)
CONFFLAGS := \
--infodir='/usr/share/info' \
--mandir='/usr/share/man' \
--with-rt-jar='no' \
- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --with-jikes \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
--with-jni-library-path='/usr/lib/jni' \
- --without-kaffe-qt-awt \
- --without-kaffe-x-awt \
+ --without-kaffe-qt-awt \
+ --without-kaffe-x-awt \
--disable-nls
-# --with-gjdoc
-# --disable-debug \
-# --with-staticvm --with-staticlib \
-# --disable-sound
-# --without-alsa \
-# --enable-debug \
-# --with-pic \
-# --enable-xprofiling --with-profiling
-
-SYSTEMS := jthreads pthreads pthreads-profile
-jthreads-PRIORITY := 0
-pthreads-PRIORITY := 1000
-pthreads-profile-PRIORITY := -1000
-
prerms := $(patsubst %,debian/kaffe-%.prerm,$(SYSTEMS))
postinsts := $(patsubst %,debian/kaffe-%.postinst,$(SYSTEMS))
@@ -62,10 +56,6 @@
CONFFLAGS += --disable-gcj
endif
-# Still no sound
-ENABLE_SOUND = yes
-
-# special arguments
ifeq ($(strip $(ENABLE_SOUND)),yes)
CONFFLAGS += --enable-sound
else
@@ -87,11 +77,6 @@
INSTALL_PROGRAM += -s
endif
-#config.status: configure
-# dh_testdir
-# # Add here commands to configure the package.
-# ./configure $(CONFFLAGS)
-
#
# DBS
#
@@ -110,13 +95,12 @@
$(STAMP_DIR)/configure-jthreads: CONFFLAGS += --without-classpath-gtk-awt --disable-sound --without-alsa
$(STAMP_DIR)/build-pthreads-profile $(STAMP_DIR)/build-pthreads: $(STAMP_DIR)/build-jthreads
-$(STAMP_DIR)/configure-pthreads-profile: CONFFLAGS += --with-staticvm --with-staticlib --with-rt-jar=$(CURDIR)/build/jthreads/libraries/javalib/rt.jar --with-jikes --disable-sound #--with-profiling --enable-xprofiling
-$(STAMP_DIR)/configure-pthreads: CONFFLAGS += --with-rt-jar=$(CURDIR)/build/jthreads/libraries/javalib/rt.jar --with-jikes #--disable-debug --enable-libxmlj
+$(STAMP_DIR)/configure-pthreads-profile: CONFFLAGS += --with-staticvm --with-staticlib --with-rt-jar=$(CURDIR)/build/jthreads/libraries/javalib/rt.jar --disable-sound --with-profiling --enable-xprofiling
+$(STAMP_DIR)/configure-pthreads: CONFFLAGS += --with-rt-jar=$(CURDIR)/build/jthreads/libraries/javalib/rt.jar
configure: $(patsubst %,$(STAMP_DIR)/configure-%,$(SYSTEMS))
$(patsubst %,$(STAMP_DIR)/configure-%,$(SYSTEMS)): $(STAMP_DIR)/configure-%: $(patched)
dh_testdir
-# Add here commands to configure the package.
mkdir -p build/$*
cd build/$* && $(CURDIR)/$(BUILD_TREE)/configure $(CONFFLAGS) --with-threads=unix-$(word 1,$(subst -,$(space),$*)) --prefix=/usr/lib/kaffe/$* --sharedstatedir=/var/lib/kaffe/$*
touch $@
@@ -129,7 +113,6 @@
# Timeout changed 300->30, because some builds would otherwise take many
# hours due to bug in pthreads-enabled kaffe on some architectures
-$(MAKE) -C build/$* check TIMEOUT=30
- #/usr/bin/docbook-to-man debian/kaffe.sgml > kaffe.1
mkdir -p $(@D)
touch $@
@@ -138,10 +121,9 @@
dh_testroot
rm -f $(postinsts) $(prerms)
rm -rf build debian/install
-# rm -f build-stamp configure-stamp
-# Add here commands to clean up after the build process.
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
dh_clean
+
$(postinsts): debian/kaffe-%.postinst: debian/kaffe-SYSTEM.postinst.in
$(prerms): debian/kaffe-%.prerm: debian/kaffe-SYSTEM.prerm.in
@@ -155,20 +137,16 @@
dh_clean -k
dh_installdirs
rm -rf debian/install
- # Add here commands to install the package into debian/kaffe.
- $(MAKE) -C build/jthreads install DESTDIR=$(CURDIR)/debian/install
- $(MAKE) -C build/pthreads install DESTDIR=$(CURDIR)/debian/install
- $(MAKE) -C build/pthreads-profile install DESTDIR=$(CURDIR)/debian/install
+ ## Install for all systems into debian/install
+ for i in $(SYSTEMS); do $(MAKE) -C build/$$i install DESTDIR=$(CURDIR)/debian/install; done
perl debian/file-actions.pl -v $(CURDIR)/debian/install
# Install jikes-kaffe wrapper
install -m 755 $(CURDIR)/debian/wrappers/jikes-kaffe $(CURDIR)/debian/jikes-kaffe/usr/bin/jikes-kaffe
- # remove javadoc and make it a symlink
- rm $(CURDIR)/debian/install/usr/lib/kaffe/jthreads/bin/javadoc
- ln -s ../../../../bin/gjdoc $(CURDIR)/debian/install/usr/lib/kaffe/jthreads/bin/javadoc
- rm $(CURDIR)/debian/install/usr/lib/kaffe/pthreads/bin/javadoc
- ln -s ../../../../bin/gjdoc $(CURDIR)/debian/install/usr/lib/kaffe/pthreads/bin/javadoc
- rm $(CURDIR)/debian/install/usr/lib/kaffe/pthreads-profile/bin/javadoc
- ln -s ../../../../bin/gjdoc $(CURDIR)/debian/install/usr/lib/kaffe/pthreads-profile/bin/javadoc
+ # Remove javadoc and make it a symlink
+ for i in $(SYSTEMS); do rm $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/javadoc; ln -s ../../../../bin/gjdoc $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/javadoc; done
+ # install lintian overrides
+ install -d $(CURDIR)/debian/kaffe-pthreads-profile/usr/share/lintian/overrides/
+ install -m 644 $(CURDIR)/debian/kaffe-pthreads-profile.lintian $(CURDIR)/debian/kaffe-pthreads-profile/usr/share/lintian/overrides/kaffe-pthreads-profile
# Build architecture-independent files here.
binary-indep: build install
@@ -181,7 +159,6 @@
cp build-tree/kaffe-$(RELEASE)/FAQ/FAQ.* debian/kaffe-doc/usr/share/doc/kaffe/FAQ
cp build-tree/kaffe-$(RELEASE)/WHATSNEW debian/kaffe-doc/usr/share/doc/kaffe/
dh_installchangelogs $(BUILD_TREE)/ChangeLog -i
-# dh_installinfo -i
dh_installman -i
dh_link -i
dh_compress -i
@@ -199,24 +176,11 @@
dh_installchangelogs $(BUILD_TREE)/ChangeLog -s
dh_installdocs -s
dh_installexamples -s
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
dh_installman -s
dh_link -s
dh_strip -s -N kaffe-pthreads-profile
dh_compress -s
dh_fixperms -s
-# dh_perl
-# dh_python
-# dh_makeshlibs -s
dh_installdeb -s
dh_shlibdeps -s
dh_gencontrol -s
More information about the pkg-java-commits
mailing list