Cleanup in .orig.tar.gz or debian/rules?

[Philipp Matthias Hahn <pmhahn@debian.org>]

Hello!

Please cc: me on replies, since I'm not subsribed to this list.

I'm currently looking at JSPWiki, a wiki-system written in Java. Debian
(and [K]Ubuntu) contains a very old version: 2.5.139 vs. 2.6.3. While
trying to build a new package, I detected that JSPWiki contains a lot of
third-parts .jar-files in lib/ and tests/lib/, which are already
provided by separate packages in Debian:
  lib/activation.jar	usr/share/java/activation.jar
  lib/commons-codec-1.3.jar	usr/share/java/commons-codec.jar
  lib/commons-httpclient-3.0.1.jar	usr/share/java/commons-httpclient.jar
  lib/commons-lang-2.3.jar	usr/share/java/commons-lang.jar
  lib/commons-logging-api.jar	usr/share/java/commons-logging-api.jar
  lib/jaxen.jar	usr/share/java/jaxen.jar
  lib/jdom.jar	usr/share/java/jdom1.jar
  lib/jsp-api.jar	usr/share/java/jsp-api.jar
  lib/log4j-1.2.14.jar	usr/share/java/log4j-1.2.jar
  lib/lucene-highlighter.jar	usr/share/java/lucene-highlighter.jar
  lib/lucene.jar	usr/share/java/lucene-core.jar
  lib/nekohtml.jar	usr/share/java/nekohtml.jar
  lib/oro.jar	usr/share/java/oro.jar
  lib/oscache.jar	usr/share/java/oscache.jar
  lib/servlet-api.jar	usr/share/java/servlet-2.3.jar
  lib/mail.jar	usr/share/java/gnumail.jar
  tests/lib/hsqldb.jar	usr/share/java/hsqldb.jar
  tests/lib/xml-apis-1.0.b2.jar	usr/share/java/xml-apis.jar
  tests/lib/servlet.jar	usr/share/java/servlet-2.3.jar
  tests/lib/junit.jar	usr/share/java/junit.jar
  tests/lib/xercesImpl-2.6.2.jar	usr/share/java/xercesImpl.jar

I now ask myself, when and were should I replace those libraries:
1. Only in the final debian/jspwiki/ tree (but build with the original
   .jar files)
2. Each time during the debian/rules run
3. Once in the .orig.tar.gz (the download is only availabe as .zip)

Currently I have a mix of 2. and 3. and strip these .jar-files from the
.orig.tar.gz, but add and remove the symbolic links only during the
debian/rules run. 

-rw-rw-r-- 1 12945644 16. Jul 17:45 jspwiki_2.6.3.orig2.tar.gz (vanilla)
-rw-rw-r-- 1  8784024 16. Jul 23:32 jspwiki_2.6.3.orig.tar.gz (stripped)

This saves 4 MiB and also tests, if JSPWiki is buildable with the
replacements libs. What do you think?


There are also some more .jar files, which aren't packaged separately
yet:
	lib/akismet-java-1.02.jar
	lib/ecs.jar
	lib/freshcookies-security-0.54.jar
	lib/jakarta-tablibs-standard-1.1.2.jar
	lib/jakarta-taglibs-jstl-1.1.2.jar
	lib/jrcs-diff.jar
	lib/jsonrpc-1.0.jar
	lib/jug-asl-2.0.0.jar
	lib/multipartrequest.jar
	lib/sandler.jar
	lib/xmlrpc.jar	(some < 3.1 version)
	tests/lib/custom_rhino.jar
	tests/lib/selenium-java-client-driver-0.9.2.jar
	tests/lib/selenium-server-0.9.2-patched.jar
The files in tests/lib/ are not shipped inside the final Debian package,
the files in lib/ are. I'm not aware of any other Debian package
shipping them also, so is it okay to include them in jspwiki only or do
I need to split them into their own packages?


Also, if I strip those .jar-files from the .orig.tar.gz, do I still need
to keep their copyright and license-info in debian/copyright?


My current working version is available from
http://pint.pmhahn.de/pmhahn/debian/lenny/j/jspwiki/

BYtE
Philipp
-- 
Philipp Matthias Hahn <pmhahn@debian.org>
 GPG/PGP: 9A540E39 @ keyrings.debian.org