[SCM] Debian package checker branch, master, updated. 2.5.0-rc2-137-g5284eba
The following commit has been merged in the master branch:
commit 5284ebab2c59de794d18805249f2855888b221ef
Author: Niels Thykier <niels@thykier.net>
Date: Fri Apr 15 13:19:13 2011 +0200
Split and extended java tests, added B-D on zip
diff --git a/debian/control b/debian/control
index f36eefe..467292a 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,8 @@ Build-Depends: binutils,
python,
quilt,
rsync,
- unzip
+ unzip,
+ zip
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/lintian/lintian.git
Vcs-Browser: http://git.debian.org/?p=lintian/lintian.git
diff --git a/t/COVERAGE b/t/COVERAGE
index 23e756a..263acf5 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,4 +1,4 @@
-Last generated 2011-04-14
+Last generated 2011-04-15
The following tags are not tested by the test suite:
diff --git a/t/tests/java-classpath/debian/debian/control.in b/t/tests/java-classpath/debian/debian/control.in
new file mode 100644
index 0000000..21731e8
--- /dev/null
+++ b/t/tests/java-classpath/debian/debian/control.in
@@ -0,0 +1,26 @@
+Source: {$srcpkg}
+Priority: extra
+Section: {$section}
+Maintainer: {$author}
+Standards-Version: {$standards_version}
+Build-Depends: debhelper (>= 7.0.50~), javahelper (>= 0.32~), default-jdk
+
+Package: libcp-missing-java
+Architecture: {$architecture}
+Depends: $\{misc:Depends\}, libdepends-java
+Description: {$description} - missing
+ This is a test package designed to test various aspects of the
+ java-related QA code in lintian. This package should not be
+ installed.
+ .
+ Test for missing classpaths.
+
+Package: libcp-relative-java
+Architecture: {$architecture}
+Depends: $\{misc:Depends\}, libdepends-java
+Description: {$description} - relative
+ This is a test package designed to test various aspects of the
+ java-related QA code in lintian. This package should not be
+ installed.
+ .
+ Test for relative classpaths.
diff --git a/t/tests/java-classpath/debian/debian/javabuild b/t/tests/java-classpath/debian/debian/javabuild
new file mode 100644
index 0000000..cdcc483
--- /dev/null
+++ b/t/tests/java-classpath/debian/debian/javabuild
@@ -0,0 +1,2 @@
+cp-missing.jar src
+cp-relative.jar src
diff --git a/t/tests/java-classpath/debian/debian/libcp-missing-java.jlibs b/t/tests/java-classpath/debian/debian/libcp-missing-java.jlibs
new file mode 100644
index 0000000..702a7ca
--- /dev/null
+++ b/t/tests/java-classpath/debian/debian/libcp-missing-java.jlibs
@@ -0,0 +1 @@
+cp-missing.jar
diff --git a/t/tests/java-classpath/debian/debian/libcp-relative-java.jlibs b/t/tests/java-classpath/debian/debian/libcp-relative-java.jlibs
new file mode 100644
index 0000000..4f2e007
--- /dev/null
+++ b/t/tests/java-classpath/debian/debian/libcp-relative-java.jlibs
@@ -0,0 +1 @@
+cp-relative.jar
diff --git a/t/tests/java-classpath/debian/debian/libcp-relative-java.manifest b/t/tests/java-classpath/debian/debian/libcp-relative-java.manifest
new file mode 100644
index 0000000..c060eca
--- /dev/null
+++ b/t/tests/java-classpath/debian/debian/libcp-relative-java.manifest
@@ -0,0 +1,2 @@
+usr/share/java/cp-relative.jar:
+ Class-Path: obviously-relative/stuff.jar
diff --git a/t/tests/java-jars/debian/debian/rules b/t/tests/java-classpath/debian/debian/rules
similarity index 97%
copy from t/tests/java-jars/debian/debian/rules
copy to t/tests/java-classpath/debian/debian/rules
index 1a2b3dd..df489df 100755
--- a/t/tests/java-jars/debian/debian/rules
+++ b/t/tests/java-classpath/debian/debian/rules
@@ -1,3 +1,4 @@
#!/usr/bin/make -f
+
%:
dh $@ --with javahelper
diff --git a/t/tests/java-jars/desc b/t/tests/java-classpath/desc
similarity index 61%
copy from t/tests/java-jars/desc
copy to t/tests/java-classpath/desc
index 362d973..d26ed4f 100644
--- a/t/tests/java-jars/desc
+++ b/t/tests/java-classpath/desc
@@ -1,4 +1,4 @@
-Testname: java-jars
+Testname: java-classpath
Type: non-native
Sequence: 6000
Version: 1.0-1
@@ -7,8 +7,4 @@ Author: Vincent Fourmond <fourmond@debian.org>
Section: java
Test-For:
missing-classpath
- executable-jar-without-main-class
- jar-not-in-usr-share
classpath-contains-relative-path
- missing-dep-on-jarwrapper
- javalib-but-no-public-jars
diff --git a/t/tests/java-classpath/tags b/t/tests/java-classpath/tags
new file mode 100644
index 0000000..1d7b0c6
--- /dev/null
+++ b/t/tests/java-classpath/tags
@@ -0,0 +1,2 @@
+W: libcp-missing-java: missing-classpath libdepends-java
+W: libcp-relative-java: classpath-contains-relative-path usr/share/java/cp-relative-1.0.jar: obviously-relative/stuff.jar
diff --git a/t/tests/java-jars/upstream/src/org/debian/lintian/TestA.java b/t/tests/java-classpath/upstream/src/org/debian/lintian/TestA.java
similarity index 100%
copy from t/tests/java-jars/upstream/src/org/debian/lintian/TestA.java
copy to t/tests/java-classpath/upstream/src/org/debian/lintian/TestA.java
diff --git a/t/tests/java-jars/debian/debian/control.in b/t/tests/java-jars/debian/debian/control.in
index e06a900..26bfb69 100644
--- a/t/tests/java-jars/debian/debian/control.in
+++ b/t/tests/java-jars/debian/debian/control.in
@@ -7,22 +7,32 @@ Build-Depends: debhelper (>= 7.0.50~), javahelper, default-jdk
Package: libtesta-java
Architecture: {$architecture}
-Depends: $\{misc:Depends\}, libstuff-java
+Depends: $\{misc:Depends\}
Description: {$description} - part A
This is a test package designed to test various aspects of the
java-related QA code in lintian. First part.
.
This package should not be installed.
-Package: libtestb-java
+Package: libcodeless-java
Architecture: {$architecture}
-Depends: $\{misc:Depends\}, libstuff-java
-Description: {$description} - part B
+Depends: $\{misc:Depends\}
+Description: {$description} - codeless
This is a test package designed to test various aspects of the
- java-related QA code in lintian. Second part.
+ java-related QA code in lintian. This package should not be
+ installed.
.
- This package should not be installed.
+ This package tests for codeless jars.
+Package: libmanifestless-java
+Architecture: {$architecture}
+Depends: $\{misc:Depends\}
+Description: {$description} - manifestless
+ This is a test package designed to test various aspects of the
+ java-related QA code in lintian. This package should not be
+ installed.
+ .
+ This package tests for mainifest-less code jars.
Package: libtestc-java
Architecture: {$architecture}
diff --git a/t/tests/java-jars/debian/debian/libcodeless-java.jlibs b/t/tests/java-jars/debian/debian/libcodeless-java.jlibs
new file mode 100644
index 0000000..e31d0ab
--- /dev/null
+++ b/t/tests/java-jars/debian/debian/libcodeless-java.jlibs
@@ -0,0 +1 @@
+codeless.jar
diff --git a/t/tests/java-jars/debian/debian/libmanifestless-java.jlibs b/t/tests/java-jars/debian/debian/libmanifestless-java.jlibs
new file mode 100644
index 0000000..7ae2544
--- /dev/null
+++ b/t/tests/java-jars/debian/debian/libmanifestless-java.jlibs
@@ -0,0 +1 @@
+manifestless.jar
diff --git a/t/tests/java-jars/debian/debian/libtestb-java.jlibs b/t/tests/java-jars/debian/debian/libtestb-java.jlibs
deleted file mode 100644
index d3da424..0000000
--- a/t/tests/java-jars/debian/debian/libtestb-java.jlibs
+++ /dev/null
@@ -1 +0,0 @@
-testd.jar
diff --git a/t/tests/java-jars/debian/debian/libtestb-java.manifest b/t/tests/java-jars/debian/debian/libtestb-java.manifest
deleted file mode 100644
index 4907b49..0000000
--- a/t/tests/java-jars/debian/debian/libtestb-java.manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/java/testd.jar:
- Class-Path: obviously-relative/stuff.jar /usr/lib/biniou.jar
diff --git a/t/tests/java-jars/debian/debian/rules b/t/tests/java-jars/debian/debian/rules
index 1a2b3dd..729215d 100755
--- a/t/tests/java-jars/debian/debian/rules
+++ b/t/tests/java-jars/debian/debian/rules
@@ -1,3 +1,12 @@
#!/usr/bin/make -f
%:
dh $@ --with javahelper
+
+override_jh_build:
+ jh_build
+ unzip testa.jar
+ zip -r codeless.jar META-INF/
+ zip -r manifestless.jar org/
+
+override_dh_auto_clean:
+ rm -fr META-INF/ org/
diff --git a/t/tests/java-jars/desc b/t/tests/java-jars/desc
index 362d973..83d2ed3 100644
--- a/t/tests/java-jars/desc
+++ b/t/tests/java-jars/desc
@@ -6,9 +6,9 @@ Description: Various checks about JAR files
Author: Vincent Fourmond <fourmond@debian.org>
Section: java
Test-For:
- missing-classpath
+ codeless-jar
executable-jar-without-main-class
jar-not-in-usr-share
- classpath-contains-relative-path
- missing-dep-on-jarwrapper
javalib-but-no-public-jars
+ missing-dep-on-jarwrapper
+ missing-manifest
diff --git a/t/tests/java-jars/tags b/t/tests/java-jars/tags
index dfac724..e1d4bc2 100644
--- a/t/tests/java-jars/tags
+++ b/t/tests/java-jars/tags
@@ -1,9 +1,8 @@
E: libtesta-java: executable-jar-without-main-class usr/bin/testc.jar
-E: libtesta-java: jar-not-in-usr-share usr/lib/testb.jar
E: libtesta-java: missing-dep-on-jarwrapper
+I: libmanifestless-java: missing-manifest usr/share/java/manifestless-1.0.jar
I: libtestc-java: javalib-but-no-public-jars
+W: libcodeless-java: codeless-jar usr/share/java/codeless-1.0.jar
W: libtesta-java: binary-without-manpage usr/bin/testc.jar
W: libtesta-java: executable-not-elf-or-script usr/bin/testc.jar
-W: libtesta-java: missing-classpath libstuff-java
-W: libtestb-java: classpath-contains-files-not-in-usr-share usr/share/java/testd-1.0.jar: obviously-relative/stuff.jar /usr/lib/biniou.jar
-W: libtestb-java: classpath-contains-relative-path usr/share/java/testd-1.0.jar: obviously-relative/stuff.jar /usr/lib/biniou.jar
+W: libtesta-java: jar-not-in-usr-share usr/lib/testb.jar
--
Debian package checker
Reply to: