Author: marcusb-guest
Date: 2007-06-06 15:44:19 +0000 (Wed, 06 Jun 2007)
New Revision: 3610
Modified:
branches/libjaxen-java/feature/debian/debian/doc-base
branches/libjaxen-java/feature/debian/debian/rules
Log:
Minor cleanup.
Modified: branches/libjaxen-java/feature/debian/debian/doc-base
===================================================================
--- branches/libjaxen-java/feature/debian/debian/doc-base 2007-06-06
15:39:30 UTC (rev 3609)
+++ branches/libjaxen-java/feature/debian/debian/doc-base 2007-06-06
15:44:19 UTC (rev 3610)
@@ -1,9 +1,9 @@
Document: libjaxen-java
-Title: jaxen API
+Title: API Javadoc for jaxen
Author: jaxen developers
-Abstract: JavaDoc documentation for jaxen
-Section: Apps/Programming
+Abstract: This is the API Javadoc provided by the jaxen library.
+Section: Programming
Format: HTML
-Index: /usr/share/doc/libjaxen-java/api/index.html
-Files: /usr/share/doc/libjaxen-java/api/*
+Index: /usr/share/doc/libjaxen-java/apidocs/index.html
+Files: /usr/share/doc/libjaxen-java/apidocs/*
Modified: branches/libjaxen-java/feature/debian/debian/rules
===================================================================
--- branches/libjaxen-java/feature/debian/debian/rules 2007-06-06 15:39:30 UTC
(rev 3609)
+++ branches/libjaxen-java/feature/debian/debian/rules 2007-06-06 15:44:19 UTC
(rev 3610)
@@ -7,12 +7,8 @@
DEB_JARS := ant ant-launcher jdom1 dom4j ant-junit junit xercesImpl
DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
- if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
- if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
- if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n
"$(DEB_JARS_BASE)/$${jar}:"; fi; \
- if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n
"$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
+ echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; \
done; \
- if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n
"$(JAVA_HOME)/lib/tools.jar"; fi)
DEB_ANT_ARGS := -propertyfile debian/ant.properties
ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \
@@ -21,14 +17,14 @@
PKGNAME := libjaxen-java
INSTALLDIR := $(CURDIR)/debian/$(PKGNAME)
JAVALIBDIR := $(INSTALLDIR)/usr/share/java
+DOCDIR := $(INSTALLDIR)/usr/share/doc/$(PKGNAME)
-VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) |
cut -f1 -d\- | cut -f1 -d\+)
-UVERSION := $(subst ~beta,-beta-,$(VERSION))
+VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) |
cut -f1 -d\-)
build: build-stamp
build-stamp:
dh_testdir
- $(ANT_INVOKE) jar javadoc test
+ $(ANT_INVOKE) dist
touch build-stamp
clean:
@@ -43,7 +39,7 @@
dh_testroot
dh_clean -k
dh_installdirs
- install -m 644 target/jaxen-$(UVERSION).jar
$(JAVALIBDIR)/jaxen-$(VERSION).jar
+ install -m 644 target/jaxen-$(VERSION).jar
$(JAVALIBDIR)/jaxen-$(VERSION).jar
ln -s jaxen-$(VERSION).jar $(JAVALIBDIR)/jaxen.jar
binary-indep: build install
@@ -51,6 +47,7 @@
dh_testroot
dh_installchangelogs
dh_installdocs
+ mv $(DOCDIR)/api $(DOCDIR)/apidocs
dh_compress
dh_fixperms
dh_installdeb
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
