[pkg-java] r11990 - in trunk/java-common: . debian
Niels Thykier
nthykier-guest at alioth.debian.org
Mon Apr 5 10:29:09 UTC 2010
Author: nthykier-guest
Date: 2010-04-05 10:29:07 +0000 (Mon, 05 Apr 2010)
New Revision: 11990
Modified:
trunk/java-common/Makefile
trunk/java-common/debian/changelog
trunk/java-common/debian/compat
trunk/java-common/debian/control
trunk/java-common/debian/rules
Log:
Bumped debhelper compat to 7 and updated the faq update rules.
Removed obsolete publish rule.
Made the build fetch the version from the changelog rather than
the build dir.
Modified: trunk/java-common/Makefile
===================================================================
--- trunk/java-common/Makefile 2010-04-05 09:42:47 UTC (rev 11989)
+++ trunk/java-common/Makefile 2010-04-05 10:29:07 UTC (rev 11990)
@@ -18,9 +18,6 @@
all: debian-java-policy debian-java-faq-gen
-publish: policy.html
- scp debian-java-policy/*.html opal at www.debian.org:/org/www.debian.org/www/doc/packaging-manuals/java-policy
-
# Policy part
MAKEOUT=policy.txt policy.ps
OUTPUTS=$(MAKEOUT) policy.xml
@@ -88,8 +85,7 @@
debian-java-faq-install: debian-java-faq debian-java-faq-gen
(cd $<; make publish PUBLISHDIR=$(PUBLISHDIR))
-debian-java-faq:
- (cvs -d :pserver:anonymous at cvs.debian.org:/cvs/debian-doc -z3 checkout -d debian-java-faq ddp/manuals.sgml/java-faq)
-
debian-java-faq-update: debian-java-faq
- (cd $<; cvs -z3 update -d)
+ svn export svn://svn.debian.org/svn/ddp/manuals/trunk/java-faq/ faq-update/
+ cp faq-update/* $</
+ rm -fr faq-update/
Modified: trunk/java-common/debian/changelog
===================================================================
--- trunk/java-common/debian/changelog 2010-04-05 09:42:47 UTC (rev 11989)
+++ trunk/java-common/debian/changelog 2010-04-05 10:29:07 UTC (rev 11990)
@@ -7,6 +7,12 @@
- Java libraries are no longer required to depend on a JVM
(Closes: #227587)
* Updated to java-faq to match the online version.
+ * Bumped debhelper compat to 7.
+ * Use the version from the changelog rather than the dir to determine
+ the debian "revision" of the default-* packages. It is more robust.
+ * Removed old publish rule - the policy is updated automatically after
+ upload now.
+ * Updated the rules to update the java faq.
-- Niels Thykier <niels at thykier.net> Fri, 26 Mar 2010 21:44:45 +0100
Modified: trunk/java-common/debian/compat
===================================================================
--- trunk/java-common/debian/compat 2010-04-05 09:42:47 UTC (rev 11989)
+++ trunk/java-common/debian/compat 2010-04-05 10:29:07 UTC (rev 11990)
@@ -1 +1 @@
-5
+7
Modified: trunk/java-common/debian/control
===================================================================
--- trunk/java-common/debian/control 2010-04-05 09:42:47 UTC (rev 11989)
+++ trunk/java-common/debian/control 2010-04-05 10:29:07 UTC (rev 11990)
@@ -4,7 +4,7 @@
Maintainer: Debian Java Mailing List <debian-java at lists.debian.org>
Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>, Torsten Werner <twerner at debian.org>,
Niels Thykier <niels at thykier.net>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 7)
Build-Depends-Indep: debiandoc-sgml, docbook-utils, docbook-xml, dpsyco-devel, lynx
Standards-Version: 3.8.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java-common
Modified: trunk/java-common/debian/rules
===================================================================
--- trunk/java-common/debian/rules 2010-04-05 09:42:47 UTC (rev 11989)
+++ trunk/java-common/debian/rules 2010-04-05 10:29:07 UTC (rev 11990)
@@ -10,7 +10,7 @@
S = $(EMPTY) $(EMPTY)
mk_cslist = $(subst $(S),$(,)$(S),$(foreach v,$(1),$(v)-$(2)))
vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1)))
-jrel = $(subst java-common-0.,,$(notdir $(CURDIR)))
+jrel = $(shell dpkg-parsechangelog | grep Version | sed "s/Version: 0.//")
DPKG_VARS := $(shell dpkg-architecture)
DEB_HOST_ARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH)
@@ -62,7 +62,7 @@
install-stamp: build-stamp
dh_testdir
dh_testroot
- dh_clean -k -i
+ dh_prep -i
dh_installdirs -i
dh_installdocs -i
@@ -75,13 +75,13 @@
install-arch:
dh_testdir
dh_testroot
- dh_clean -k -s
+ dh_prep -a
binary-arch: install-arch
ifneq (,$(p_jre))
- dh_testdir -s
- dh_testroot -s
+ dh_testdir -a
+ dh_testroot -a
dh_install -a
dh_installdocs -pdefault-jre-headless
dh_installchangelogs -pdefault-jre-headless
@@ -93,10 +93,10 @@
ln -sf $$t debian/$$p/usr/share/doc/$$p; \
t=$$p; \
done
- dh_compress -s
- dh_fixperms -s
- dh_installdeb -s
- dh_gencontrol -s -- \
+ dh_compress -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_gencontrol -a -- \
-v$(dversion) \
'-Vjre=$(p_jre)' \
'-Vjhl=$(p_jhl)' \
@@ -109,8 +109,8 @@
'-Vjhl:provides=$(jhl_provides)' \
'-Vjdk:provides=$(jdk_provides)' \
- dh_md5sums -s
- dh_builddeb -s
+ dh_md5sums -a
+ dh_builddeb -a
endif
# Build architecture-independent files here.
More information about the pkg-java-commits
mailing list