Author: ludovicc-guest Date: 2009-07-03 00:03:27 +0000 (Fri, 03 Jul 2009) New Revision: 8825
Added: trunk/nekohtml/debian/ trunk/nekohtml/debian/README.Debian trunk/nekohtml/debian/changelog trunk/nekohtml/debian/compat trunk/nekohtml/debian/control trunk/nekohtml/debian/copyright trunk/nekohtml/debian/libnekohtml-java-doc.doc-base trunk/nekohtml/debian/libnekohtml-java.doc-base trunk/nekohtml/debian/libnekohtml-java.poms trunk/nekohtml/debian/nekohtml-xni.pom trunk/nekohtml/debian/orig-tar.sh trunk/nekohtml/debian/patches/ trunk/nekohtml/debian/patches/build.diff trunk/nekohtml/debian/patches/series trunk/nekohtml/debian/rules trunk/nekohtml/debian/watch Removed: trunk/nekohtml/nekohtml/ Log: * New version * Remove upstream sources from pkg-java for nekohtml Added: trunk/nekohtml/debian/README.Debian =================================================================== --- trunk/nekohtml/debian/README.Debian (rev 0) +++ trunk/nekohtml/debian/README.Debian 2009-07-03 00:03:27 UTC (rev 8825) @@ -0,0 +1,7 @@ +NekoHTML for Debian +------------------- + +The 'lib' directory was removed from the upstream +sources in order to make them DFSG compliant. + + -- Ludovic Claude <[email protected]> Thu, 29 Apr 2009 15:47:02 +0100 Added: trunk/nekohtml/debian/changelog =================================================================== --- trunk/nekohtml/debian/changelog (rev 0) +++ trunk/nekohtml/debian/changelog 2009-07-03 00:03:27 UTC (rev 8825) @@ -0,0 +1,31 @@ +nekohtml (1.9.12-1) unstable; urgency=low + + * New upstream version + * Remove the runtimes from Depends: as it's a library + * Change section to java, bump up Standards-Version to 3.8.1 + * Add Homepage and Vcs-* properties + * Split the package into a pure binary and a documentation package, + put the main docs in the binary package, and the api docs in the + doc package + * Update the copyright to follow the new proposal format, and remove + full text of Apache license to remove Lintian warnings + * 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 <[email protected]> Wed, 29 Apr 2009 19:33:43 +0100 + +nekohtml (0.9.5+dfsg-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add stubs for two missing XMLLocator methods; fixes FTBFS. + (Closes: #397697) + + -- Steinar H. Gunderson <[email protected]> Thu, 16 Nov 2006 00:02:27 +0100 + +nekohtml (0.9.5+dfsg-1) unstable; urgency=low + + * Initial release. (Closes: #382995) + + -- Marcus Better <[email protected]> Fri, 29 Sep 2006 11:37:54 +0200 Added: trunk/nekohtml/debian/compat =================================================================== --- trunk/nekohtml/debian/compat (rev 0) +++ trunk/nekohtml/debian/compat 2009-07-03 00:03:27 UTC (rev 8825) @@ -0,0 +1 @@ +5 Added: trunk/nekohtml/debian/control =================================================================== --- trunk/nekohtml/debian/control (rev 0) +++ trunk/nekohtml/debian/control 2009-07-03 00:03:27 UTC (rev 8825) @@ -0,0 +1,41 @@ +Source: nekohtml +Section: java +Priority: optional +Maintainer: Debian Java maintainers <[email protected]> +Uploaders: Marcus Better <[email protected]> +Build-Depends: debhelper (>= 6.0.0), cdbs, default-jdk-builddep, quilt +Build-Depends-Indep: maven-repo-helper, ant, libxerces2-java (>= 2.9.1), libxalan2-java +Standards-Version: 3.8.1 +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/nekohtml +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/nekohtml/ +Homepage: http://nekohtml.sourceforge.net/ + +Package: libnekohtml-java +Architecture: all +Depends: ${misc:Depends}, libxerces2-java (>= 2.9.1) +Suggests: libnekohtml-java-doc +Description: HTML parser for Java + This is a simple HTML scanner and tag balancer that enables + application programmers to parse HTML documents and access the + information using standard XML interfaces. The parser can scan HTML + files and "fix up" many common mistakes that human (and computer) + authors make in writing HTML documents. NekoHTML adds missing parent + elements; automatically closes elements with optional end tags; and + can handle mismatched in-line element tags. + . + +Package: libnekohtml-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: libnekohtml-java +Description: HTML parser for Java + This is a simple HTML scanner and tag balancer that enables + application programmers to parse HTML documents and access the + information using standard XML interfaces. The parser can scan HTML + files and "fix up" many common mistakes that human (and computer) + authors make in writing HTML documents. NekoHTML adds missing parent + elements; automatically closes elements with optional end tags; and + can handle mismatched in-line element tags. + . + This package provides the API documentation for NekoHTML. Added: trunk/nekohtml/debian/copyright =================================================================== --- trunk/nekohtml/debian/copyright (rev 0) +++ trunk/nekohtml/debian/copyright 2009-07-03 00:03:27 UTC (rev 8825) @@ -0,0 +1,67 @@ +Format-Specification: http://dep.debian.net/deps/dep5/ +Name: NekoHTML +Maintainer: CyberNeko +Source: http://nekohtml.sourceforge.net/ + +Files: * +Copyright: 2002-2008, Andy Clark +License: other + The CyberNeko Software License, Version 1.0 (BSD-like) + . + (C) Copyright 2002-2005, Andy Clark. 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 Andy Clark." + Alternately, this acknowledgment may appear in the software itself, + if and wherever such third-party acknowledgments normally appear. + . + 4. The names "CyberNeko" and "NekoHTML" must not be used to endorse + or promote products derived from this software without prior + written permission. For written permission, please contact + [email protected]. + . + 5. Products derived from this software may not be called "CyberNeko", + nor may "CyberNeko" appear in their name, without prior written + permission of the author. + . + 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 AUTHOR OR OTHER 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. + +Files: src/org/cyberneko/html/ObjectFactory.java +Copyright: 2001-2004 The Apache Software Foundation +License: Apache-2.0 + +Files: src/org/cyberneko/html/SecuritySupport.java, src/org/cyberneko/html/SecuritySupport12.java +Copyright: 2002-2004 The Apache Software Foundation +License: Apache-2.0 + +Files: debian/* +Copyright: 2006, Marcus Better <[email protected]> +License: Apache-2.0 + +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' + Added: trunk/nekohtml/debian/libnekohtml-java-doc.doc-base =================================================================== --- trunk/nekohtml/debian/libnekohtml-java-doc.doc-base (rev 0) +++ trunk/nekohtml/debian/libnekohtml-java-doc.doc-base 2009-07-03 00:03:27 UTC (rev 8825) @@ -0,0 +1,8 @@ +Document: nekohtml-api +Title: NekoHTML API documentation +Abstract: JavaDoc documentation for NekoHTML. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libnekohtml-java/api/index.html +Files: /usr/share/doc/libnekohtml-java/api/* Added: trunk/nekohtml/debian/libnekohtml-java.doc-base =================================================================== --- trunk/nekohtml/debian/libnekohtml-java.doc-base (rev 0) +++ trunk/nekohtml/debian/libnekohtml-java.doc-base 2009-07-03 00:03:27 UTC (rev 8825) @@ -0,0 +1,8 @@ +Document: nekohtml-doc +Title: NekoHTML documentation +Abstract: Documentation for the NekoHTML parser. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libnekohtml-java/doc/index.html +Files: /usr/share/doc/libnekohtml-java/doc/*.html Added: trunk/nekohtml/debian/libnekohtml-java.poms =================================================================== --- trunk/nekohtml/debian/libnekohtml-java.poms (rev 0) +++ trunk/nekohtml/debian/libnekohtml-java.poms 2009-07-03 00:03:27 UTC (rev 8825) @@ -0,0 +1,2 @@ +pom.xml --no-parent +debian/nekohtml-xni.pom --no-parent Added: trunk/nekohtml/debian/nekohtml-xni.pom =================================================================== --- trunk/nekohtml/debian/nekohtml-xni.pom (rev 0) +++ trunk/nekohtml/debian/nekohtml-xni.pom 2009-07-03 00:03:27 UTC (rev 8825) @@ -0,0 +1,6 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>nekohtml</groupId> + <artifactId>nekohtmlXni</artifactId> + <version>1.9.12</version> +</project> Added: trunk/nekohtml/debian/orig-tar.sh =================================================================== --- trunk/nekohtml/debian/orig-tar.sh (rev 0) +++ trunk/nekohtml/debian/orig-tar.sh 2009-07-03 00:03:27 UTC (rev 8825) @@ -0,0 +1,18 @@ +#!/bin/sh -e + +VERSION=$2 +TAR=../nekohtml_$VERSION.orig.tar.gz +DIR=nekohtml-$VERSION +TAG=nekohtml-$2 + +svn export https://nekohtml.svn.sourceforge.net/svnroot/nekohtml/branches/$TAG $DIR +rm -r $DIR/lib +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/nekohtml/debian/orig-tar.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/nekohtml/debian/patches/build.diff =================================================================== --- trunk/nekohtml/debian/patches/build.diff (rev 0) +++ trunk/nekohtml/debian/patches/build.diff 2009-07-03 00:03:27 UTC (rev 8825) @@ -0,0 +1,41 @@ +--- a/build.xml ++++ b/build.xml +@@ -26,7 +26,7 @@ + <property name='build.classes.dir' value='${build.dir}/classes' /> + <property name='build.test-classes.dir' value='${build.dir}/test-classes' /> + <property name='build.src.dir' value='${build.dir}/src' /> +- <property name='build.doc.dir' value='${build.dir}/doc/javadoc' /> ++ <property name='build.doc.dir' value='${build.dir}/doc/api' /> + <property name='build.data.dir' value='${build.dir}/data/output' /> + <property name='build.lib.dir' value='${build.dir}/lib' /> + +@@ -72,7 +72,7 @@ + source='${compile.source}' target='${compile.target}' + includeAntRuntime='false'> + <classpath> +- <fileset dir='${lib.dir}/xerc...@{xercesversion}' includes='*.jar' /> ++ <fileset dir='/usr/share/java' includes='xercesImpl.jar' /> + </classpath> + <src path='${src.dir}' /> + <src path='${build.src.dir}' /> +@@ -83,7 +83,7 @@ + source='${compile.source}' target='${compile.target}' + includeAntRuntime='false'> + <classpath> +- <fileset dir='${lib.dir}/xerc...@{xercesversion}' includes='*.jar' /> ++ <fileset dir='/usr/share/java' includes='xercesImpl.jar' /> + </classpath> + <src path='${src.dir}' /> + <src path='${build.src.dir}' /> +@@ -97,11 +97,6 @@ + unless="compile.skip"> + <mkdir dir="${build.classes.dir}"/> + +- <compileWith xercesVersion="2.0.2" bridge="2_0"/> +- <compileWith xercesVersion="2.1.0" bridge="2_1"/> +- <compileWith xercesVersion="2.2.1" bridge="2_2"/> +- <compileWith xercesVersion="2.3.0" bridge="2_3"/> +- <compileWith xercesVersion="2.8.1" bridge="2_3"/> + <compileWith xercesVersion="2.9.1" bridge="2_3"/> + + <copy todir="${build.classes.dir}"> Added: trunk/nekohtml/debian/patches/series =================================================================== --- trunk/nekohtml/debian/patches/series (rev 0) +++ trunk/nekohtml/debian/patches/series 2009-07-03 00:03:27 UTC (rev 8825) @@ -0,0 +1 @@ +build.diff Added: trunk/nekohtml/debian/rules =================================================================== --- trunk/nekohtml/debian/rules (rev 0) +++ trunk/nekohtml/debian/rules 2009-07-03 00:03:27 UTC (rev 8825) @@ -0,0 +1,30 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/ant.mk + +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := xml-apis xalan2 xercesImpl +DEB_ANT_BUILD_TARGET := jar jar-xni doc +DEB_ANT_BUILDFILE := build.xml +DEB_ANT_ARGS := -Dname=$(PACKAGE) -Dversion=$(VERSION) +API_DOCS := build/doc/api + +get-orig-source: + uscan --download-version $(VERSION) --force-download --rename + +binary-post-install/lib$(PACKAGE)-java:: + dh_install -plib$(PACKAGE)-java doc usr/share/doc/lib$(PACKAGE)-java + mh_installpoms -plib$(PACKAGE)-java + mh_installjar -plib$(PACKAGE)-java -l --usj-version=$(VERSION) pom.xml build/lib/$(PACKAGE).jar + mh_installjar -plib$(PACKAGE)-java -l --usj-version=$(VERSION) debian/nekohtml-xni.pom build/lib/$(PACKAGE)Xni.jar + +binary-post-install/lib$(PACKAGE)-java-doc:: + dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java + +clean:: + -rm -rf debian/tmp + Property changes on: trunk/nekohtml/debian/rules ___________________________________________________________________ Added: svn:executable + * Added: trunk/nekohtml/debian/watch =================================================================== --- trunk/nekohtml/debian/watch (rev 0) +++ trunk/nekohtml/debian/watch 2009-07-03 00:03:27 UTC (rev 8825) @@ -0,0 +1,4 @@ +version=3 +https://nekohtml.svn.sourceforge.net/svnroot/nekohtml/branches/ \ + nekohtml-([1-9].*)/ debian debian/orig-tar.sh + _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
