[junit4] 01/02: Restored the Class-Path and the OSGi entries in the manifest

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Apr 28 16:04:17 UTC 2015


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

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

commit f97a322a46c41858d499863e3a0709d5702e0c82
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Apr 28 18:00:03 2015 +0200

    Restored the Class-Path and the OSGi entries in the manifest
---
 debian/MANIFEST.MF     | 64 --------------------------------------------------
 debian/changelog       |  6 +++++
 debian/control         |  2 +-
 debian/junit4.manifest |  9 +++++++
 debian/rules           |  3 +++
 5 files changed, 19 insertions(+), 65 deletions(-)

diff --git a/debian/MANIFEST.MF b/debian/MANIFEST.MF
deleted file mode 100644
index d5a4b56..0000000
--- a/debian/MANIFEST.MF
+++ /dev/null
@@ -1,64 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: hamcrest-core.jar
-Bundle-Vendor: JUnit
-Bundle-Version: 4.11
-Bundle-Name: JUnit Testing Framework
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.junit
-Export-Package: org.junit.experimental.theories.suppliers;uses:="org.jun
- it.experimental.theories";version="4.11",org.junit.experimental.theorie
- s;uses:="org.junit.experimental.theories.internal,org.junit.internal,or
- g.junit.runners.model,org.junit.runners,org.junit";version="4.11",org.j
- unit.experimental.theories.internal;uses:="org.junit.experimental.theor
- ies,org.junit.runners.model";version="4.11",org.junit.internal.runners;
- uses:="org.junit.runner,org.junit.internal,org.junit.runner.notificatio
- n,org.junit.runners.model,junit.framework,org.junit.runner.manipulation
- ,junit.extensions,org.junit";version="4.11",org.junit.internal;uses:="o
- rg.hamcrest,org.junit,org.junit.runners,org.junit.runner,org.junit.runn
- er.notification";version="4.11",org.junit.internal.runners.model;uses:=
- "org.junit.internal,org.junit.runner,org.junit.runners.model,org.junit.
- runner.notification";version="4.11",org.junit.experimental.categories;u
- ses:="org.junit.runner.manipulation,org.junit.runner,org.junit.runners,
- org.junit.runners.model";version="4.11",org.junit.runner.manipulation;u
- ses:="org.junit.runner";version="4.11",org.junit.rules;uses:="org.hamcr
- est,org.junit,org.junit.runners.model,org.junit.internal,org.junit.inte
- rnal.matchers,org.junit.runner,org.junit.matchers,org.junit.internal.ru
- nners.statements";version="4.11",org.junit.runner;uses:="org.junit.runn
- ers.model,org.junit.runners,junit.framework,org.junit.internal.runners,
- org.junit.internal,junit.runner,org.junit.runner.notification,org.junit
- .runner.manipulation,org.junit.internal.requests,org.junit.internal.bui
- lders";version="4.11",org.junit.runners;uses:="org.junit.internal.runne
- rs,org.junit.runners.model,org.junit.internal.runners.model,org.junit.i
- nternal.runners.rules,org.junit.rules,org.junit.runner,org.junit.runner
- .notification,org.junit.internal.runners.statements,org.junit,org.junit
- .internal,org.junit.runner.manipulation,org.junit.internal.builders";ve
- rsion="4.11",org.junit.matchers;uses:="org.junit.internal.matchers,org.
- hamcrest.core,org.hamcrest";version="4.11",org.junit.runner.notificatio
- n;uses:="org.junit.runner";version="4.11",org.junit.experimental.result
- s;uses:="org.junit.runner,org.junit.runner.notification,org.junit.inter
- nal,org.hamcrest";version="4.11",org.junit.experimental.max;uses:="org.
- junit.runner,org.junit.runners,org.junit.internal.runners,org.junit.run
- ners.model,org.junit.internal.requests,junit.framework,org.junit.runner
- .notification";version="4.11",org.junit.internal.builders;uses:="org.ju
- nit.runner,org.junit.runners.model,org.junit,org.junit.runner.notificat
- ion,junit.framework,org.junit.internal.runners,org.junit.runners";versi
- on="4.11",org.junit;uses:="org.junit.internal,org.hamcrest,org.junit.ru
- nners";version="4.11",org.junit.experimental.runners;uses:="org.junit.r
- unners,org.junit.runners.model";version="4.11",org.junit.internal.runne
- rs.rules;uses:="org.junit.rules,org.junit.runners.model,org.junit";vers
- ion="4.11",org.junit.internal.matchers;uses:="org.hamcrest,org.junit.in
- ternal";version="4.11",org.junit.internal.requests;uses:="org.junit.run
- ner,org.junit.internal.builders,org.junit.runner.manipulation,org.junit
- .internal.runners";version="4.11",org.junit.experimental;uses:="org.jun
- it.runner,org.junit.runners.model,org.junit.runners";version="4.11",org
- .junit.runners.model;uses:="org.junit.internal.runners.model,org.junit.
- internal.runners,org.junit.runner,org.junit.internal,org.junit";version
- ="4.11",org.junit.internal.runners.statements;uses:="org.junit.internal
- ,org.junit.runners.model";version="4.11",junit.runner;uses:="junit.fram
- ework";version="4.11",junit.textui;uses:="junit.framework,junit.runner"
- ;version="4.11",junit.extensions;uses:="junit.framework";version="4.11"
- ,junit.framework;uses:="org.junit.runner.manipulation,org.junit.runner,
- org.junit.runner.notification,org.junit,org.junit.internal";version="4.
- 11"
-Import-Package: org.hamcrest;version="1.3",org.hamcrest.core;version="1.
- 3"
diff --git a/debian/changelog b/debian/changelog
index 788a5c5..41ec092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+junit4 (4.12-2) UNRELEASED; urgency=medium
+
+  * Restored the Class-Path and the OSGi entries in the manifest
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 28 Apr 2015 17:55:03 +0200
+
 junit4 (4.12-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index a322c1d..37b8f38 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Florian Weimer <fw at deneb.enyo.de>,
            Jakub Adam <jakub.adam at ktknet.cz>,
            Emmanuel Bourg <ebourg at apache.org>
 Priority: optional
-Build-Depends: cdbs, debhelper (>= 9), default-jdk
+Build-Depends: cdbs, debhelper (>= 9), default-jdk, javahelper
 Build-Depends-Indep: default-jdk-doc,
                      libhamcrest-java (>= 1.3),
                      libhamcrest-java-doc,
diff --git a/debian/junit4.manifest b/debian/junit4.manifest
new file mode 100644
index 0000000..4de99d6
--- /dev/null
+++ b/debian/junit4.manifest
@@ -0,0 +1,9 @@
+usr/share/java/junit4.jar:
+ Class-Path: hamcrest-core.jar
+ Bundle-Vendor: JUnit
+ Bundle-Version: 4.12
+ Bundle-Name: JUnit Testing Framework
+ Bundle-ManifestVersion: 2
+ Bundle-SymbolicName: org.junit
+ Export-Package: org.junit.experimental.theories.suppliers;uses:="org.junit.experimental.theories";version="4.12",org.junit.experimental.theories;uses:="org.junit.experimental.theories.internal,org.junit.internal,org.junit.runners.model,org.junit.runners,org.junit";version="4.12",org.junit.experimental.theories.internal;uses:="org.junit.experimental.theories,org.junit.runners.model";version="4.12",org.junit.internal.runners;uses:="org.junit.runner,org.junit.internal,org.junit.runner.noti [...]
+ Import-Package: org.hamcrest;version="1.3",org.hamcrest.core;version="1. 3"
diff --git a/debian/rules b/debian/rules
index 41f7d9e..d9ce644 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,9 @@ include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME	     := /usr/lib/jvm/default-java
 
+binary-post-install/junit4::
+	jh_manifest -pjunit4
+
 binary-post-install/junit4-doc::
 	dh_install -pjunit4-doc javadoc/latest/* /usr/share/doc/junit4/api/
 

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



More information about the pkg-java-commits mailing list