Package: ini4j
Version: 0.5.2-SNAPSHOT-2
Severity: minor
Tags: patch

The package ini4j has unnecessary dependencies: libjetty-java and
libservlet2.5-java. It recommends jetty and thereby installs a complete
servlet engine for an Ini-Parser.  These libraries are not used by the
package, in fact it compiles and runs just fine without them.

Also, the jar includes some strange files: 

site/apt/design.apt
site/apt/overview.apt
site/resources/.htaccess
site/resources/css/site.css
site/resources/favicon.ico
site/resources/img/bugs.png
site/resources/img/community.png
site/resources/img/docs.png
site/resources/img/download.png
site/resources/img/feature.png
site/resources/img/fedora.png
site/resources/img/forum.png
site/resources/img/ini4j-banner.png
site/resources/img/ini4j.png
site/resources/img/sample.png
site/resources/img/tutorial.png
site/resources/img/ubuntu.png
site/resources/img/writer.png
site/resources/robots.txt
test/java/org/ini4j/demo/help.txt
test/java/org/ini4j/demo/ini-data.txt
test/java/org/ini4j/demo/ini-tip.txt
test/java/org/ini4j/demo/options-data.txt
test/java/org/ini4j/demo/options-tip.txt
test/java/org/ini4j/demo/reg-data.txt
test/java/org/ini4j/demo/reg-tip.txt
test/java/org/ini4j/sample/dwarfs.opt
test/java/org/ini4j/sample/dwarfs.reg
test/java/org/ini4j/sample/package-info.class
test/java/org/ini4j/tutorial/package-info.class
test/resources/org/ini4j/mozilla.reg
test/resources/org/ini4j/spi/include.txt
test/resources/org/ini4j/spi/nested.txt
test/resources/org/ini4j/spi/part1.txt
test/resources/org/ini4j/spi/part2.txt

These seem to be part of the website, but these should not be in the jar
containing the java-classes.

The attached patch modifies the package so these issues are addressed.
All unit tests included in the package passing before modification still
pass afterwards.

I've left the build-dependencies for testing the package alone although
they are not needed since no tests are run during build.

-- 
+++ I am sorry. It is hard to convey five-dimensional ideas in a language
    evolved to scream defiance at the monkeys in the next tree +++
[Terry Pratchett - The Science of the Discworld 3]
diff -r -u ini4j-original//debian/build.xml ini4j-0.5.2-SNAPSHOT//debian/build.xml
--- ini4j-original//debian/build.xml	2012-12-18 20:45:41.000000000 +0100
+++ ini4j-0.5.2-SNAPSHOT//debian/build.xml	2012-12-18 23:08:35.000000000 +0100
@@ -10,7 +10,7 @@
   <property name="build.app.name" value="ini4j-${artifactVersion}"/>
   <!-- directory locations -->
   <property name="build.dst" value="${basedir}/build"/>
-  <property name="build.src" value="${basedir}/src/"/>
+  <property name="build.src" value="${basedir}/src/main/java/"/>
   <property name="build.dist" value="${basedir}/dist"/>
 
   <property name="build.dst.classes" value="${build.dst}/classes"/>
@@ -37,10 +37,8 @@
     <path id="build.classpath">
         <pathelement location="${build.dst.classes}"/>
         <pathelement path="${java.class.path}"/>                
-        <pathelement location="${build.servlet.jar}"/>
-        <pathelement location="${build.jetty.jar}"/>
     </path>
-
+	
     <mkdir dir="${build.dst}"/>
     <mkdir dir="${build.dist}"/>
     <mkdir dir="${build.dst.doc}"/>
@@ -51,7 +49,6 @@
     <mkdir dir="${build.dst.classes}"/>
 
     <javac
-        classpathref="build.classpath"
         debug="${build.compile.debug}"
         deprecation="${build.compile.deprecation}"
         optimize="${build.compile.optimize}"
diff -r -u ini4j-original//debian/control ini4j-0.5.2-SNAPSHOT//debian/control
--- ini4j-original//debian/control	2012-12-18 20:45:41.000000000 +0100
+++ ini4j-0.5.2-SNAPSHOT//debian/control	2012-12-18 21:06:30.000000000 +0100
@@ -5,7 +5,7 @@
 Uploaders: Marek Slama <marek.sl...@sun.com>,
  Andres Mejia <ame...@debian.org>
 Build-Depends: debhelper (>= 7.0.50~), javahelper, ant, ant-optional,
- default-jdk, libjetty-java, libservlet2.5-java, junit4, bsh, libeasymock-java
+ default-jdk, junit4, bsh, libeasymock-java
 Standards-Version: 3.9.3
 Homepage: http://www.ini4j.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-java/ini4j.git
Nur in ini4j-0.5.2-SNAPSHOT//debian: patches.
diff -r -u ini4j-original//debian/rules ini4j-0.5.2-SNAPSHOT//debian/rules
--- ini4j-original//debian/rules	2012-12-18 20:45:41.000000000 +0100
+++ ini4j-0.5.2-SNAPSHOT//debian/rules	2012-12-18 22:48:14.000000000 +0100
@@ -2,19 +2,11 @@
 
 DEB_ANT_BUILDFILE = ./debian/build.xml
 DEB_ANT_BUILD_TARGET = build javadoc
-DEB_ANT_ARGS = -Dbuild.sysclasspath=first \
-	-Dbuild.servlet.jar=/usr/share/java/servlet-api-2.5.jar
+DEB_ANT_ARGS = -Dbuild.sysclasspath=first 
 VERSION = $(shell dpkg-parsechangelog | grep ^Version: | cut -f2 -d' ' \
 	| sed -r 's/^(.*)-.*$$/\1/')
 
-JARS = /usr/share/java/jetty.jar
-JARS := $(JARS):/usr/share/java/servlet-api-2.5.jar
-JARS := $(JARS):/usr/share/java/servlet-api.jar
-JARS := $(JARS):/usr/share/java/junit4.jar
-JARS := $(JARS):/usr/share/java/bsh.jar
-JARS := $(JARS):/usr/share/java/easymock.jar
 
-export CLASSPATH=$(JARS)
 export JAVA_HOME=/usr/lib/jvm/default-java
 
 %:

Attachment: signature.asc
Description: Digital signature

Reply via email to