[pkg-java] r3654 - trunk/modello/debian
paulcager-guest at alioth.debian.org
paulcager-guest at alioth.debian.org
Fri Jun 15 11:51:06 UTC 2007
Author: paulcager-guest
Date: 2007-06-15 11:51:06 +0000 (Fri, 15 Jun 2007)
New Revision: 3654
Modified:
trunk/modello/debian/build.properties
trunk/modello/debian/control
trunk/modello/debian/copyright
trunk/modello/debian/rules
Log:
Tidied "copyright" (dh_make format).
Pruned build-depends.
Modified: trunk/modello/debian/build.properties
===================================================================
--- trunk/modello/debian/build.properties 2007-06-14 22:46:14 UTC (rev 3653)
+++ trunk/modello/debian/build.properties 2007-06-15 11:51:06 UTC (rev 3654)
@@ -1,10 +1,7 @@
classpath.compile=\
- /usr/share/java/plexus-component-api.jar:\
/usr/share/java/plexus-container-default.jar:\
/usr/share/java/plexus-utils.jar:\
- /usr/share/java/libplexus-utils.jar:\
${basedir}/modello-core/build/modello-core-${version}.jar:\
- ${basedir}/modello-plugins/modello-plugin-xml/build/modello-plugin-xml-${version}.jar:\
- /usr/share/java/commons-lang.jar
+ ${basedir}/modello-plugins/modello-plugin-xml/build/modello-plugin-xml-${version}.jar
classpath.test=
javadoc.dir=build/javadoc
Modified: trunk/modello/debian/control
===================================================================
--- trunk/modello/debian/control 2007-06-14 22:46:14 UTC (rev 3653)
+++ trunk/modello/debian/control 2007-06-15 11:51:06 UTC (rev 3654)
@@ -6,28 +6,11 @@
Build-Depends-Indep: ant-optional,
classpath-doc,
java-gcj-compat-dev (>=1.0.65),
- libbcpg-java,
- libbcpg-java-doc,
- libbcprov-java,
- libbcprov-java-doc,
- libdom4j-java,
- libdom4j-java-doc,
-# libclassworlds-java,
-# libclassworlds-java-doc,
- libplexus-classworlds-java,
- libplexus-classworlds-java-doc,
-# libplexus-component-api-java,
-# libplexus-component-api-java-doc,
libplexus-container-default-java,
libplexus-container-default-java-doc,
-# libplexus-interactivity-api-java,
-# libplexus-interactivity-api-java-doc,
libplexus-utils-java,
libplexus-utils-java-doc,
- libxalan2-java,
- maven-ant-helper,
- velocity,
- velocity-doc
+ maven-ant-helper
Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
Standards-Version: 3.7.2
Modified: trunk/modello/debian/copyright
===================================================================
--- trunk/modello/debian/copyright 2007-06-14 22:46:14 UTC (rev 3653)
+++ trunk/modello/debian/copyright 2007-06-15 11:51:06 UTC (rev 3654)
@@ -8,37 +8,82 @@
modello was downloaded from
- https://svn.codehaus.org/modello/tags/modello-1.0-alpha-15/
+ https://svn.codehaus.org/modello/tags/modello-1.0-alpha-13/
Upstream Authors:
- Brett Porter brett at apache.org
- Jason van Zyl jason at maven.org
- Dan Diephouse dan at envoisolutions.com
- Emmanuel Evenisse emmanuel at venisse.net
- John Casey jdcasey at commonjava.org
- Trygve Laugstol trygvis at codehaus.org
- Arnaud Heritier aheritier at gmail.com
- Milos Kleint mkleint at codehaus.org
+ Brett Porter brett at apache.org
+ Jason van Zyl jason at maven.org
+ Dan Diephouse dan at envoisolutions.com
+ Emmanuel Evenisse emmanuel at venisse.net
+ John Casey jdcasey at commonjava.org
+ Trygve Laugstol trygvis at codehaus.org
+ Arnaud Heritier aheritier at gmail.com
+ Milos Kleint mkleint at codehaus.org
-COPYRIGHT NOTICES:
+Copyright:
- Copyright (c) 2007, Codehaus.org
+ Copyright (C) 2004 - 2007, Codehaus.org
+ Copyright (C) 1999 Intalio, Inc
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
+License:
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
+
+A number of files contain an additional license declaration:
+ Redistribution and use of this software and associated documentation
+ ("Software"), with or without modification, are permitted provided
+ that the following conditions are met:
+
+ 1. Redistributions of source code must retain copyright
+ statements and notices. Redistributions must also contain a
+ copy of this document.
+
+ 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 name "Exolab" must not be used to endorse or promote
+ products derived from this Software without prior written
+ permission of Intalio, Inc. For written permission,
+ please contact info at codehaus.org.
+
+ 4. Products derived from this Software may not be called "Exolab"
+ nor may "Exolab" appear in their names without prior written
+ permission of Intalio, Inc. Exolab is a registered
+ trademark of Intalio, Inc.
+
+ 5. Due credit should be given to the Exolab Project
+ (http://www.codehaus.org/).
+
+ THIS SOFTWARE IS PROVIDED BY INTALIO, INC. AND CONTRIBUTORS
+ ``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
+ INTALIO, INC. 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.
+
Modified: trunk/modello/debian/rules
===================================================================
--- trunk/modello/debian/rules 2007-06-14 22:46:14 UTC (rev 3653)
+++ trunk/modello/debian/rules 2007-06-15 11:51:06 UTC (rev 3654)
@@ -9,11 +9,9 @@
JAVA_HOME := /usr/lib/jvm/java-gcj
ANT_HOME := /usr/share/ant
DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar /usr/share/java/junit.jar
-
DEB_ANT_BUILD_TARGET := package javadoc
DEB_ANT_BUILDFILE := ./debian/build.xml
DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
-#DEB_ANT_INVOKE := ant -verbose -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
API_DOCS := build/javadoc
SVN := https://svn.codehaus.org/modello/tags/modello-$(VERSION)
More information about the pkg-java-commits
mailing list