[pkg-java] r8932 - in trunk/qdox: . debian
Ludovic Claude
ludovicc-guest at alioth.debian.org
Tue Jul 7 23:10:20 UTC 2009
Author: ludovicc-guest
Date: 2009-07-07 23:10:20 +0000 (Tue, 07 Jul 2009)
New Revision: 8932
Added:
trunk/qdox/debian/build.properties
trunk/qdox/debian/build.xml
trunk/qdox/debian/libqdox-java.poms
trunk/qdox/debian/maven.publishedRules
trunk/qdox/debian/maven.rules
trunk/qdox/debian/orig-tar.sh
Removed:
trunk/qdox/.cvsignore
trunk/qdox/debian/links
trunk/qdox/debian/patches/
Modified:
trunk/qdox/debian/changelog
trunk/qdox/debian/control
trunk/qdox/debian/copyright
trunk/qdox/debian/libqdox-java-doc.docs
trunk/qdox/debian/rules
trunk/qdox/debian/watch
Log:
* New version
Deleted: trunk/qdox/.cvsignore
===================================================================
--- trunk/qdox/.cvsignore 2009-07-07 23:06:34 UTC (rev 8931)
+++ trunk/qdox/.cvsignore 2009-07-07 23:10:20 UTC (rev 8932)
@@ -1,11 +0,0 @@
-JFlexLexer.java
-LICENSE.txt
-Parser.java
-README.txt
-build.xml
-maven.xml
-project.properties
-project.xml
-src
-target
-tmp
Added: trunk/qdox/debian/build.properties
===================================================================
--- trunk/qdox/debian/build.properties (rev 0)
+++ trunk/qdox/debian/build.properties 2009-07-07 23:10:20 UTC (rev 8932)
@@ -0,0 +1,5 @@
+maven.test.skip=true
+javadoc.dir=build/docs/api
+build.sourceDirectory=src/java
+build.testSourceDirectory=src/test
+qdox.byaccj.executable=byaccj
Added: trunk/qdox/debian/build.xml
===================================================================
--- trunk/qdox/debian/build.xml (rev 0)
+++ trunk/qdox/debian/build.xml 2009-07-07 23:10:20 UTC (rev 8932)
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+
+<project name="pkg-java" default="package" basedir="..">
+
+ <property file="debian/build.properties"/>
+ <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
+ <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
+
+ <macrodef name="cleanmodule">
+ <attribute name="dir"/>
+ <sequential>
+ <ant target="clean" antfile="${maven.build}" dir="@{dir}">
+ <property name="debian.dir" location="debian" />
+ <property name="project.dir" value="@{dir}" />
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="packagemodule">
+ <attribute name="dir"/>
+ <sequential>
+ <ant target="package" antfile="${maven.build}" dir="@{dir}">
+ <property name="debian.dir" location="debian" />
+ <property name="project.dir" value="@{dir}" />
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="javadocmodule">
+ <attribute name="dir"/>
+ <sequential>
+ <ant target="javadoc"
+ antfile="${maven.build}" dir="@{dir}"/>
+ </sequential>
+ </macrodef>
+
+ <target name="clean">
+ <delete dir="build"/>
+ <cleanmodule dir=""/>
+ </target>
+
+ <target name="package">
+ <java classpath="/usr/share/java/JFlex.jar" classname="JFlex.Main" fork="true">
+ <arg value="-d" />
+ <arg value="${build.directory}/generated-sources/com/thoughtworks/qdox/parser/impl" />
+ <arg value="src/grammar/lexer.flex" />
+ </java>
+ <exec executable="${qdox.byaccj.executable}" dir="${build.directory}/generated-sources/com/thoughtworks/qdox/parser/impl"
+ failonerror="true">
+ <arg value="-v" />
+ <arg value="-Jnorun" />
+ <arg value="-Jnoconstruct" />
+ <arg value="-Jclass=Parser" />
+ <arg value="-Jsemantic=Value" />
+ <arg value="-Jpackage=com.thoughtworks.qdox.parser.impl" />
+ <arg value="${basedir}/src/grammar/parser.y" />
+ </exec>
+ <move tofile="${build.directory}/yacc-states.txt" file="${build.directory}/generated-sources/com/thoughtworks/qdox/parser/impl/y.output" />
+
+ <packagemodule dir=""/>
+ </target>
+
+ <target name="javadoc">
+ <javadocmodule dir="."/>
+ </target>
+
+</project>
Modified: trunk/qdox/debian/changelog
===================================================================
--- trunk/qdox/debian/changelog 2009-07-07 23:06:34 UTC (rev 8931)
+++ trunk/qdox/debian/changelog 2009-07-07 23:10:20 UTC (rev 8932)
@@ -1,3 +1,23 @@
+qdox (1.9.1-1) unstable; urgency=low
+
+ * New upstream version, add myself to Uploaders
+ * Change section to java, bump up Standards-Version to 3.8.1
+ * Add watch file
+ * Use default-jdk for the build instead of java-gcj
+ * Remove Depends on java runtimes as it is a library and headless environments
+ may not like a full JRE.
+ * Remove lexer patch as it has been applied upstream
+ * Add ${misc:Depends} to Depends to clear Lintian warnings
+ * Add Build-Depends on jflex and byacc-j as those tools are now packaged
+ and can be used to generate fresh parser code
+ * Update the copyright, license is now Apache 2.0
+ * Add the Maven POM to the package
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Wed, 13 May 2009 20:59:05 +0100
+
qdox (1.6.1-3) unstable; urgency=low
[Arnaud Vandyck]
Modified: trunk/qdox/debian/control
===================================================================
--- trunk/qdox/debian/control 2009-07-07 23:06:34 UTC (rev 8931)
+++ trunk/qdox/debian/control 2009-07-07 23:10:20 UTC (rev 8932)
@@ -1,15 +1,17 @@
Source: qdox
-Section: libs
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Trygve Laugstøl <trygvis at inamo.no>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>> 5), cdbs
-Build-Depends-Indep: java-gcj-compat-dev, ant-optional, junit (>= 3.8.1), libjmock-java (>= 1.0.1)
-Standards-Version: 3.7.2
+Uploaders: Trygve Laugstøl <trygvis at inamo.no>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>,
+ Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends: debhelper (>> 5), cdbs, default-jdk, byacc-j
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
+ jflex (>= 1.4.1), junit (>= 3.8.1), libjmock-java (>= 1.0.1)
+Standards-Version: 3.8.1
Package: libqdox-java
Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${misc:Depends}
Suggests: libqdox-java-doc
Description: Quickly parses declarations and Javadoc from Java source
qdox quickly parses Java source files looking for key items of
@@ -27,6 +29,7 @@
Package: libqdox-java-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}
Suggests: libqdox-java
Description: Documentation for qdox (javadoc)
This package contains the documentation for qdox, generated from
Modified: trunk/qdox/debian/copyright
===================================================================
--- trunk/qdox/debian/copyright 2009-07-07 23:06:34 UTC (rev 8931)
+++ trunk/qdox/debian/copyright 2009-07-07 23:10:20 UTC (rev 8932)
@@ -1,69 +1,18 @@
-This package was debianized by Trygve Laugstøl <trygvis at inamo.no> on
-Mon, 8 Aug 2005 02:56:59 +0200
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: QDox
+Maintainer: QDox Project Team
+Source: http://qdox.codehaus.org/
-It was downloaded from http://dist.codehaus.org/qdox/distributions/qdox-1.5-src.tar.gz
+Files: *
+Copyright: 2002-2009, Joe Walnes and QDox Project Team
+License: Apache-2.0
-Upstream Authors: Aslak Hellesøy <aslak at thoughtworks.net>
- Joe Walnes <joew at thoughtworks.com>
- Mike Royle <mroyle at thoughtworks.com>
- Paul Hammant <Paul_Hammant at yahoo.com>
- Mike Williams <mdub at dogbiscuit.org>
- Contributors:
- Peter Donald peter at realityforge.org>
- James Strachan <jstrachan at apache.org>
- Nick Pomfret
- Chris Stevenson <cstevenson at thoughtworks.com>
- Ben Hogan <ben at lizardsoftware.com
- Laurent Etiemble
+Files: debian/*
+Copyright: 2005, Trygve Laugstøl <trygvis at inamo.no>
+Copyright: 2009, Ludovic Claude <ludovic.claude at laposte.net>
+License: Apache-2.0
-Copyright:
-/* ====================================================================
- * The IronSmith Software License, Version 1.1
- *
- * (this license is derived and fully compatible with the Apache Software
- * License - see http://www.apache.org/LICENSE.txt)
- *
- * Copyright (c) 2002 The IronSmith Project. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * IronSmith Project (http://www.ironsmith.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "IronSmith" and "The IronSmith Project"
- * must not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact help at ironsmith.org.
- *
- * 5. Products derived from this software may not be called "IronSmith"
- * or "QDox", nor may "IronSmith" or "QDox" appear in their
- * name, without prior written permission of the IronSmith Project.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- */
+License: Apache-2.0
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
+
Modified: trunk/qdox/debian/libqdox-java-doc.docs
===================================================================
--- trunk/qdox/debian/libqdox-java-doc.docs 2009-07-07 23:06:34 UTC (rev 8931)
+++ trunk/qdox/debian/libqdox-java-doc.docs 2009-07-07 23:10:20 UTC (rev 8932)
@@ -1 +1 @@
-target/javadoc
+build/docs/api
Added: trunk/qdox/debian/libqdox-java.poms
===================================================================
--- trunk/qdox/debian/libqdox-java.poms (rev 0)
+++ trunk/qdox/debian/libqdox-java.poms 2009-07-07 23:10:20 UTC (rev 8932)
@@ -0,0 +1 @@
+pom.xml --no-parent
Deleted: trunk/qdox/debian/links
===================================================================
--- trunk/qdox/debian/links 2009-07-07 23:06:34 UTC (rev 8931)
+++ trunk/qdox/debian/links 2009-07-07 23:10:20 UTC (rev 8932)
@@ -1 +0,0 @@
-usr/share/java/qdox-1.6.1.jar usr/share/java/qdox.jar
Added: trunk/qdox/debian/maven.publishedRules
===================================================================
--- trunk/qdox/debian/maven.publishedRules (rev 0)
+++ trunk/qdox/debian/maven.publishedRules 2009-07-07 23:10:20 UTC (rev 8932)
@@ -0,0 +1 @@
+s/qdox/com.thoughtworks.qdox/ * * s/.*/debian/
Added: trunk/qdox/debian/maven.rules
===================================================================
--- trunk/qdox/debian/maven.rules (rev 0)
+++ trunk/qdox/debian/maven.rules 2009-07-07 23:10:20 UTC (rev 8932)
@@ -0,0 +1,4 @@
+junit junit jar s/3\..*/3.x/
+jmock jmock jar s/1\..*/1.x/
+s/ant/org.apache.ant/ * * s/.*/debian/
+
Added: trunk/qdox/debian/orig-tar.sh
===================================================================
--- trunk/qdox/debian/orig-tar.sh (rev 0)
+++ trunk/qdox/debian/orig-tar.sh 2009-07-07 23:10:20 UTC (rev 8932)
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../qdox_$VERSION.orig.tar.gz
+DIR=qdox-$VERSION
+TAG=qdox-$VERSION
+
+svn export http://svn.codehaus.org/qdox/tags/$TAG/ $DIR
+rm -r $DIR/bootstrap
+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/qdox/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/qdox/debian/rules
===================================================================
--- trunk/qdox/debian/rules 2009-07-07 23:06:34 UTC (rev 8931)
+++ trunk/qdox/debian/rules 2009-07-07 23:10:20 UTC (rev 8932)
@@ -1,30 +1,23 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME_DIRS := /usr/lib/jvm/java-gcj/
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := ant-nodeps ant-junit junit
+DEB_ANT_BUILD_TARGET := package javadoc
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
-ANT_HOME := /usr/share/ant
-DEB_JARS := /usr/share/ant/lib/ant-nodeps.jar \
- /usr/share/ant/lib/ant-junit.jar\
- junit.jar
+get-orig-source:
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-DEB_ANT_ARGS := -Dnoget -v
+binary-post-install/lib$(PACKAGE)-java::
+ mh_installpoms -plib$(PACKAGE)-java
+ mh_installjar -plib$(PACKAGE)-java -l pom.xml build/$(PACKAGE)-$(VERSION).jar
-DEB_ANT_CLEAN_TARGET := debian-clean
-DEB_ANT_BUILD_TARGET := debian-build
-DEB_ANT_INSTALL_TARGET := debian-install
-
-PATCH_EXCLUDES=-x target -x src -x tmp -x debian -x core -x lib -x extensions -x examples -x .cvsignore
-
clean::
- -$(RM) -r target tmp
+ -$(RM) -r target debian/tmp
-make-patches:
- diff -r -uN $(PATCH_EXCLUDES) -x Parser.java -x JFlexLexer.java ../qdox-1.6.1 . > debian/patches/01_build_files || true
- diff -r -uN $(PATCH_EXCLUDES) /dev/null Parser.java > debian/patches/02_parser_files || true
- diff -r -uN $(PATCH_EXCLUDES) /dev/null JFlexLexer.java >> debian/patches/02_parser_files || true
-
-.PHONY: make-patches
Modified: trunk/qdox/debian/watch
===================================================================
--- trunk/qdox/debian/watch 2009-07-07 23:06:34 UTC (rev 8931)
+++ trunk/qdox/debian/watch 2009-07-07 23:10:20 UTC (rev 8932)
@@ -1,2 +1,3 @@
version=3
-http://dist.codehaus.org/qdox/distributions/qdox-([\d.]+)-src\.tar\.gz
+http://svn.codehaus.org/qdox/tags/ qdox-(\d.*)/ debian debian/orig-tar.sh
+
More information about the pkg-java-commits
mailing list