[jakarta-jmeter] 19/60: Added a patch to compile against Bouncy Castle 1.48

[Emmanuel Bourg]

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

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

commit 36a662d38662e3b3a97eebcc1be401bb69be42fe
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Mar 30 22:39:30 2013 +0000

    Added a patch to compile against Bouncy Castle 1.48
---
 debian/changelog      | 11 +++++++++++
 debian/control        |  7 +++----
 debian/patches/series |  1 +
 debian/watch          |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63e8826..61e980b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+jakarta-jmeter (2.5.1-2) experimental; urgency=low
+
+  * Team upload.
+  * Patched to compile against Bouncy Castle 1.48
+  * debian/watch: Updated the location of the archives following
+    the graduation of JMeter to a top level project.
+  * Removed the DMUA flag
+  * Bump standards version to 3.9.4. No changes needed.
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sat, 30 Mar 2013 23:34:00 +0100
+
 jakarta-jmeter (2.5.1-1) unstable; urgency=low
 
   * New upstream release. (Closes: #641546, LP: #879463)
diff --git a/debian/control b/debian/control
index 3d95548..603da1e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,13 @@ Source: jakarta-jmeter
 Section: net
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>
+Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>, Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>=5), cdbs, javahelper, ant, ant-optional
-Build-Depends-Indep: default-jdk, default-jdk-doc, junit4, libavalon-framework-java, libbcmail-java, libbcprov-java, libbsf-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-io-java, libcommons-jexl-java (>= 1.1), libcommons-lang-java, libcommons-net-java, libgeronimo-activation-1.1-spec-java, libgeronimo-javamail-1.4-spec-java, libgeronimo-jms-1.1-spec-java, libhtmlparser-java, libhttpclient-java, libhttpmime-java, libjcharts-java, libjdom1-java, libjtidy-java,  [...]
-Standards-Version: 3.9.3
+Build-Depends-Indep: default-jdk, default-jdk-doc, junit4, libavalon-framework-java, libbcmail-java, libbcprov-java (>= 1.48), libbsf-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-io-java, libcommons-jexl-java (>= 1.1), libcommons-lang-java, libcommons-net-java, libgeronimo-activation-1.1-spec-java, libgeronimo-javamail-1.4-spec-java, libgeronimo-jms-1.1-spec-java, libhtmlparser-java, libhttpclient-java, libhttpmime-java, libjcharts-java, libjdom1-java, libjt [...]
+Standards-Version: 3.9.4
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/jakarta-jmeter/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/jakarta-jmeter/
 Homepage: http://jmeter.apache.org/
-DM-Upload-Allowed: yes
 
 Package: jmeter
 Architecture: all
diff --git a/debian/patches/series b/debian/patches/series
index 3f1c709..1150bc0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 02_disable_components.patch
+03_bouncycastle_update.patch
diff --git a/debian/watch b/debian/watch
index 93811b8..8d13a19 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://archive.apache.org/dist/jakarta/jmeter/source/jakarta-jmeter-([\d\.]+)_src\.tgz debian debian/orig-tar.sh
+http://archive.apache.org/dist/jmeter/source/apache-jmeter-([\d\.]+)_src\.tgz debian debian/orig-tar.sh

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