Merge lp:~ari-tczew/ubuntu/maverick/junitperf/lp-521390 into lp:ubuntu/maverick/junitperf

Proposed by Artur Rona on 2010-05-06
Status: Merged
Merged at revision: 6
Proposed branch: lp:~ari-tczew/ubuntu/maverick/junitperf/lp-521390
Merge into: lp:ubuntu/maverick/junitperf
Diff against target: 104 lines (+49/-7)
6 files modified
debian/changelog (+34/-0)
debian/compat (+1/-1)
debian/control (+11/-5)
debian/rules (+0/-1)
debian/source/format (+1/-0)
debian/watch (+2/-0)
To merge this branch: bzr merge lp:~ari-tczew/ubuntu/maverick/junitperf/lp-521390
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Team 2010-05-06 Pending
Review via email: mp+24866@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-09-02 14:37:01 +0000
3+++ debian/changelog 2010-05-06 20:39:26 +0000
4@@ -1,3 +1,37 @@
5+junitperf (1.9.1-7ubuntu1) maverick; urgency=low
6+
7+ * Merge from Debian testing, remaining changes: (LP: #521390)
8+ - debian/ant.properties: Force java2 code generation
9+
10+ -- Artur Rona <ari-tczew@tlen.pl> Thu, 06 May 2010 21:40:02 +0200
11+
12+junitperf (1.9.1-7) unstable; urgency=low
13+
14+ * Corrected Depends to default-jre-headless instead of the
15+ nonexistent default-java-headless.
16+
17+ -- Niels Thykier <niels@thykier.net> Tue, 01 Dec 2009 15:08:44 +0100
18+
19+junitperf (1.9.1-6) unstable; urgency=low
20+
21+ [ Kumar Appaiah ]
22+ * Add a watch file.
23+
24+ [ Niels Thykier ]
25+ * Added missing ${misc:Depends}.
26+ * Changed Depends to -headless versions of java.
27+ - Also added more java alternatives.
28+ * Stopped using cdbs's simple-patch system - it was not used.
29+ * Switched to default-jdk from java-gcj-compat.
30+ * Bumped debhelper compat to 7.
31+ * Bumped Standards-Version to 3.8.3.
32+ - Changed section to java.
33+ - Added Homepage and Vcs-* fields.
34+ * Added myself to uploaders.
35+ * Converted to 3.0 (quilt) source.
36+
37+ -- Niels Thykier <niels@thykier.net> Sat, 21 Nov 2009 12:51:16 +0100
38+
39 junitperf (1.9.1-5ubuntu1) karmic; urgency=low
40
41 * debian/control, debian/rules: Build with default-jdk
42
43=== modified file 'debian/compat'
44--- debian/compat 2009-09-02 14:37:01 +0000
45+++ debian/compat 2010-05-06 20:39:26 +0000
46@@ -1,1 +1,1 @@
47-5
48+7
49
50=== modified file 'debian/control'
51--- debian/control 2009-09-02 14:37:01 +0000
52+++ debian/control 2010-05-06 20:39:26 +0000
53@@ -3,14 +3,20 @@
54 Priority: optional
55 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
56 XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
57-Uploaders: Arnaud Vandyck <avdyk@debian.org>, Wolfgang Baer <WBaer@gmx.de>
58-Build-Depends: debhelper (>= 5), cdbs, ant
59-Build-Depends-Indep: junit (>= 3.7-4), default-jdk, ant-optional
60-Standards-Version: 3.7.2
61+Uploaders: Arnaud Vandyck <avdyk@debian.org>, Wolfgang Baer <WBaer@gmx.de>,
62+ Niels Thykier <niels@thykier.net>
63+Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant
64+Build-Depends-Indep: junit (>= 3.7-4), ant-optional
65+Standards-Version: 3.8.3
66+Homepage: http://www.clarkware.com/software/JUnitPerf.html
67+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/junitperf
68+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/junitperf
69
70 Package: libjunitperf-java
71 Architecture: all
72-Depends: default-jre-headless | java2-runtime-headless, junit, ${misc:Depends}
73+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless |
74+ java5-runtime-headless | java6-runtime-headless,
75+ junit, ${misc:Depends}
76 Suggests: libjunitperf-java-doc
77 Description: JUnit extensions for performance and scalability testing
78 JUnitPerf is a collection of JUnit test decorators used to measure the
79
80=== modified file 'debian/rules'
81--- debian/rules 2009-09-02 14:37:01 +0000
82+++ debian/rules 2010-05-06 20:39:26 +0000
83@@ -5,7 +5,6 @@
84
85 include /usr/share/cdbs/1/rules/debhelper.mk
86 include /usr/share/cdbs/1/class/ant.mk
87-include /usr/share/cdbs/1/rules/simple-patchsys.mk
88
89 JAVA_HOME := /usr/lib/jvm/default-java
90 ANT_HOME := /usr/share/ant
91
92=== added directory 'debian/source'
93=== added file 'debian/source/format'
94--- debian/source/format 1970-01-01 00:00:00 +0000
95+++ debian/source/format 2010-05-06 20:39:26 +0000
96@@ -0,0 +1,1 @@
97+3.0 (quilt)
98
99=== added file 'debian/watch'
100--- debian/watch 1970-01-01 00:00:00 +0000
101+++ debian/watch 2010-05-06 20:39:26 +0000
102@@ -0,0 +1,2 @@
103+version=3
104+http://clarkware.com/software/JUnitPerf.html http://www.clarkware.com/software/junitperf-([\d\.]+).zip debian uupdate

Subscribers

People subscribed via source and target branches

to all changes: