Author: nthykier-guest
Date: 2010-02-06 12:52:36 +0000 (Sat, 06 Feb 2010)
New Revision: 11508
Added:
trunk/jetty5/debian/README.source
trunk/jetty5/debian/patches/z_fix_clean.patch
Removed:
trunk/jetty5/debian/patches/disable-jetty-plus.patch
trunk/jetty5/debian/patches/extras-skip-j2ee.patch
trunk/jetty5/debian/patches/jdk-1.2-src-encoding.patch
Modified:
trunk/jetty5/debian/ant.properties
trunk/jetty5/debian/changelog
trunk/jetty5/debian/control
trunk/jetty5/debian/copyright
trunk/jetty5/debian/rules
trunk/jetty5/debian/watch
Log:
Added new patch for the clean rules,
repacked source due to (possible) dfsg issues.
Updated copyright to list Apache 2.0 license
Added README.source to explain how to repack the source.
Removed obsolete packages.
Added: trunk/jetty5/debian/README.source
===================================================================
--- trunk/jetty5/debian/README.source (rev 0)
+++ trunk/jetty5/debian/README.source 2010-02-06 12:52:36 UTC (rev 11508)
@@ -0,0 +1,11 @@
+The source has been repacked to reduce it size and to remove a few
+possibly dfsg violated files.
+
+ To reconstruct the orig.tar.gz, download the jetty source
+ from upstream, remove all subdirs except the src/ tree.
+ Remove the following:
+ src/org/mortbay/servlet/CGI.java
+ src/javax/servlet/resources/*
+ Rebuild the tar.gz with the same top-folder.
+
+ -- Niels Thykier <ni...@thykier.net> Sat, 6 Feb 2010 13:51:00 +0100
Modified: trunk/jetty5/debian/ant.properties
===================================================================
--- trunk/jetty5/debian/ant.properties 2010-02-06 11:22:13 UTC (rev 11507)
+++ trunk/jetty5/debian/ant.properties 2010-02-06 12:52:36 UTC (rev 11508)
@@ -1,3 +1,3 @@
-jasper-runtime.jar=/usr/share/tomcat4/common/lib/jasper-runtime.jar
-jasper-compiler.jar=/usr/share/tomcat4/common/lib/jasper-compiler.jar
ext=/usr/share/java/
+# Will be put it in the manifest under "Built-By".
+user.name=Debian
Modified: trunk/jetty5/debian/changelog
===================================================================
--- trunk/jetty5/debian/changelog 2010-02-06 11:22:13 UTC (rev 11507)
+++ trunk/jetty5/debian/changelog 2010-02-06 12:52:36 UTC (rev 11508)
@@ -1,8 +1,13 @@
-jetty5 (5.1.15-1) UNRELEASED; urgency=low
+jetty5 (5.1.15+dfsg-1) UNRELEASED; urgency=low
* New upstream release.
* Renamed source package to jetty5.
* Removed README.Debian - no longer relevant.
+ * Bumped debhelper compat to 7.
+ * Updated debian/copyright
+ - This version uses the Apache-2.0 license.
+ * Bumped Standards-Version to 3.8.4.
+ - Added Homepage + Vcs-* fields.
-- Niels Thykier <ni...@thykier.net> Tue, 02 Feb 2010 17:25:48 +0100
Modified: trunk/jetty5/debian/control
===================================================================
--- trunk/jetty5/debian/control 2010-02-06 11:22:13 UTC (rev 11507)
+++ trunk/jetty5/debian/control 2010-02-06 12:52:36 UTC (rev 11508)
@@ -5,16 +5,20 @@
Uploaders: Niels Thykier <ni...@thykier.net>
Build-Depends: ant,
cdbs (>> 0.4.5.3),
- debhelper (>= 4.9.5),
+ debhelper (>= 7),
default-jdk,
+ javahelper,
junit,
libcommons-logging-java,
libmx4j-java,
liblog4j1.2-java,
libservlet2.4-java
Standards-Version: 3.7.2
+Homepage: http://jetty.codehaus.org/jetty/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jetty5
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jetty5
-Package: jetty
+Package: libmortbay-java
Architecture: all
Depends: default-jre-headless | java2-runtime-headless |
java5-runtime-headless | java6-runtime-headless,
Modified: trunk/jetty5/debian/copyright
===================================================================
--- trunk/jetty5/debian/copyright 2010-02-06 11:22:13 UTC (rev 11507)
+++ trunk/jetty5/debian/copyright 2010-02-06 12:52:36 UTC (rev 11508)
@@ -1,152 +1,11 @@
This package was debianized by Philipp Meier <me...@meisterbohne.de>
on Mon, 14 Jul 2003 13:21:36 +0200.
-It was downloaded from http://jetty.mortbay.com/
+It was downloaded from http://dist.codehaus.org/jetty/jetty-5.1.x/
Upstream Author: Mortbay Consulting
-Jetty License Revision: 3.7
+Jetty5 can be modified and distribuated under the terms of the
+Apache 2.0 license. On Debian Systems this license is available
+at /usr/share/common-licenses/Apache-2.0
-Preamble:
-
-The intent of this document is to state the conditions under which the
-Jetty Package may be copied, such that the Copyright Holder maintains some
-semblance of control over the development of the package, while giving
-the users of the package the right to use, distribute and make reasonable
-modifications to the Package in accordance with the goals and ideals of
-the Open Source concept as described at http://www.opensource.org
-
-It is the intent of this license to allow commercial usage of the Jetty
-package, so long as the source code is distributed or suitable visible
-credit given or other arrangements made with the copyright holders.
-
-Definitions:
-
- * "Jetty" refers to the collection of Java classes that are
- distributed as a HTTP server with servlet capabilities and
- associated utilities.
-
- * "Package" refers to the collection of files distributed by the
- Copyright Holder, and derivatives of that collection of files
- created through textual modification.
-
- * "Standard Version" refers to such a Package if it has not been
- modified, or has been modified in accordance with the wishes of
- the Copyright Holder.
-
- * "Copyright Holder" is whoever is named in the copyright or
- copyrights for the package. Mort Bay Consulting
- Pty. Ltd. (Australia) is the "Copyright Holder" for the Jetty
- package.
-
- * "You" is you, if you're thinking about copying or distributing
- this Package.
-
- * "Reasonable copying fee" is whatever you can justify on the
- basis of media cost, duplication charges, time of people involved,
- and so on. (You will not be required to justify it to the
- Copyright Holder, but only to the computing community at large
- as a market that must bear the fee.)
-
- * "Freely Available" means that no fee is charged for the item
- itself, though there may be fees involved in handling the item.
- It also means that recipients of the item may redistribute it
- under the same conditions they received it.
-
-0. The Jetty Package is Copyright (c) Mort Bay Consulting Pty. Ltd.
-(Australia) and others. Individual files in this package may contain
-additional copyright notices. The javax.servlet packages are copyright
-Sun Microsystems Inc.
-
-1. The Standard Version of the Jetty package is available from
-http://jetty.mortbay.org.
-
-2. You may make and distribute verbatim copies of the source form of
-the Standard Version of this Package without restriction, provided that
-you include this license and all of the original copyright notices and
-associated disclaimers.
-
-3. You may make and distribute verbatim copies of the compiled form of
-the Standard Version of this Package without restriction, provided that
-you include this license.
-
-4. You may apply bug fixes, portability fixes and other modifications
-derived from the Public Domain or from the Copyright Holder. A Package
-modified in such a way shall still be considered the Standard Version.
-
-5. You may otherwise modify your copy of this Package in any way, provided
-that you insert a prominent notice in each changed file stating how and
-when you changed that file, and provided that you do at least ONE of
-the following:
-
- a) Place your modifications in the Public Domain or otherwise make
- them Freely Available, such as by posting said modifications to Usenet
- or an equivalent medium, or placing the modifications on a major
- archive site such as ftp.uu.net, or by allowing the Copyright Holder
- to include your modifications in the Standard Version of the Package.
-
- b) Use the modified Package only within your corporation or
- organization.
-
- c) Rename any non-standard classes so the names do not conflict with
- standard classes, which must also be provided, and provide a separate
- manual page for each non-standard class that clearly documents how
- it differs from the Standard Version.
-
- d) Make other arrangements with the Copyright Holder.
-
-6. You may distribute modifications or subsets of this Package in source
-code or compiled form, provided that you do at least ONE of the following:
-
- a) Distribute this license and all original copyright messages,
- together with instructions (in the about dialog, manual page or
- equivalent) on where to get the complete Standard Version.
-
- b) Accompany the distribution with the machine-readable source
- of the Package with your modifications. The modified package must
- include this license and all of the original copyright notices and
- associated disclaimers, together with instructions on where to get
- the complete Standard Version.
-
- c) Make other arrangements with the Copyright Holder.
-
-7. You may charge a reasonable copying fee for any distribution of this
-Package. You may charge any fee you choose for support of this Package.
-You may not charge a fee for this Package itself. However, you may
-distribute this Package in aggregate with other (possibly commercial)
-programs as part of a larger (possibly commercial) software distribution
-provided that you meet the other distribution requirements of this
-license.
-
-8. Input to or the output produced from the programs of this Package do
-not automatically fall under the copyright of this Package, but belong
-to whomever generated them, and may be sold commercially, and may be
-aggregated with this Package.
-
-9. Any program subroutines supplied by you and linked into this Package
-shall not be considered part of this Package.
-
-10. The name of the Copyright Holder may not be used to endorse or
-promote products derived from this software without specific prior
-written permission.
-
-11. This license may change with each release of a Standard Version of
-the Package. You may choose to use the license associated with version
-you are using or the license of the latest Standard Version.
-
-12. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-13. If any superior law implies a warranty, the sole remedy under such
-shall be , at the Copyright Holders option either a) return of any price
-paid or b) use or reasonable endeavours to repair or replace the software.
-
-14. This license shall be read under the laws of Australia.
-
- The End
-
-This license was derived from the Artistic license published on
-http://www.opensource.com
-
-
Deleted: trunk/jetty5/debian/patches/disable-jetty-plus.patch
===================================================================
--- trunk/jetty5/debian/patches/disable-jetty-plus.patch 2010-02-06
11:22:13 UTC (rev 11507)
+++ trunk/jetty5/debian/patches/disable-jetty-plus.patch 2010-02-06
12:52:36 UTC (rev 11508)
@@ -1,34 +0,0 @@
---- extra/plus/build.xml
-+++ extra/plus/build.xml
-@@ -132,6 +132,7 @@
- <include name="**/*.properties" />
- </fileset>
- </copy>
-+ <!--
- <javac srcdir="${src}"
- destdir="${classes}"
- debug="true"
-@@ -142,6 +143,7 @@
- </classpath>
- <include name="**/*.java"/>
- </javac>
-+ -->
- </target>
-
-
-@@ -197,6 +199,7 @@
- if="jaas.demo.available"
- description="JAAS demo webapp">
- <mkdir dir="${jaas.webapp.classes}"/>
-+ <!--
- <javac srcdir="${demo.src}"
- destdir="${jaas.webapp.classes}"
- debug="${javac.debug}"
-@@ -208,6 +211,7 @@
- </classpath>
- <include name="**/jaas/**.java" />
- </javac>
-+ -->
- </target>
-
-
Deleted: trunk/jetty5/debian/patches/extras-skip-j2ee.patch
===================================================================
--- trunk/jetty5/debian/patches/extras-skip-j2ee.patch 2010-02-06 11:22:13 UTC
(rev 11507)
+++ trunk/jetty5/debian/patches/extras-skip-j2ee.patch 2010-02-06 12:52:36 UTC
(rev 11508)
@@ -1,11 +0,0 @@
---- ../jetty-5.1.4.orig/extra/build.xml 2005-01-16 04:39:30.000000000
+0100
-+++ ./extra/build.xml 2005-06-30 14:52:33.787766544 +0200
-@@ -31,7 +31,7 @@
- <!-- all
-->
- <!-- ====================================================================
-->
- <target name="all"
--
depends="do.plus,do.loadbalancer,do.ftp,do.jdk1.2,do.j2ee,do.jsr77,test"
-+ depends="do.plus,do.loadbalancer,do.ftp,do.jdk1.2,do.jsr77"
- description="Build all extras">
- </target>
-
Deleted: trunk/jetty5/debian/patches/jdk-1.2-src-encoding.patch
===================================================================
--- trunk/jetty5/debian/patches/jdk-1.2-src-encoding.patch 2010-02-06
11:22:13 UTC (rev 11507)
+++ trunk/jetty5/debian/patches/jdk-1.2-src-encoding.patch 2010-02-06
12:52:36 UTC (rev 11508)
@@ -1,12 +0,0 @@
---- extra/jdk1.2/build.xml.orig 2007-10-05 07:31:53.000000000 +0200
-+++ extra/jdk1.2/build.xml 2007-10-05 07:32:17.000000000 +0200
-@@ -127,7 +127,8 @@
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- deprecation="${javac.deprecation}"
-- target="1.2"
-+ source="1.3"
-+ target="1.3"
- >
- <classpath>
- <path refid="extpath"/>
Added: trunk/jetty5/debian/patches/z_fix_clean.patch
===================================================================
--- trunk/jetty5/debian/patches/z_fix_clean.patch
(rev 0)
+++ trunk/jetty5/debian/patches/z_fix_clean.patch 2010-02-06 12:52:36 UTC
(rev 11508)
@@ -0,0 +1,25 @@
+--- a/build.xml 2010-02-06 12:47:46.333306230 +0100
++++ b/build.xml 2010-02-06 12:48:16.373283013 +0100
+@@ -128,8 +128,8 @@
+ <exclude name=".keepme"/>
+ </fileset>
+ </delete>
+- <ant dir="${test}" antfile="${test}/build.xml" inheritAll="false"
target="tidy"/>
+- <ant dir="${extra}" antfile="${extra}/build.xml" inheritAll="false"
target="tidy"/>
++ <!--ant dir="${test}" antfile="${test}/build.xml" inheritAll="false"
target="tidy"/>
++ <ant dir="${extra}" antfile="${extra}/build.xml" inheritAll="false"
target="tidy"/-->
+ </target>
+
+
+@@ -154,9 +154,9 @@
+ <include name="*.dtd"/>
+ </fileset>
+ </delete>
+- <ant antfile="${test}/build.xml" inheritAll="false" target="clean"/>
++ <!--ant antfile="${test}/build.xml" inheritAll="false" target="clean"/>
+ <ant dir="${extra}" antfile="${extra}/build.xml" inheritAll="false"
target="clean"/>
+- <ant dir="${webapps}/template" antfile="${webapps}/template/build.xml"
inheritAll="false" target="clean"/>
++ <ant dir="${webapps}/template" antfile="${webapps}/template/build.xml"
inheritAll="false" target="clean"/-->
+ </target>
+
+
Modified: trunk/jetty5/debian/rules
===================================================================
--- trunk/jetty5/debian/rules 2010-02-06 11:22:13 UTC (rev 11507)
+++ trunk/jetty5/debian/rules 2010-02-06 12:52:36 UTC (rev 11508)
@@ -6,6 +6,10 @@
include /usr/share/cdbs/1/class/ant.mk
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := mx4j log4j-1.2 log4j junit commons-logging
DEB_ANT_INSTALL_TARGET :=
DEB_ANT_BUILD_TARGET := prepare jetty.jar
+
+
+install/libmortbay-java::
+ #jar umf debian/osgi.MF build/jasper.jar
+ jh_installlibs -p$(cdbs_curpkg) --version-strip='\+dfsg'
lib/org.mortbay.jetty.jar
Modified: trunk/jetty5/debian/watch
===================================================================
--- trunk/jetty5/debian/watch 2010-02-06 11:22:13 UTC (rev 11507)
+++ trunk/jetty5/debian/watch 2010-02-06 12:52:36 UTC (rev 11508)
@@ -1,2 +1,3 @@
version=3
+opts=dversionmangle=s/\+dfsg$// \
http://dist.codehaus.org/jetty/jetty-5.1.x/ jetty-(.*)\.tgz debian uupdate
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
