[pkg-java] r11512 - in trunk/jetty5/debian: . patches source

Niels Thykier nthykier-guest at alioth.debian.org
Sat Feb 6 15:00:37 UTC 2010 

Author: nthykier-guest
Date: 2010-02-06 15:00:22 +0000 (Sat, 06 Feb 2010)
New Revision: 11512

Added:
   trunk/jetty5/debian/patches/series
   trunk/jetty5/debian/patches/z_fix_build-deps.patch
   trunk/jetty5/debian/source/
   trunk/jetty5/debian/source/format
Removed:
   trunk/jetty5/debian/patches/build-javadoc-src-encoding.patch
   trunk/jetty5/debian/patches/z_fix_clean.patch
Modified:
   trunk/jetty5/debian/README.source
   trunk/jetty5/debian/changelog
   trunk/jetty5/debian/control
   trunk/jetty5/debian/copyright
   trunk/jetty5/debian/patches/remove-import-from-sun.patch
   trunk/jetty5/debian/patches/sunjsse-disable.patch
   trunk/jetty5/debian/rules
Log:
Updated copyright to include files not under Apache 2.0
Covnert to 3.0 (quilt) source format
Remove obsolete patches
Change section to java.
Updated README.source


Modified: trunk/jetty5/debian/README.source
===================================================================
--- trunk/jetty5/debian/README.source	2010-02-06 14:28:02 UTC (rev 11511)
+++ trunk/jetty5/debian/README.source	2010-02-06 15:00:22 UTC (rev 11512)
@@ -5,7 +5,7 @@
    from upstream, remove all subdirs except the src/ tree.
    Remove the following:
        src/org/mortbay/servlet/CGI.java
-       src/javax/servlet/resources/*
+       src/javax/ (and anything below it)
    Rebuild the tar.gz with the same top-folder.
 
  -- Niels Thykier <niels at thykier.net>  Sat, 6 Feb 2010 13:51:00 +0100

Modified: trunk/jetty5/debian/changelog
===================================================================
--- trunk/jetty5/debian/changelog	2010-02-06 14:28:02 UTC (rev 11511)
+++ trunk/jetty5/debian/changelog	2010-02-06 15:00:22 UTC (rev 11512)
@@ -8,6 +8,8 @@
     - This version uses the Apache-2.0 license.
   * Bumped Standards-Version to 3.8.4.
     - Added Homepage + Vcs-* fields.
+    - Change section to java.
+  * Converted source to 3.0 (quilt).
 
  -- Niels Thykier <niels at thykier.net>  Tue, 02 Feb 2010 17:25:48 +0100
 

Modified: trunk/jetty5/debian/control
===================================================================
--- trunk/jetty5/debian/control	2010-02-06 14:28:02 UTC (rev 11511)
+++ trunk/jetty5/debian/control	2010-02-06 15:00:22 UTC (rev 11512)
@@ -1,5 +1,5 @@
 Source: jetty5
-Section: web
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Niels Thykier <niels at thykier.net>
@@ -13,7 +13,7 @@
                libmx4j-java,
                liblog4j1.2-java,
                libservlet2.4-java
-Standards-Version: 3.7.2
+Standards-Version: 3.8.4
 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
@@ -25,7 +25,8 @@
           libcommons-logging-java,
           libmx4j-java,
           liblog4j1.2-java,
-          libservlet2.4-java
+          libservlet2.4-java,
+          ${misc:Depends}
 Description: Java servlet engine and webserver
  Jetty is an Open Source HTTP Servlet Server written in 100% Java.
  It is designed to be light weight, high performance, embeddable,

Modified: trunk/jetty5/debian/copyright
===================================================================
--- trunk/jetty5/debian/copyright	2010-02-06 14:28:02 UTC (rev 11511)
+++ trunk/jetty5/debian/copyright	2010-02-06 15:00:22 UTC (rev 11512)
@@ -5,7 +5,21 @@
 
 Upstream Author: Mortbay Consulting
 
-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
+File: src/org/mortbay/http/handler/HTAccessHandler.java
+Copyright: 2001 Deville Daniel
+File: src/org/mortbay/http/handler/IPAccessHandler.java
+Copyright: 2002 Gosta Jonasson gosta at kth.se
+File: src/org/mortbay/util/UnixCrypt.java
+Copyright: 1996 Aki Yoshida
+License:
+	   Permission to use, copy, modify and distribute this software
+	   for non-commercial or commercial purposes and without fee is
+	   hereby granted provided that this copyright notice appears in
+	   all copies.	   
 
+Files: *
+Copyright: 1996-2004 Mort Bay Consulting (Australia) Pty. Ltd.
+License: Apache-2.0
+
+On Debian systems, the complete text of the Apache 2.0
+License can be found in `/usr/share/common-licenses/Apache-2.0'.

Deleted: trunk/jetty5/debian/patches/build-javadoc-src-encoding.patch
===================================================================
--- trunk/jetty5/debian/patches/build-javadoc-src-encoding.patch	2010-02-06 14:28:02 UTC (rev 11511)
+++ trunk/jetty5/debian/patches/build-javadoc-src-encoding.patch	2010-02-06 15:00:22 UTC (rev 11512)
@@ -1,10 +0,0 @@
---- a/build.xml	2005-04-07 12:53:50.000000000 +0200
-+++ b/build.xml	2005-06-30 16:33:27.089524800 +0200
-@@ -372,6 +373,7 @@
-              public="true"
-              windowtitle="${ant.project.name} ${RELEASE.MAJOR.MINOR} API"
-              doctitle="${ant.project.name} ${RELEASE.MAJOR.MINOR}"
-+	     encoding="${javac.encoding}"
-              bottom="Copyright &amp;copy; 2004 Mortbay Consulting Pty. Ltd. All Rights Reserved.">
-        <classpath>
-          <path refid="classpath"/> 

Modified: trunk/jetty5/debian/patches/remove-import-from-sun.patch
===================================================================
--- trunk/jetty5/debian/patches/remove-import-from-sun.patch	2010-02-06 14:28:02 UTC (rev 11511)
+++ trunk/jetty5/debian/patches/remove-import-from-sun.patch	2010-02-06 15:00:22 UTC (rev 11512)
@@ -1,5 +1,7 @@
---- a/src/org/mortbay/servlet/PostFileFilter.java	2005-12-13 15:25:19.726692025 +0100
-+++ b/src/org/mortbay/servlet/PostFileFilter.java	2005-12-13 15:25:07.438317184 +0100
+Index: jetty5-5.1.15+dfsg/src/org/mortbay/servlet/PostFileFilter.java
+===================================================================
+--- jetty5-5.1.15+dfsg.orig/src/org/mortbay/servlet/PostFileFilter.java	2010-02-06 15:18:56.102282896 +0100
++++ jetty5-5.1.15+dfsg/src/org/mortbay/servlet/PostFileFilter.java	2010-02-06 15:21:11.678309353 +0100
 @@ -30,7 +30,7 @@
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;

Added: trunk/jetty5/debian/patches/series
===================================================================
--- trunk/jetty5/debian/patches/series	                        (rev 0)
+++ trunk/jetty5/debian/patches/series	2010-02-06 15:00:22 UTC (rev 11512)
@@ -0,0 +1,3 @@
+remove-import-from-sun.patch
+sunjsse-disable.patch
+z_fix_build-deps.patch

Modified: trunk/jetty5/debian/patches/sunjsse-disable.patch
===================================================================
--- trunk/jetty5/debian/patches/sunjsse-disable.patch	2010-02-06 14:28:02 UTC (rev 11511)
+++ trunk/jetty5/debian/patches/sunjsse-disable.patch	2010-02-06 15:00:22 UTC (rev 11512)
@@ -1,5 +1,7 @@
---- a/build.xml	2005-08-27 12:24:26.717664274 +0200
-+++ b/build.xml	2005-08-27 12:24:11.106455215 +0200
+Index: jetty5-5.1.15+dfsg/build.xml
+===================================================================
+--- jetty5-5.1.15+dfsg.orig/build.xml	2010-02-06 15:21:04.086282627 +0100
++++ jetty5-5.1.15+dfsg/build.xml	2010-02-06 15:21:16.170309073 +0100
 @@ -87,6 +87,12 @@
      />
      <echo message="JMX available=${jmx.available}" level="info"/>
@@ -13,7 +15,7 @@
    </target>
    
    <!-- ==================================================================== -->
-@@ -181,7 +188,8 @@
+@@ -183,7 +189,8 @@
           <pathelement path="${classes}"/>
         </classpath>
         <include name="**/*.java"/>

Added: trunk/jetty5/debian/patches/z_fix_build-deps.patch
===================================================================
--- trunk/jetty5/debian/patches/z_fix_build-deps.patch	                        (rev 0)
+++ trunk/jetty5/debian/patches/z_fix_build-deps.patch	2010-02-06 15:00:22 UTC (rev 11512)
@@ -0,0 +1,43 @@
+--- a/build.xml	2010-02-06 15:43:51.081305314 +0100
++++ b/build.xml	2010-02-06 15:44:37.481283838 +0100
+@@ -104,7 +104,7 @@
+     <mkdir dir="${etc}/dtd" />
+     <copy todir="${etc}/dtd">
+       <fileset dir="${src}/org/mortbay/xml/" includes="*.dtd"/>
+-      <fileset dir="${src}/javax/servlet/resources/" includes="*.dtd"/>
++      <!--fileset dir="${src}/javax/servlet/resources/" includes="*.dtd"/-->
+     </copy>  
+     <copy todir="${demo.webapps}/root">
+       <fileset dir="${etc}/dtd" includes="*.dtd"/>
+@@ -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>
+ 
+ 
+@@ -243,7 +243,7 @@
+ 
+ 
+   <!-- ==================================================================== -->
+-  <target name="jetty.jar" depends="classes,servlet.jar" >
++  <target name="jetty.jar" depends="classes" >
+     <jar jarfile="${jetty.jar}">
+        <manifest>    
+          <attribute name="Sealed" value="${jar.sealed}"/>

Deleted: trunk/jetty5/debian/patches/z_fix_clean.patch
===================================================================
--- trunk/jetty5/debian/patches/z_fix_clean.patch	2010-02-06 14:28:02 UTC (rev 11511)
+++ trunk/jetty5/debian/patches/z_fix_clean.patch	2010-02-06 15:00:22 UTC (rev 11512)
@@ -1,25 +0,0 @@
---- 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 14:28:02 UTC (rev 11511)
+++ trunk/jetty5/debian/rules	2010-02-06 15:00:22 UTC (rev 11512)
@@ -2,7 +2,6 @@
 # debian/rules for Jetty (uses CDBS)
 
 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		:= /usr/lib/jvm/default-java
@@ -14,3 +13,6 @@
 	# Add OSGi metadata
 	jar umf debian/osgi.MF lib/org.mortbay.jetty.jar
 	jh_installlibs -p$(cdbs_curpkg) --version-strip='\+dfsg' lib/org.mortbay.jetty.jar
+
+clean::
+	rm -fr classes demo etc javadoc lib

Added: trunk/jetty5/debian/source/format
===================================================================
--- trunk/jetty5/debian/source/format	                        (rev 0)
+++ trunk/jetty5/debian/source/format	2010-02-06 15:00:22 UTC (rev 11512)
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the pkg-java-commits mailing list