[cobertura] 07/07: Updated the dh syntax in debian/rules

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository cobertura.

commit 99d706c2a76512ad94a89d7a898ffdee0ff1b0de
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Sep 10 01:17:51 2014 +0200

    Updated the dh syntax in debian/rules
---
 build.properties | 3 +--
 build.xml        | 8 ++------
 debian/rules     | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/build.properties b/build.properties
index 4641708..530a635 100644
--- a/build.properties
+++ b/build.properties
@@ -8,11 +8,10 @@ eclipse.dir=/opt/eclipse
 etc.dir=etc
 examples.dir=examples
 examples.functionalconditiontest.dir=examples/functionalconditiontest/src
-lib.dir=lib
+lib.dir=/usr/share/java
 src.dir=src
 othersrc.dir=src-2
 test.src.dir=test
-jetty.dir=jetty
 
 # Directories for generated output
 build.dir=build
diff --git a/build.xml b/build.xml
index 2a19d41..cca40e5 100644
--- a/build.xml
+++ b/build.xml
@@ -18,12 +18,7 @@
 
 
 	<path id="base.path">
-		<fileset dir="${lib.dir}">
-			<include name="**/*.jar" />
-		</fileset>
-		<fileset dir="${jetty.dir}">
-			<include name="lib/servlet-api*.jar" />
-		</fileset>
+		<fileset dir="/" includesfile="debian/classpath-debian"/>
 	</path>
 
 	<path id="cobertura.classpath">
@@ -140,6 +135,7 @@
 				<attribute name="Implementation-Vendor" value="Cobertura"/>
 				<attribute name="Implementation-Vendor-Id" value="net.sourceforge.cobertura"/>
 				<attribute name="Implementation-Version" value="${version}"/>
+				<attribute name="Class-Path" value="asm3.jar asm3-tree.jar oro.jar log4j-1.2.jar servlet-api.jar"/>
 			</manifest>
 		</jar>
 
diff --git a/debian/rules b/debian/rules
index 94d2bd0..a2d2a70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ DEB_UPSTREAM_VERSION := \
 	$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)+dfsg-.*/\1/p')
 
 %:
-	dh --with javahelper $@
+	dh $@ --with javahelper
 
 override_dh_auto_build:
 	ant -propertyfile debian/ant.properties dist

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/cobertura.git