[pkg-java] r7423 - trunk/doxia/debian

twerner at alioth.debian.org twerner at alioth.debian.org
Thu Nov 27 17:55:00 UTC 2008 

Author: twerner
Date: 2008-11-27 17:54:59 +0000 (Thu, 27 Nov 2008)
New Revision: 7423

Added:
   trunk/doxia/debian/orig-tar.sh
Modified:
   trunk/doxia/debian/
   trunk/doxia/debian/build.properties
   trunk/doxia/debian/build.xml
   trunk/doxia/debian/changelog
   trunk/doxia/debian/control
   trunk/doxia/debian/rules
   trunk/doxia/debian/watch
Log:
* new upstream version
* Added myself to Uploaders.
* Updated Standards-Version to 3.8.0.


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

Modified: trunk/doxia/debian/build.properties
===================================================================
--- trunk/doxia/debian/build.properties	2008-11-27 17:14:00 UTC (rev 7422)
+++ trunk/doxia/debian/build.properties	2008-11-27 17:54:59 UTC (rev 7423)
@@ -2,7 +2,6 @@
 classpath.compile = \
                     ${basedir}/doxia-sink-api/build/doxia-sink-api-${version}.jar:\
                     ${basedir}/doxia-core/build/doxia-core-${version}.jar:\
-                    ${basedir}/doxia-decoration-model/build/doxia-decoration-model-${version}.jar:\
                     /usr/share/java/plexus-container-default.jar:\
                     /usr/share/java/plexus-i18n.jar:\
                     /usr/share/java/plexus-utils.jar:\

Modified: trunk/doxia/debian/build.xml
===================================================================
--- trunk/doxia/debian/build.xml	2008-11-27 17:14:00 UTC (rev 7422)
+++ trunk/doxia/debian/build.xml	2008-11-27 17:54:59 UTC (rev 7423)
@@ -11,13 +11,13 @@
         <ant target="clean" antfile="${maven.build.xml}" dir="."/>
         <ant target="clean" antfile="${maven.build.xml}" dir="doxia-sink-api"/>
         <ant target="clean" antfile="${maven.build.xml}" dir="doxia-core"/>
-        <ant target="clean" antfile="${maven.build.xml}" dir="doxia-decoration-model"/>
-        <ant target="clean" antfile="${maven.build.xml}" dir="doxia-site-renderer"/>
+	<ant target="clean" antfile="${maven.build.xml}"
+	  dir="doxia-modules/doxia-module-fml"/>
     </target>
 
     <target name="generate-sources">
         <taskdef name="modello" classname="ModelloTask" classpath="/usr/share/java/maven-ant-helper.jar:/usr/share/java/modello-core.jar:/usr/share/java/modello-plugin-xml.jar:/usr/share/java/modello-plugin-xpp3.jar"/>
-        <modello model="doxia-decoration-model/src/main/mdo/decoration.mdo" plugin="java" output="doxia-decoration-model/build/generated-sources" version="1.0.0"/>
+	<modello model="doxia-modules/doxia-module-fml/src/main/mdo/fml.mdo" plugin="java" output="doxia-modules/doxia-module-fml/build/generated-sources" version="1.0.0"/>
     </target>
 
     <target name="package" depends="generate-sources">
@@ -27,20 +27,17 @@
         <ant target="package" antfile="${maven.build.xml}" dir="doxia-core">
             <property name="artifactId" value="doxia-core"/>
         </ant>
-        <ant target="package" antfile="${maven.build.xml}" dir="doxia-decoration-model">
-            <property name="artifactId" value="doxia-decoration-model"/>
-        </ant>
-        <ant target="package" antfile="${maven.build.xml}" dir="doxia-site-renderer">
-            <property name="artifactId" value="doxia-site-renderer"/>
-        </ant>
+        <ant target="package" antfile="${maven.build.xml}"
+	  dir="doxia-modules/doxia-module-fml">
+            <property name="artifactId" value="doxia-module-fml"/>
+	  </ant>
     </target>
 
     <target name="javadoc">
         <javadoc destdir="${javadoc.dir}">
             <packageset dir="doxia-sink-api/src/main/java/"/>
             <packageset dir="doxia-core/src/main/java/"/>
-            <packageset dir="doxia-decoration-model/src/main/java/"/>
-            <packageset dir="doxia-site-renderer/src/main/java/"/>
+	    <packageset dir="doxia-modules/doxia-module-fml/src/main/java/"/>
         </javadoc>
     </target>
 

Modified: trunk/doxia/debian/changelog
===================================================================
--- trunk/doxia/debian/changelog	2008-11-27 17:14:00 UTC (rev 7422)
+++ trunk/doxia/debian/changelog	2008-11-27 17:54:59 UTC (rev 7423)
@@ -1,12 +1,17 @@
-doxia (1.0-alpha-7-2) UNRELEASED; urgency=low
+doxia (1.0-alpha-11-1) UNRELEASED; urgency=low
 
+  [ Michael Koch ]
   * Added watch file.
   * Added Homepage, Vcs-Svn and Vcs-Browser fields.
   * Added myself to Uploaders.
-  * Updated Standards-Version to 3.7.3.
 
- -- Michael Koch <konqueror at gmx.de>  Sat, 19 Apr 2008 09:44:33 +0200
+  [ Torsten Werner ]
+  * new upstream version
+  * Added myself to Uploaders.
+  * Updated Standards-Version to 3.8.0.
 
+ -- Torsten Werner <twerner at debian.org>  Thu, 27 Nov 2008 18:31:22 +0100
+
 doxia (1.0-alpha-7-1) unstable; urgency=low
 
   * Initial release. (Closes: #413554)

Modified: trunk/doxia/debian/control
===================================================================
--- trunk/doxia/debian/control	2008-11-27 17:14:00 UTC (rev 7422)
+++ trunk/doxia/debian/control	2008-11-27 17:54:59 UTC (rev 7423)
@@ -2,10 +2,10 @@
 Section: devel
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Trygve Laugstol <trygvis at inamo.no>, Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>
+Uploaders: Trygve Laugstol <trygvis at inamo.no>, Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>
 Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libxalan2-java, libbcpg-java, libbcpg-java-doc, libbcprov-java, libbcprov-java-doc, classpath-doc, libcommons-cli-java, libwagon-java, libplexus-i18n-java, libplexus-velocity-java, libmodello-java, velocity, maven-ant-helper
 Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/doxia
 Homepage: http://maven.apache.org/doxia/

Added: trunk/doxia/debian/orig-tar.sh
===================================================================
--- trunk/doxia/debian/orig-tar.sh	                        (rev 0)
+++ trunk/doxia/debian/orig-tar.sh	2008-11-27 17:54:59 UTC (rev 7423)
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+TAR=../doxia_$2.orig.tar.gz
+DIR=doxia-$2
+TAG=doxia-$2
+
+svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/$TAG $DIR
+tar -c -z -f $TAR $DIR
+rm -rf $DIR ../$TAG
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+  . .svn/deb-layout
+  mv $TAR $origDir
+  echo "moved $TAR to $origDir"
+fi


Property changes on: trunk/doxia/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/doxia/debian/rules
===================================================================
--- trunk/doxia/debian/rules	2008-11-27 17:14:00 UTC (rev 7422)
+++ trunk/doxia/debian/rules	2008-11-27 17:54:59 UTC (rev 7423)
@@ -13,24 +13,15 @@
 DEB_ANT_BUILDFILE    := ./debian/build.xml
 DEB_ANT_ARGS         := -Dversion=$(VERSION)
 API_DOCS             := build/api
-SVN                  := http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/$(PACKAGE)-$(VERSION)
 
 get-orig-source:
-	echo "Getting version $(VERSION) from $(SVN)"
-	mkdir orig_tmp
-	cd orig_tmp && \
-		svn export -q $(SVN) $(PACKAGE) && \
-		tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
-	rm -rf orig_tmp
-	
+	uscan --force-download
 
 binary-post-install/lib$(PACKAGE)-java::
-	dh_install -plib$(PACKAGE)-java $(PACKAGE)-decoration-model/build/$(PACKAGE)-decoration-model-$(VERSION).jar usr/share/java
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-decoration-model-$(VERSION).jar usr/share/java/$(PACKAGE)-decoration-model.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)-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)-site-renderer/build/$(PACKAGE)-site-renderer-$(VERSION).jar usr/share/java
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-site-renderer-$(VERSION).jar usr/share/java/$(PACKAGE)-site-renderer.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
 

Modified: trunk/doxia/debian/watch
===================================================================
--- trunk/doxia/debian/watch	2008-11-27 17:14:00 UTC (rev 7422)
+++ trunk/doxia/debian/watch	2008-11-27 17:54:59 UTC (rev 7423)
@@ -1,2 +1,3 @@
 version=3
-http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/ doxia-(\d.*)/
+http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/ doxia-(\d.*)/ \
+  debian debian/orig-tar.sh

More information about the pkg-java-commits mailing list