[pkg-java] r11488 - trunk/libjibx-java/branch-1.1/debian

[Steffen Möller]

Author: moeller
Date: 2010-02-02 01:37:45 +0000 (Tue, 02 Feb 2010)
New Revision: 11488

Modified:
   trunk/libjibx-java/branch-1.1/debian/changelog
   trunk/libjibx-java/branch-1.1/debian/control
   trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.install
   trunk/libjibx-java/branch-1.1/debian/rules
Log:
Improvements on lintian cleanliness.


Modified: trunk/libjibx-java/branch-1.1/debian/changelog
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/changelog	2010-02-02 01:15:44 UTC (rev 11487)
+++ trunk/libjibx-java/branch-1.1/debian/changelog	2010-02-02 01:37:45 UTC (rev 11488)
@@ -4,7 +4,7 @@
 
  -- Steffen Moeller <moeller at debian.org>  Mon, 01 Feb 2010 03:54:46 +0100
 
-libjibx1.1-java (1.2.1-1) unstable; urgency=low
+libjibx1.2-java (1.2.1-1) unstable; urgency=low
 
   [ Eric Lavarde ]
   * Remove dependency on gjdoc.

Modified: trunk/libjibx-java/branch-1.1/debian/control
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/control	2010-02-02 01:15:44 UTC (rev 11487)
+++ trunk/libjibx-java/branch-1.1/debian/control	2010-02-02 01:37:45 UTC (rev 11488)
@@ -2,7 +2,7 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>, Michael Koch <konqueror at gmx.de>
+Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>, Michael Koch <konqueror at gmx.de>, Steffen Moeller <moeller at debian.org>
 Build-Depends: debhelper (>= 7.0.0), cdbs (>= 0.4.8), openjdk-6-jdk, ant, quilt
 Build-Depends-Indep: antlr, libbcel-java, liblog4j1.2-java, libxpp3-java, libqdox-java, libdom4j-java
 Standards-Version: 3.8.4
@@ -26,7 +26,7 @@
 
 Package: libjibx-java
 Architecture: all
-Depends: libjibx1.1-java
+Depends: libjibx1.1-java, ${misc:Depends}
 Description: Framework for binding XML data to Java objects
  JiBX lets you work with data from XML documents using your own class
  structures. The JiBX framework handles all the details of converting

Modified: trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.install
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.install	2010-02-02 01:15:44 UTC (rev 11487)
+++ trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.install	2010-02-02 01:37:45 UTC (rev 11488)
@@ -1,2 +1 @@
 docs/* usr/share/doc/libjibx1.1-java-doc
-build/api usr/share/doc/libjibx1.1-java-doc

Modified: trunk/libjibx-java/branch-1.1/debian/rules
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/rules	2010-02-02 01:15:44 UTC (rev 11487)
+++ trunk/libjibx-java/branch-1.1/debian/rules	2010-02-02 01:37:45 UTC (rev 11488)
@@ -9,7 +9,7 @@
 JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar bcel log4j qdox xpp3
 DEB_ANT_BUILD_TARGET := setrelease current devdoc
-DEB_ANT_ARGS         := -Dbindname=jibx-bind-$(DEB_UPSTREAM_VERSION) -Dextrasname=jibx-extras-$(DEB_UPSTREAM_VERSION) -Drunname=jibx-run-$(DEB_UPSTREAM_VERSION) -Dschemaname=jibx-schema-$(DEB_UPSTREAM_VERSION)
+DEB_ANT_ARGS         := -Dbindname=jibx-bind-$(DEB_UPSTREAM_VERSION) -Dextrasname=jibx-extras-$(DEB_UPSTREAM_VERSION) -Drunname=jibx-run-$(DEB_UPSTREAM_VERSION)
 DEB_BUILDDIR         := build
 DEB_DH_INSTALLCHANGELOGS_ARGS := changes.txt
 
@@ -22,7 +22,6 @@
 	dh_install -plibjibx$(DEB_UPSTREAM_VERSION_2)-java lib/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java
 	dh_install -plibjibx$(DEB_UPSTREAM_VERSION_2)-java lib/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java
 	dh_install -plibjibx$(DEB_UPSTREAM_VERSION_2)-java lib/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_install -plibjibx$(DEB_UPSTREAM_VERSION_2)-java lib/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java
 	if [ "$(DEB_UPSTREAM_VERSION)" != "$(DEB_UPSTREAM_VERSION_2)" ]; then \
 		dh_link -plibjibx$(DEB_UPSTREAM_VERSION_2)-java usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION).jar \
 								usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION_2).jar ; \