CVS gjdoc/debian
Michael Koch
mkoch-guest@haydn.debian.org
Tue Mar 15 12:45:03 2005
Update of /cvsroot/pkg-java/gjdoc/debian
In directory haydn:/tmp/cvs-serv16286/debian
Modified Files:
changelog control copyright rules
Added Files:
compat watch
Log Message:
gjdoc (0.7.3-1) unstable; urgency=low
* New upstream release
- Removed debian/patches/10_gjdoc_sh_in.patch
* Updated debian/copyright (Closes: #299426)
* debian/control: Revised description
* debian/rules: Automate getting upstream version
* Updated watch file
-- Michael Koch <konqueror@gmx.de> Tue, 15 Mar 2005 13:00:41 +0000
gjdoc (0.7.2-2) unstable; urgency=low
* Fixed gjdoc.sh.in
-- Michael Koch <konqueror@gmx.de> Thu, 10 Mar 2005 09:21:20 +0000
gjdoc (0.7.2-1) unstable; urgency=low
* New upstream release
-- Michael Koch <konqueror@gmx.de> Wed, 9 Mar 2005 15:30:37 +0000
gjdoc (0.7.1-2) unstable; urgency=low
* Fixed Depends on kaffe.
* Added watch file.
-- Michael Koch <konqueror@gmx.de> Fri, 25 Feb 2005 08:18:38 +0000
gjdoc (0.7.1-1) unstable; urgency=low
* New upstream release
* Removed debian/patches/01-gjdoc_script_antlr_in_classpath.patch.
* debian/control: Use correct epoch when depending on kaffe.
-- Michael Koch <konqueror@gmx.de> Tue, 22 Feb 2005 16:38:44 +0000
gjdoc (0.7.0+cvs20050217-2) unstable; urgency=low
* debian/control: Revised description.
* Install manpage for dh_javadoc.
* Don't fail when trying to delete non-existant gjdoc_rawcomments.cache
(Closes: #293193).
* Removed obsolete dpatch files in debian/patches.
-- Michael Koch <konqueror@gmx.de> Mon, 21 Feb 2005 09:13:49 +0000
gjdoc (0.7.0+cvs20050217-1) unstable; urgency=low
* New upstream release
* Use CDBS and kaffe for building.
* Fixed Build-Depends.
* debian/control: Made short description start with a lower letter.
Updated Standards-Version.
* debian/README.Debian: Removed.
-- Michael Koch <konqueror@gmx.de> Thu, 17 Feb 2005 16:55:10 -0600
--- /cvsroot/pkg-java/gjdoc/debian/changelog 2004/11/20 23:28:45 1.5
+++ /cvsroot/pkg-java/gjdoc/debian/changelog 2005/03/15 19:44:03 1.6
@@ -1,3 +1,62 @@
+gjdoc (0.7.3-1) unstable; urgency=low
+
+ * New upstream release
+ - Removed debian/patches/10_gjdoc_sh_in.patch
+ * Updated debian/copyright (Closes: #299426)
+ * debian/control: Revised description
+ * debian/rules: Automate getting upstream version
+ * Updated watch file
+
+ -- Michael Koch <konqueror@gmx.de> Tue, 15 Mar 2005 13:00:41 +0000
+
+gjdoc (0.7.2-2) unstable; urgency=low
+
+ * Fixed gjdoc.sh.in
+
+ -- Michael Koch <konqueror@gmx.de> Thu, 10 Mar 2005 09:21:20 +0000
+
+gjdoc (0.7.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Michael Koch <konqueror@gmx.de> Wed, 9 Mar 2005 15:30:37 +0000
+
+gjdoc (0.7.1-2) unstable; urgency=low
+
+ * Fixed Depends on kaffe.
+ * Added watch file.
+
+ -- Michael Koch <konqueror@gmx.de> Fri, 25 Feb 2005 08:18:38 +0000
+
+gjdoc (0.7.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Removed debian/patches/01-gjdoc_script_antlr_in_classpath.patch.
+ * debian/control: Use correct epoch when depending on kaffe.
+
+ -- Michael Koch <konqueror@gmx.de> Tue, 22 Feb 2005 16:38:44 +0000
+
+gjdoc (0.7.0+cvs20050217-2) unstable; urgency=low
+
+ * debian/control: Revised description.
+ * Install manpage for dh_javadoc.
+ * Don't fail when trying to delete non-existant gjdoc_rawcomments.cache
+ (Closes: #293193).
+ * Removed obsolete dpatch files in debian/patches.
+
+ -- Michael Koch <konqueror@gmx.de> Mon, 21 Feb 2005 09:13:49 +0000
+
+gjdoc (0.7.0+cvs20050217-1) unstable; urgency=low
+
+ * New upstream release
+ * Use CDBS and kaffe for building.
+ * Fixed Build-Depends.
+ * debian/control: Made short description start with a lower letter.
+ Updated Standards-Version.
+ * debian/README.Debian: Removed.
+
+ -- Michael Koch <konqueror@gmx.de> Thu, 17 Feb 2005 16:55:10 -0600
+
gjdoc (0.6.1-14) unstable; urgency=low
* debian/scripts/gjdoc: applied a patch from Loic Minier (thanks to him
--- /cvsroot/pkg-java/gjdoc/debian/control 2004/11/18 21:50:47 1.3
+++ /cvsroot/pkg-java/gjdoc/debian/control 2005/03/15 19:44:03 1.4
@@ -2,28 +2,24 @@
Section: devel
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Mark Howard <mh@debian.org>, Takashi Okamoto <tora@debian.org>, Arnaud Vandyck <avdyk@debian.org>
-Build-Depends-Indep: debhelper (>> 4), fastjar, jikes-classpath, libgnujaxp-java (>= 0.0.cvs20040416)
-Standards-Version: 3.5.10
+Uploaders: Mark Howard <mh@debian.org>, Takashi Okamoto <tora@debian.org>, Arnaud Vandyck <avdyk@debian.org>, Michael Koch <konqueror@gmx.de>
+Build-Depends-Indep: debhelper (>> 4), cdbs, kaffe (>= 2:1.1.4.PRECVS8-1), jikes, fastjar, antlr (>= 2.7.1), tetex-bin, perl
+Standards-Version: 3.6.1
Package: gjdoc
Architecture: all
-Depends: debhelper (>>4), kaffe (>= 1.1.4), libgnujaxp-java (>= 0.0.cvs20040416)
+Depends: debhelper (>> 4), kaffe (>= 2:1.1.4.PRECVS8-1), antlr
Conflicts: gjdoc-native
Replaces: gjdoc-native
-Description: Free drop-in replacement for Sun's "javadoc" written in java
- A doclet driver for the Java(tm) platform. 'gjdoc' aims at implementing
- all features of Sun's Javadoc 1.3, while maintaining full compatibility.
- Currently, around 90% of the Doclet API is implemented.
+Description: documentation generation framework for java source files
+ A doclet driver for the Java(tm) platform which is compatible to javadoc up to
+ and including version 1.4.
.
- In addition to the functionality of Sun's javadoc, gjdoc can also generate
- output in xml or info format.
- .
- Warning: This is regarded as alpha quality upstream so is likely to contain
- errors. Please report them in the Debian bug tracking system.
+ In addition to a standard doclet for producing a set of HTML pages, gjdoc
+ provides a doclet for generating XML output.
.
This package also includes dh_javadoc, a debhelper style script for handing
javadoc generation in Debian packages.
.
- This tool is part of classpath-tools GNU project.
+ This tool is part of the GNU classpath project.
http://www.gnu.org/software/cp-tools/
--- /cvsroot/pkg-java/gjdoc/debian/copyright 2003/09/11 19:36:47 1.1.1.1
+++ /cvsroot/pkg-java/gjdoc/debian/copyright 2005/03/15 19:44:03 1.2
@@ -1,7 +1,7 @@
This package was debianized by Grzegorz Prokopski (Debian Developer) <gadek@debian.org> on
Mon, 12 Aug 2002 12:44:59 +0200.
-It was downloaded from http://savannah.gnu.org/cvs/?group=cp-tools
+It was downloaded from ftp://ftp.gnu.org/pub/gnu/classpath.
Upstream Authors: (C) 2001 Free Software Foundation
--- /cvsroot/pkg-java/gjdoc/debian/rules 2004/01/17 04:08:13 1.2
+++ /cvsroot/pkg-java/gjdoc/debian/rules 2005/03/15 19:44:03 1.3
@@ -1,142 +1,24 @@
#!/usr/bin/make -f
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
+DH_JAVADOC_VER := "0.1"
+
+install/gjdoc::
+ cp debian/scripts/dh_javadoc debian/gjdoc/usr/bin
+ -rm -rf debian/gjdoc/usr/lib
+ mkdir -p debian/gjdoc/usr/share/man/man1
+ pod2man -c Debhelper -r $(DH_JAVADOC_VER) debian/scripts/dh_javadoc debian/gjdoc/usr/share/man/man1/dh_javadoc.1
+ echo "usr/share/java/com-sun-javadoc-$(VERSION).jar usr/share/java/com-sun-javadoc.jar" > debian/links
+ echo "usr/share/java/com-sun-tools-doclets-Taglet-$(VERSION).jar usr/share/java/com-sun-tools-doclets-Taglet.jar" >> debian/links
+ echo "usr/share/java/gnu-classpath-tools-gjdoc-$(VERSION).jar usr/share/java/gnu-classpath-tools-gjdoc.jar" >> debian/links
-export DH_COMPAT=4
+clean::
+ rm -f debian/links
-VERSION=0.6.1
-DH_JAVADOC_VER=0.1
-CLASSPATH=.:/usr/share/java/gnujaxp.jar
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-configure: patch configure-stamp
-configure-stamp:
- dh_testdir
- touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure
- dh_testdir
- ( cd src/; \
- jikes-classpath -classpath ${CLASSPATH}\
- `find . -name \*.java`; )
- (cd src; find * -name \*.class -printf "%p "> ../jarfiles-java)
- (cd src/resources; find * -printf "-C resources %p " -not -name CVS -not -name Root -not -name Repository -not -name Entries > ../../jarfiles-res )
- (cd src; \
- fastjar -c \
- -f ../gjdoc.jar \
- `cat ../jarfiles-java` `cat ../jarfiles-res` )
- # dh_javadoc
- pod2man -c Debhelper -r $(DH_JAVADOC_VER) debian/scripts/dh_javadoc debian/manpages/dh_javadoc.1
- touch build-stamp
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- -rm -rf build tmp
- -rm -rf `find . -name \*.class`
- -rm -rf `find . -name \*.jar`
- -rm -rf `find . -name \*.o`
- -rm -f gjdoc
- -rm -rf jarfiles-res
- -rm -rf jarfiles-java
- -rm -f debian/manpages/dh_javadoc.1
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- mv gjdoc.jar gjdoc-$(VERSION).jar
- dh_install -pgjdoc gjdoc-$(VERSION).jar usr/share/java/
- dh_link -pgjdoc usr/share/java/gjdoc-$(VERSION).jar usr/share/java/gjdoc.jar
- dh_install -pgjdoc debian/scripts/gjdoc usr/bin/
- dh_install -A gjdoccatalog.xml usr/share/gjdoc/
- dh_installman -A debian/manpages/gjdoc.1
-
- # upstream don't have a dtd yet...
- dh_install -A gjdoc.dtd usr/share/gjdoc/dtd/
- dh_install -A classpath-copyright.xml usr/share/gjdoc/
-
- # classpath sources are unfortunatley required to build any docs at the
- # moment
- #chmod -R 0644 debian/classpath-src
- #chmod -R ugo+X debian/classpath-src
- #dh_install -A debian/classpath-src/* usr/share/gjdoc/classpath-source/
- # dh_javadoc
- dh_install -A debian/scripts/dh_javadoc usr/bin
- dh_installman -A debian/manpages/dh_javadoc.1
-
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_installdocs -i README
- dh_installchangelogs -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build install
-
-patch: ${CURDIR}/patch-stamp
-${CURDIR}/patch-stamp:
- test -d debian/patched || install -d debian/patched
- echo "Patches applied in the Debian version of ${PACKAGE}:" > $@T
- @for patch in `cat debian/patches/00list`; do \
- stamp=debian/patched/$$patch.dpatch; \
- patch=debian/patches/$$patch.dpatch; \
- test -x $$patch || chmod +x $$patch; \
- if test -f $$stamp; then \
- echo "$$patch already applied."; \
- echo -e "\n$$patch:" >> $@T; \
- sed -n 's/^## *DP: */ /p' $$patch >> $@T; \
- else \
- echo -n "applying patch $$patch..."; \
- if $$patch -patch >$$stamp.new 2>&1; then \
- mv $$stamp.new $$stamp; \
- touch $$stamp; \
- echo -e "\n$$patch:" >> $@T; \
- sed -n 's/^## *DP: */ /p' $$patch >> $@T; \
- echo " ok."; \
- else \
- echo " failed."; \
- exit 1; \
- fi; \
- fi; \
- done
- mv -f $@T $@
-
-unpatch:
- @for patch in `sort -r debian/patches/00list`; do \
- stamp=debian/patched/$$patch.dpatch; \
- patch=debian/patches/$$patch.dpatch; \
- test -x $$patch || chmod +x $$patch; \
- if test -f $$stamp; then \
- echo -n "reverting patch $$patch..."; \
- if $$patch -unpatch 2>&1 >/dev/null; then \
- rm -f $$stamp; \
- echo " ok."; \
- else \
- echo " failed."; \
- exit 1; \
- fi; \
- fi; \
- done
- rm -f patch-stamp
+DEB_CONFIGURE_SCRIPT_ENV := JAVA="/usr/lib/kaffe/bin/java" JAVAC="/usr/lib/kaffe/bin/javac" JAR="fastjar"
+DEB_CONFIGURE_USER_FLAGS := --disable-native
-####
-
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure