[pkg-java] r7432 - trunk/doxia-sitetools/debian

twerner at alioth.debian.org twerner at alioth.debian.org
Thu Nov 27 23:02:43 UTC 2008 

Author: twerner
Date: 2008-11-27 23:02:42 +0000 (Thu, 27 Nov 2008)
New Revision: 7432

Modified:
   trunk/doxia-sitetools/debian/
   trunk/doxia-sitetools/debian/control
   trunk/doxia-sitetools/debian/rules
Log:
various fixes



Property changes on: trunk/doxia-sitetools/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/doxia-sitetools/debian/control
===================================================================
--- trunk/doxia-sitetools/debian/control	2008-11-27 22:27:49 UTC (rev 7431)
+++ trunk/doxia-sitetools/debian/control	2008-11-27 23:02:42 UTC (rev 7432)
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends-Indep: default-jdk, maven-ant-helper, libmodello-java
-Build-Depends: ant, debhelper (>= 5), cdbs, quilt
+Build-Depends-Indep: default-jdk, maven-ant-helper, libclassworlds-java,
+ libmodello-java, libplexus-container-default-java, libplexus-utils-java
+Build-Depends: ant, debhelper (>= 5), cdbs
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia-sitetools
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/doxia-sitetools/
@@ -13,7 +14,8 @@
 Package: libdoxia-sitetools-java
 Architecture: all
 Section: devel
-Description: Doxia Sitetools is an extension package of Doxia. 
+Conflicts: libdoxia-java (<= 1.0-alpha-7-1)
+Description: Extension package of the content generation framework Doxia
  Doxia Sitetools generates sites, consisting of static and dynamic content that
  was generated by Doxia. Doxia is a content generation framework which aims to
  provide its users with powerful techniques for generating static and dynamic

Modified: trunk/doxia-sitetools/debian/rules
===================================================================
--- trunk/doxia-sitetools/debian/rules	2008-11-27 22:27:49 UTC (rev 7431)
+++ trunk/doxia-sitetools/debian/rules	2008-11-27 23:02:42 UTC (rev 7432)
@@ -2,42 +2,18 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
 VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/')
-JAVA_HOME            := /usr/lib/jvm/default-jdk
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET := package
 DEB_ANT_BUILDFILE    := debian/build.xml
 DEB_ANT_ARGS         := -Dversion=$(VERSION)
+DEB_JARS             := classworlds plexus-container-default plexus-utils
 
 get-orig-source:
 	uscan --force-download
 
-# FIXME
 binary-post-install/lib$(PACKAGE)-java::
-	dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-apt/build/$(PACKAGE)-module-apt-$(VERSION).jar usr/share/java
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-apt-$(VERSION).jar usr/share/java/$(PACKAGE)-module-apt.jar
-	dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-confluence/build/$(PACKAGE)-module-confluence-$(VERSION).jar usr/share/java
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-confluence-$(VERSION).jar usr/share/java/$(PACKAGE)-module-confluence.jar
-	dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-docbook-simple/build/$(PACKAGE)-module-docbook-simple-$(VERSION).jar usr/share/java
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-docbook-simple-$(VERSION).jar usr/share/java/$(PACKAGE)-module-docbook-simple.jar
-	dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-fml/build/$(PACKAGE)-module-fml-$(VERSION).jar usr/share/java
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-fml-$(VERSION).jar usr/share/java/$(PACKAGE)-module-fml.jar
-	dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-itext/build/$(PACKAGE)-module-itext-$(VERSION).jar usr/share/java
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-itext-$(VERSION).jar usr/share/java/$(PACKAGE)-module-itext.jar
-	dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-latex/build/$(PACKAGE)-module-latex-$(VERSION).jar usr/share/java
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-latex-$(VERSION).jar usr/share/java/$(PACKAGE)-module-latex.jar
-	dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-rtf/build/$(PACKAGE)-module-rtf-$(VERSION).jar usr/share/java
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-rtf-$(VERSION).jar usr/share/java/$(PACKAGE)-module-rtf.jar
-	dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-twiki/build/$(PACKAGE)-module-twiki-$(VERSION).jar usr/share/java
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-twiki-$(VERSION).jar usr/share/java/$(PACKAGE)-module-twiki.jar
-	dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-xdoc/build/$(PACKAGE)-module-xdoc-$(VERSION).jar usr/share/java
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-xdoc-$(VERSION).jar usr/share/java/$(PACKAGE)-module-xdoc.jar
-	dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-xhtml/build/$(PACKAGE)-module-xhtml-$(VERSION).jar usr/share/java
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-xhtml-$(VERSION).jar usr/share/java/$(PACKAGE)-module-xhtml.jar
-	dh_install -plib$(PACKAGE)-java $(PACKAGE)-core/build/$(PACKAGE)-core-$(VERSION).jar usr/share/java
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-core-$(VERSION).jar usr/share/java/$(PACKAGE)-core.jar
-	dh_install -plib$(PACKAGE)-java $(PACKAGE)-sink-api/build/$(PACKAGE)-sink-api-$(VERSION).jar usr/share/java
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-sink-api-$(VERSION).jar usr/share/java/$(PACKAGE)-sink-api.jar
-
+	dh_install -plib$(PACKAGE)-java doxia-decoration-model/build/doxia-decoration-model-$(VERSION).jar usr/share/java
+	dh_link -plib$(PACKAGE)-java usr/share/java/doxia-decoration-model-$(VERSION).jar usr/share/java/doxia-decoration-model.jar

More information about the pkg-java-commits mailing list