[beansbinding] 01/01: merge local work with unpublished changes in beansbinding.git

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository beansbinding.

commit 92ac5fd36bf09ad2d2659988897ee17e0286229a
Author: tony mancill <tmancill at debian.org>
Date:   Sun Mar 26 10:25:59 2017 -0700

    merge local work with unpublished changes in beansbinding.git
    
    - Update doc-base to Programming/Java
    - Add Build-Dep on maven-repo-helper
    - Update Vcs URLs and Homepage
    - Use debhelper 10
    - Bump Standards-Version to 3.9.8.
    - Add myself to Uploaders
---
 debian/changelog                         | 12 ++++++++++--
 debian/compat                            |  2 +-
 debian/control                           | 15 ++++++++-------
 debian/libbeansbinding-java-doc.doc-base |  2 +-
 debian/pom.xml                           |  7 +++++++
 debian/rules                             |  3 ++-
 6 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4642cc7..2a18554 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-beansbinding (1.2.1-2~ppa1) UNRELEASED; urgency=low
+beansbinding (1.2.1-2) UNRELEASED; urgency=medium
 
   [ Andres Mejia ]
   * Update to my @debian.org email.
@@ -7,7 +7,15 @@ beansbinding (1.2.1-2~ppa1) UNRELEASED; urgency=low
   [ Andrew Ross ]
   * Install maven pom.
 
- -- Andres Mejia <amejia at debian.org>  Sun, 17 Jul 2011 13:03:45 -0400
+  [ tony mancill ]
+  * Tweak maven metadata and build-dep on maven-repo-helper
+  * Bump Standards-Version to 3.9.8.
+  * Use debhelper 10.
+  * Update Vcs URLs and Homepage.
+  * Correct doc-base to be Programming/Java.
+  * Add myself to Uploaders.
+
+ -- tony mancill <tmancill at debian.org>  Sat, 25 Mar 2017 22:07:57 -0700
 
 beansbinding (1.2.1-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+10
diff --git a/debian/control b/debian/control
index 9f7909e..38fcbd3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,14 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Marek Slama <marek.slama at sun.com>,
- Andres Mejia <amejia at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), ant, default-jdk,
- javahelper (>= 0.40ubuntu1), maven-repo-helper (>= 1.6~)
-Standards-Version: 3.9.1
-Homepage: http://beansbinding.dev.java.net/
-Vcs-Browser: http://anonscm.debian.org/git/pkg-java/beansbinding.git
-Vcs-Git: git://anonscm.debian.org/pkg-java/beansbinding.git
+ Andres Mejia <amejia at debian.org>,
+ tony mancill <tmancill at debian.org>
+Build-Depends: debhelper (>= 10), javahelper, ant, default-jdk,
+ maven-repo-helper
+Standards-Version: 3.9.8
+Homepage: https://java.net/projects/beansbinding
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/tomcat8.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/tomcat8.git
 
 Package: libbeansbinding-java
 Architecture: all
diff --git a/debian/libbeansbinding-java-doc.doc-base b/debian/libbeansbinding-java-doc.doc-base
index 5c97af4..adf0da6 100644
--- a/debian/libbeansbinding-java-doc.doc-base
+++ b/debian/libbeansbinding-java-doc.doc-base
@@ -2,7 +2,7 @@ Document: libbeansbinding-java-doc
 Title: Beans Binding (JSR 295) API
 Author: Sun Microsystems, Inc.
 Abstract: This is the API documentation for Beans Binding (JSR 295).
-Section: Java
+Section: Programming/Java
 
 Format: HTML
 Index: /usr/share/doc/libbeansbinding-java-doc/api/index.html
diff --git a/debian/pom.xml b/debian/pom.xml
index 7ef1571..22d89a0 100644
--- a/debian/pom.xml
+++ b/debian/pom.xml
@@ -12,4 +12,11 @@
     easy integration with IDEs such as NetBeans. This project provides
     the reference implementation.
   </description>
+  <url>https://java.net/projects/beansbinding</url>
+  <licenses>
+    <license>
+      <name>LGPL 2.1</name>
+      <url>https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url>
+    </license>
+  </licenses>
 </project>
diff --git a/debian/rules b/debian/rules
index 026a279..1cb832c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export JAVA_HOME=/usr/lib/jvm/default-java
+VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed -r 's/^.*:\ ([0-9\.]+)(-|\+).*/\1/')
 
 %:
 	dh $@ --with javahelper --with jh_maven_repo_helper
@@ -9,4 +10,4 @@ override_dh_auto_build:
 	ant -f build.xml dist
 
 override_jh_installlibs:
-	jh_installlibs --upstream-version=1.2.1
+	jh_installlibs --upstream-version=$(VERSION)

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