[SCM] jenkins-xstream packaging branch, master, updated. debian/1.3.1-jenkins-9-2-2-g4ade924
James Page
james.page at ubuntu.com
Wed Jun 20 13:34:06 UTC 2012
The following commit has been merged in the master branch:
commit 4ade9240e99661d426258f35e142821b0860b11d
Author: James Page <james.page at ubuntu.com>
Date: Wed Jun 20 14:28:24 2012 +0100
Bumped Standards-Version to 3.9.3:
* Bumped Standards-Version to 3.9.3:
- d/copyright: Reference released version of DEP-5.
diff --git a/debian/changelog b/debian/changelog
index 3be9fa9..2855b52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-jenkins-xstream (1.3.1-jenkins-9-2ubuntu1) quantal; urgency=low
+jenkins-xstream (1.3.1-jenkins-9-3) unstable; urgency=low
* Fix FTBFS with openjdk-7 as default-jdk (LP: #888948):
- d/patches/java7-compat.patch: Add additional profile for Java 7
to ensure that xstream module is built.
* d/rules: Remove surplus maven artifact handling.
+ * Bumped Standards-Version to 3.9.3:
+ - d/copyright: Reference released version of DEP-5.
-- James Page <james.page at ubuntu.com> Tue, 12 Jun 2012 22:06:19 +0100
diff --git a/debian/control b/debian/control
index 407807f..3ea6bf2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,7 @@
Source: jenkins-xstream
Section: java
Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: James Page <james.page at ubuntu.com>
DM-Upload-Allowed: yes
Build-Depends:
@@ -36,7 +35,7 @@ Build-Depends-Indep:
libxerces2-java,
libxom-java,
libxpp3-java
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: https://github.com/jenkinsci/xstream
Vcs-Git: git://git.debian.org/git/pkg-java/jenkins-xstream.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/jenkins-xstream.git
diff --git a/debian/copyright b/debian/copyright
index 925a5ea..8fc01a7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
Upstream-Name: Jenkins fork of XStream
Source: https://github.com/jenkinsci/xstream
diff --git a/debian/patches/java7-compat.patch b/debian/patches/java7-compat.patch
index d7da7e7..38a33a7 100644
--- a/debian/patches/java7-compat.patch
+++ b/debian/patches/java7-compat.patch
@@ -1,3 +1,7 @@
+Description: Add a profile for compilation with Java 7
+Author: James Page <james.page at ubuntu.com>
+Forwarded: no
+
Index: jenkins-xstream/pom.xml
===================================================================
--- jenkins-xstream.orig/pom.xml 2012-06-12 22:00:53.775305000 +0100
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index f4959cf..0000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# Version contains hu(ds)on which generates a false positive
-jenkins-xstream source: debian-watch-file-should-mangle-version line 3
-
--
jenkins-xstream packaging
More information about the pkg-java-commits
mailing list