Author: jerico-guest Date: 2009-07-10 01:37:41 +0000 (Fri, 10 Jul 2009) New Revision: 9071
Added: trunk/libxdoclet-java/debian/ trunk/libxdoclet-java/debian/ant.properties trunk/libxdoclet-java/debian/changelog trunk/libxdoclet-java/debian/compat trunk/libxdoclet-java/debian/control trunk/libxdoclet-java/debian/copyright trunk/libxdoclet-java/debian/orig-tar.sh trunk/libxdoclet-java/debian/patches/ trunk/libxdoclet-java/debian/patches/clean_xdoclet_from_core.diff trunk/libxdoclet-java/debian/patches/dont_build_samples.diff trunk/libxdoclet-java/debian/patches/dont_build_xjavadoc_samples_doc.diff trunk/libxdoclet-java/debian/patches/remove_beautify.diff trunk/libxdoclet-java/debian/patches/series trunk/libxdoclet-java/debian/rules trunk/libxdoclet-java/debian/watch Log: [svn-inject] Applying Debian modifications to trunk Property changes on: trunk/libxdoclet-java/debian ___________________________________________________________________ Added: mergeWithUpstream + 1 Added: trunk/libxdoclet-java/debian/ant.properties =================================================================== --- trunk/libxdoclet-java/debian/ant.properties (rev 0) +++ trunk/libxdoclet-java/debian/ant.properties 2009-07-10 01:37:41 UTC (rev 9071) @@ -0,0 +1,2 @@ +project.name=xdoclet +build.sysclasspath=first Added: trunk/libxdoclet-java/debian/changelog =================================================================== --- trunk/libxdoclet-java/debian/changelog (rev 0) +++ trunk/libxdoclet-java/debian/changelog 2009-07-10 01:37:41 UTC (rev 9071) @@ -0,0 +1,21 @@ +libxdoclet-java (1.2.3-3) unstable; urgency=low + + * Added missing license for jdo_2_0.dtd to copyright file. Thanks to Mike + O'Connor. + * Replaced BSD full text by link to Debian common licenses. Thanks to Joe + Smith. + + -- Florian Grandel <[email protected]> Sat, 28 Mar 2009 17:33:27 -0300 + +libxdoclet-java (1.2.3-2) unstable; urgency=low + + * removed jonas-ejb-jar_2_3.dtd as it is not DFSG conformant + * replaced dependency on default-java with default-jre + + -- Florian Grandel <[email protected]> Sun, 18 Jan 2009 19:32:34 -0200 + +libxdoclet-java (1.2.3-1) unstable; urgency=low + + * initial version (Closes: #509557) + + -- Florian Grandel <[email protected]> Mon, 22 Dec 2008 07:33:15 +0100 Added: trunk/libxdoclet-java/debian/compat =================================================================== --- trunk/libxdoclet-java/debian/compat (rev 0) +++ trunk/libxdoclet-java/debian/compat 2009-07-10 01:37:41 UTC (rev 9071) @@ -0,0 +1 @@ +5 Added: trunk/libxdoclet-java/debian/control =================================================================== --- trunk/libxdoclet-java/debian/control (rev 0) +++ trunk/libxdoclet-java/debian/control 2009-07-10 01:37:41 UTC (rev 9071) @@ -0,0 +1,41 @@ +Source: libxdoclet-java +Section: libs +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Florian Grandel <[email protected]> +Build-Depends: ant-optional, openjdk-6-jdk, debhelper (>= 5), cdbs, quilt, libbsf-java, libcommons-collections-java, + libcommons-logging-java, liblog4j1.2-java, velocity, libxalan2-java, libxjavadoc-java, junit, + libmockobjects-java +Standards-Version: 3.8.1 + +Package: libxdoclet-java +Architecture: all +Depends: ${misc:Depends}, default-jre | java2-runtime +Description: XDoclet Attribute Oriented Programming + XDoclet is an open source code generation engine. It + enables Attribute-Oriented Programming for java. In + short, this means that you can add more significance + to your code by adding meta data (attributes) to your + java sources. This is done in special JavaDoc tags. + . + XDoclet will parse your source files and generate many + artifacts such as XML descriptors and/or source code + from it. These files are generated from templates that + use the information provided in the source code and its + JavaDoc tags. + . + This package ships the core xdoclet module as well as + a selection of the xdoclet extension modules. The + installed modules are: apache, borland, caucho, ejb, + exolab, hibernate, hp, ibm, java, jboss, jdo, + jmx, jsf, libelis, macromedia, mockobjects, + mvcsoft, mx4j, objectweb, openejb, oracle, + orion, portlet, pramati, solarmetric, spring, + sybase, tjdo, web, webwork, wsee, xdoclet. + . + Modules that are present in the original XDoclet project + but contain proprietary source code have not been + included (bea, sun). + . + The package also contains xdoclet locales (de, fr_FR, + pt_BR). Added: trunk/libxdoclet-java/debian/copyright =================================================================== --- trunk/libxdoclet-java/debian/copyright (rev 0) +++ trunk/libxdoclet-java/debian/copyright 2009-07-10 01:37:41 UTC (rev 9071) @@ -0,0 +1,49 @@ +This package was debianized by Florian Grandel <[email protected]> on +Mon Dec 22 07:35:18 CET 2008. + +It was downloaded from +<http://sf.net/xdoclet/>. + +XDoclet is Copyright (c) 2000-2004, XDoclet Team + +XDoclet is released under the Berkeley Software Distribution (BSD) License. +On Debian systems, the complete text of the BSD License can be found in +`/usr/share/common-licenses/BSD'. + +***************************************************************************** + +J2EE DTD and XSD schemas within core/test, modules/ejb and modules/web are +Copyright (c) 1999-2007, Sun Microsystems, Inc. +Copyright (c) 2002, International Business Machines Corporation + +These files have been released by Sun Microsystems, Inc. under a dual licensing +scheme. Debian elects to include this software in this distribution under the GPL +Version 2 license. + +On Debian systems, the complete text of this license can be found +in `/usr/share/common-licenses/GPL-2'. + +**************************************************************************** + +J2EE DTD within the jonas module is +Copyright (c) 1999 Bull S.A. + +DTDs in the objectweb/jonas module are released under the GNU Lesser General +Public License (LGPL). On Debian systems, the complete text of the GNU Lesser +General Public License can be found in `/usr/share/common-licenses/LGPL'. + +**************************************************************************** + +JDO DTD 2.0 (jdo_2_0.dtd) within the JDO module is +Copyright (c) 2008, Sun Microsystems, Inc. + +This file is released under the Apache License, Version 2.0. You may obtain +a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + +**************************************************************************** + +The Debian packaging is (C) 2008, Florian Grandel <[email protected]> and +is licensed under the GPL. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. Added: trunk/libxdoclet-java/debian/orig-tar.sh =================================================================== --- trunk/libxdoclet-java/debian/orig-tar.sh (rev 0) +++ trunk/libxdoclet-java/debian/orig-tar.sh 2009-07-10 01:37:41 UTC (rev 9071) @@ -0,0 +1,70 @@ +#!/bin/bash -ex + +ORIG_DIR=xdoclet-$2 +ORIG_TAR=../xdoclet-src-$2.tgz + +DIR=libxdoclet-java-$2 +TAR=$3 + +# unpack the upstream tarball +tar xzf $ORIG_TAR +rm $ORIG_TAR $TAR +mv $ORIG_DIR $DIR + +# remove build products +rm -rf $DIR/samples/target $DIR/maven/target + +# remove non-DSFG source... + +# The licensing of the original j2ee dtd/schemas is proprietary. Compare +# http://issues.apache.org/jira/browse/GERONIMO-2307 +# We'll include versions released under DSFG licenses +pushd $DIR/modules/ejb/src/xdoclet/modules/ejb/dd/resources +rm ejb11-jar.dtd ejb20-jar.dtd ejb-jar_2_1.xsd j2ee_1_4.xsd j2ee_web_services_client_1_1.xsd +# GPL +wget -O ejb11-jar.dtd http://java.sun.com/j2ee/dtds/ejb-jar_1_1.dtd +wget -O ejb20-jar.dtd http://java.sun.com/dtd/ejb-jar_2_0.dtd +wget http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd +wget http://java.sun.com/xml/ns/j2ee/j2ee_1_4.xsd +wget http://java.sun.com/xml/ns/j2ee/j2ee_web_services_client_1_1.xsd +popd + +pushd $DIR/modules/jdo/src/xdoclet/modules/jdo/resources +rm jdo_2_0.dtd +# Apache license +wget http://java.sun.com/dtd/jdo_2_0.dtd +popd + +pushd $DIR/modules/web/src/xdoclet/modules/web/resources +rm web-app_2_4.xsd web-jar-23.dtd jsp_2_0.xsd j2ee_web_services_client_1_1.xsd j2ee_1_4.xsd web-jsptaglibrary_1_1.dtd +# GPL +wget http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd +wget -O web-jar-23.dtd http://java.sun.com/dtd/web-app_2_3.dtd +wget http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd +wget http://java.sun.com/xml/ns/j2ee/j2ee_web_services_client_1_1.xsd +wget http://java.sun.com/xml/ns/j2ee/j2ee_1_4.xsd +wget http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd +popd + +pushd $DIR/modules/jsf/src/xdoclet/modules/jsf/resources +rm web-facesconfig_1_0.dtd +# GPL +wget http://java.sun.com/dtd/web-facesconfig_1_0.dtd +popd + +pushd $DIR/core/test/dtds +rm ejb11-jar.dtd ejb20-jar.dtd +# GPL +wget -O ejb11-jar.dtd http://java.sun.com/j2ee/dtds/ejb-jar_1_1.dtd +wget -O ejb20-jar.dtd http://java.sun.com/dtd/ejb-jar_2_0.dtd +popd + +# Remove modules for proprietary products that have no free replacements +rm -rf $DIR/modules/{sun,bea} + +# Remove files wich are not DFSG conformant +rm $DIR/modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb/resources/jonas-ejb-jar_2_3.dtd + +# Repackage source without binaries +tar czf $TAR --exclude '*.jar' $DIR +rm -rf $DIR Added: trunk/libxdoclet-java/debian/patches/clean_xdoclet_from_core.diff =================================================================== --- trunk/libxdoclet-java/debian/patches/clean_xdoclet_from_core.diff (rev 0) +++ trunk/libxdoclet-java/debian/patches/clean_xdoclet_from_core.diff 2009-07-10 01:37:41 UTC (rev 9071) @@ -0,0 +1,12 @@ +Index: libxdoclet-java-1.2.3/core/build.xml +=================================================================== +--- libxdoclet-java-1.2.3.orig/core/build.xml 2008-12-23 04:39:16.000000000 -0200 ++++ libxdoclet-java-1.2.3/core/build.xml 2008-12-23 04:40:17.000000000 -0200 +@@ -148,6 +148,7 @@ + <delete dir="${core.build.dir}"/> + <delete dir="${dist.src.dir}"/> + <delete dir="${dist.lib.dir}"/> ++ <ant dir="${modules.dir}/xdoclet" target="clean"/> + </target> + + <!-- =================================================================== --> Added: trunk/libxdoclet-java/debian/patches/dont_build_samples.diff =================================================================== --- trunk/libxdoclet-java/debian/patches/dont_build_samples.diff (rev 0) +++ trunk/libxdoclet-java/debian/patches/dont_build_samples.diff 2009-07-10 01:37:41 UTC (rev 9071) @@ -0,0 +1,13 @@ +Index: libxdoclet-java-1.2.3/build.xml +=================================================================== +--- libxdoclet-java-1.2.3.orig/build.xml 2008-12-24 13:07:52.000000000 -0200 ++++ libxdoclet-java-1.2.3/build.xml 2008-12-24 13:08:21.000000000 -0200 +@@ -94,7 +94,7 @@ + </jar> + </target> + +- <target name="dist" depends="core, modules, maven, docs, samples, l10n"> ++ <target name="dist" depends="core, modules, maven, docs, l10n"> + <echo>+--------------------------------------------------------------------+</echo> + <echo>| |</echo> + <echo>| E X E C U T I N G M A V E N T O G E N E R A T E D O C S |</echo> Added: trunk/libxdoclet-java/debian/patches/dont_build_xjavadoc_samples_doc.diff =================================================================== --- trunk/libxdoclet-java/debian/patches/dont_build_xjavadoc_samples_doc.diff (rev 0) +++ trunk/libxdoclet-java/debian/patches/dont_build_xjavadoc_samples_doc.diff 2009-07-10 01:37:41 UTC (rev 9071) @@ -0,0 +1,39 @@ +Index: libxdoclet-java-1.2.3/build.xml +=================================================================== +--- libxdoclet-java-1.2.3.orig/build.xml 2008-12-24 13:15:34.000000000 -0200 ++++ libxdoclet-java-1.2.3/build.xml 2008-12-24 13:22:32.000000000 -0200 +@@ -94,7 +94,7 @@ + </jar> + </target> + +- <target name="dist" depends="xjavadoc, core, modules, maven, docs, samples, l10n"> ++ <target name="dist" depends="core, modules, docs, l10n"> + <echo>+--------------------------------------------------------------------+</echo> + <echo>| |</echo> + <echo>| E X E C U T I N G M A V E N T O G E N E R A T E D O C S |</echo> +@@ -120,15 +120,6 @@ + <echo>| |</echo> + <echo>+--------------------------------------------------------------------+</echo> + +- <!-- Enable to see the elaborate CVS statistics. --> +- <!--<exec executable="${maven.command}"> +- <arg line="statcvs"/> +- </exec>--> +- +- <exec executable="${maven.command}"> +- <arg line="site"/> +- </exec> +- + <!-- Copy the IDEA Live Templates file --> + <copy file="${docs.src.dir}/ide/idea/xdoclet.xml" tofile="${docs.build.dir}/ide/idea/xdoclet.xml"/> + +@@ -137,9 +128,6 @@ + <fileset dir="${docs.src.dir}/dtds"/> + </copy> + +- <!-- Copy XJavaDoc to the dist.lib directory --> +- <copy file="${xjavadoc.jar}" todir="${dist.lib.dir}"/> +- + <!-- Copy the Jakarta Log4J and Commons Logging jar to the dist.lib directory --> + <copy file="${lib.dir}/commons-logging.jar" todir="${dist.lib.dir}"/> + <copy file="${lib.dir}/log4j.jar" todir="${dist.lib.dir}"/> Added: trunk/libxdoclet-java/debian/patches/remove_beautify.diff =================================================================== --- trunk/libxdoclet-java/debian/patches/remove_beautify.diff (rev 0) +++ trunk/libxdoclet-java/debian/patches/remove_beautify.diff 2009-07-10 01:37:41 UTC (rev 9071) @@ -0,0 +1,65 @@ +Index: libxdoclet-java-1.2.3/core/build.xml +=================================================================== +--- libxdoclet-java-1.2.3.orig/core/build.xml 2008-12-23 06:30:37.000000000 -0200 ++++ libxdoclet-java-1.2.3/core/build.xml 2008-12-23 06:31:01.000000000 -0200 +@@ -90,23 +90,9 @@ + </target> + + <!-- =================================================================== --> +- <!-- Beautify the code --> +- <!-- =================================================================== --> +- <target name="beautify" depends="prepare"> +- <taskdef name="pretty" classname="org.acm.seguin.ant.Pretty" +- classpath="${lib.dir}/prettyprinter.jar"/> +- +- <pretty settingsDir="${config.dir}" cvs="true" compileDir="${core.classes.dir}"> +- <fileset dir="${core.src.dir}"> +- <include name="**/*.java" /> +- </fileset> +- </pretty> +- </target> +- +- <!-- =================================================================== --> + <!-- Compiles the source code --> + <!-- =================================================================== --> +- <target name="compile" depends="beautify"> ++ <target name="compile" depends="prepare"> + <mkdir dir="${modules.all-src.dir}"/> + <copy todir="${modules.all-src.dir}"> + <fileset dir="${core.src.dir}"> +Index: libxdoclet-java-1.2.3/modules/modules-common.ent +=================================================================== +--- libxdoclet-java-1.2.3.orig/modules/modules-common.ent 2008-12-23 06:30:37.000000000 -0200 ++++ libxdoclet-java-1.2.3/modules/modules-common.ent 2008-12-23 06:32:38.000000000 -0200 +@@ -190,7 +190,7 @@ + <!-- =================================================================== --> + <!-- Compiles the source code --> + <!-- =================================================================== --> +- <target name="compile" depends="beautify" unless="module.jar.uptodate"> ++ <target name="compile" depends="init" unless="module.jar.uptodate"> + <mkdir dir="${module.classes.dir}"/> + <javac + destdir="${module.classes.dir}" +@@ -221,22 +221,6 @@ + </target> + + <!-- =================================================================== --> +- <!-- Beautify the code --> +- <!-- =================================================================== --> +- <target name="beautify" depends="init" unless="module.jar.uptodate"> +- +- <taskdef name="pretty2" classname="org.acm.seguin.ant.Pretty" +- classpath="${lib.dir}/prettyprinter.jar"/> +- +- <pretty2 settingsDir="${config.dir}" cvs="true" compileDir="${module.classes.dir}"> +- <fileset dir="${module.src.dir}"> +- <include name="**/*.java" /> +- </fileset> +- </pretty2> +- +- </target> +- +- <!-- =================================================================== --> + <!-- Generate tag documentation. --> + <!-- =================================================================== --> + <target name="docs" depends="init" Added: trunk/libxdoclet-java/debian/patches/series =================================================================== --- trunk/libxdoclet-java/debian/patches/series (rev 0) +++ trunk/libxdoclet-java/debian/patches/series 2009-07-10 01:37:41 UTC (rev 9071) @@ -0,0 +1,2 @@ +remove_beautify.diff +dont_build_xjavadoc_samples_doc.diff Added: trunk/libxdoclet-java/debian/rules =================================================================== --- trunk/libxdoclet-java/debian/rules (rev 0) +++ trunk/libxdoclet-java/debian/rules 2009-07-10 01:37:41 UTC (rev 9071) @@ -0,0 +1,37 @@ +#!/usr/bin/make -f + +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 + +JAVA_HOME := /usr/lib/jvm/java-6-openjdk +DEB_JARS := ant-nodeps ant-trax + +ALL_JARS = $(wildcard target/lib/xdoclet*.jar) +DEST_DIR = $(DEB_DESTDIR)usr/share/java + +clean:: + find lib -type l -exec rm '{}' \; + +pre-build:: + ln -sf /usr/share/java/bsf.jar lib/bsf.jar + ln -sf /usr/share/java/commons-collections.jar lib/commons-collections-2.0.jar + ln -sf /usr/share/java/commons-logging.jar lib/commons-logging.jar + ln -sf /usr/share/java/log4j-1.2.jar lib/log4j.jar + ln -sf /usr/share/java/junit.jar lib/junit.jar + ln -sf /usr/share/java/velocity.jar lib/velocity-1.3.1.jar + ln -sf /usr/share/java/xalan2.jar lib/xalan.jar + ln -sf /usr/share/java/xjavadoc.jar lib/xjavadoc-1.1.jar + ln -sf /usr/share/java/xml-apis.jar lib/xml-apis.jar + ln -sf /usr/share/java/mockobjects-core.jar lib/mockobjects.jar + +common-install-prehook-indep:: + for jar in $(ALL_JARS); do \ + BASENAME=`basename $$jar -$(DEB_UPSTREAM_VERSION).jar`; \ + FULLNAME=$$BASENAME-$(DEB_UPSTREAM_VERSION).jar; \ + install -m 644 -D $$jar $(DEST_DIR)/$$FULLNAME; \ + ln -s $$FULLNAME $(DEST_DIR)/$$BASENAME.jar; \ + done + +get-orig-source: + uscan --force-download Property changes on: trunk/libxdoclet-java/debian/rules ___________________________________________________________________ Added: svn:executable + * Added: trunk/libxdoclet-java/debian/watch =================================================================== --- trunk/libxdoclet-java/debian/watch (rev 0) +++ trunk/libxdoclet-java/debian/watch 2009-07-10 01:37:41 UTC (rev 9071) @@ -0,0 +1,3 @@ +version=3 + +http://sf.net/xdoclet/xdoclet-src-(.+)\.tgz debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
