[SCM] libjgoodies-forms-java packaging branch, experimental, updated. debian/1.6.0-1-1-g0681a63

[tony mancill]

The following commit has been merged in the experimental branch:
commit 0681a636ab535b9c9b431b564112c438ca910f5c
Author: tony mancill <tmancill at debian.org>
Date:   Tue Nov 27 23:47:38 2012 -0800

    add missing build-dep; add classpath

diff --git a/debian/changelog b/debian/changelog
index 80eefa3..bd4e8b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libjgoodies-forms-java (1.6.0-2) experimental; urgency=low
+
+  * Add missing build-dep for libjgoodies-common-java.
+    Add DEP3 header to upstream_pom.patch.
+    Update libjgoodies-forms-java-doc long description.
+    - Thank you to Per W. for the patch. (Closes: #694533)
+  * Add build-dep on javahelper to set classpath.
+
+ -- tony mancill <tmancill at debian.org>  Tue, 27 Nov 2012 23:39:30 -0800
+
 libjgoodies-forms-java (1.6.0-1) experimental; urgency=low
 
   * New upstream release (Closes: #690223)
diff --git a/debian/control b/debian/control
index ec3ee5f..803a56a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,9 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>, Varun Hiremath <varun at debian.org>
  , tony mancill <tmancill at debian.org>
 Build-Depends: debhelper (>= 8), cdbs, default-jdk,
- maven-debian-helper (>= 1.5)
+ maven-debian-helper (>= 1.5), javahelper
 Build-Depends-Indep: antlr, default-jdk-doc, junit4,
- libmaven-javadoc-plugin-java
+ libmaven-javadoc-plugin-java, libjgoodies-common-java (>= 1.4.0)
 Standards-Version: 3.9.4
 Homepage: http://www.jgoodies.com/freeware/forms/
 Vcs-Git: git://git.debian.org/git/pkg-java/libjgoodies-forms-java.git
@@ -32,7 +32,7 @@ Description: Framework to lay out and implement elegant Swing panels
   * Easy to work with and quite easy to learn
   * Faster UI production
   * Better UI code readability
-  * Leads to better style guide compliance 
+  * Leads to better style guide compliance
 
 Package: libjgoodies-forms-java-doc
 Section: doc
@@ -53,4 +53,6 @@ Description: Documentation for libjgoodies-forms-java
   * Easy to work with and quite easy to learn
   * Faster UI production
   * Better UI code readability
-  * Leads to better style guide compliance 
+  * Leads to better style guide compliance
+ .
+ This package contains only documentation.
diff --git a/debian/libjgoodies-forms-java.classpath b/debian/libjgoodies-forms-java.classpath
new file mode 100644
index 0000000..7161bb6
--- /dev/null
+++ b/debian/libjgoodies-forms-java.classpath
@@ -0,0 +1 @@
+usr/share/java/jgoodies-forms.jar /usr/share/java/jgoodies-common.jar
diff --git a/debian/patches/upstream_pom.patch b/debian/patches/upstream_pom.patch
index c2dadfb..1f4ade6 100644
--- a/debian/patches/upstream_pom.patch
+++ b/debian/patches/upstream_pom.patch
@@ -1,3 +1,8 @@
+Description: jgoodies-common is required at compile time, not
+ just at runtime.  The patch corrects the scope in the upstream pom.xml.
+Origin: other
+Author: tony mancill <tmancill at debian.org>
+Last-Update: 2012-11-27
 --- a/pom.xml
 +++ b/pom.xml
 @@ -15,7 +15,7 @@
diff --git a/debian/rules b/debian/rules
index 5e7ef62..4fc10f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,11 @@
 # debian/rules for Commons Fileupload (uses CDBS)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/javahelper.mk
 include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
+CLASSPATH := /usr/share/jgoodies-common.jar
 
 install/libjgoodies-forms-java::
 	dh_link /usr/share/java/jgoodies-forms.jar /usr/share/java/forms.jar

-- 
libjgoodies-forms-java packaging