[SCM] triplea packaging branch, master, updated. debian/1.3.2.2-1-2-gd57c0fa

[Scott Howard]

The following commit has been merged in the master branch:
commit e3da16350907b7da095cb768f872d7daa2420d6c
Author: Scott Howard <showard at debian.org>
Date:   Mon Nov 14 21:51:48 2011 -0500

    added set look and feel support

diff --git a/debian/changelog b/debian/changelog
index 2d63bfb..b1c99a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+triplea (1.3.2.2-2) unstable; urgency=low
+
+  * Enabled "Set look and feel" option from menu. Thanks to Jerome Robert
+    (Closes: #648716)
+    - Recommends: substance, liblaf-plugin-java, liblaf-widget-java and
+      removed substance from B-D. triplea will run without recommended
+      packages, but will throw an error if you try to "Set look and feel".
+      Play resumes normally after error.
+
+ -- Scott Howard <showard at debian.org>  Mon, 14 Nov 2011 21:45:33 -0500
+
 triplea (1.3.2.2-1) unstable; urgency=low
 
   * Initial release. (Closes: #648444) (LP: #126069)
diff --git a/debian/control b/debian/control
index 396bd22..6a27a44 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Scott Howard <showard at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), default-jdk, javahelper (>= 0.37),
  ant, libcommons-httpclient-java, libcommons-logging-java,
- libcommons-codec-java, substance, junit, imagemagick
+ libcommons-codec-java, junit
 Standards-Version: 3.9.2
 Homepage: http://triplea.sourceforge.net
 Vcs-Git: git://anonscm.debian.org/pkg-java/triplea.git
@@ -14,7 +14,8 @@ Vcs-browser: http://anonscm.debian.org/gitweb/?p=pkg-java/triplea.git
 Package: triplea
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}
-Recommends: ${java:Recommends}
+Recommends: ${java:Recommends}, substance, liblaf-plugin-java,
+ liblaf-widget-java
 Description: Turn based strategy game
  TripleA is a turn based strategy game. TripleA comes with multiple
  games and over 100 more games can be downloaded from the user
diff --git a/debian/rules b/debian/rules
index d5b133f..b4a7500 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 export JAVA_HOME=/usr/lib/jvm/default-java
 
 # Put depended upon jars in here
-export CLASSPATH=/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-logging.jar:/usr/share/java/commons-codec.jar:/usr/share/java/substance.jar
+export CLASSPATH=/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-logging.jar:/usr/share/java/commons-codec.jar:/usr/share/java/substance.jar:/usr/share/java/laf-widget.jar
 
 %:
 	dh --with javahelper $@

-- 
triplea packaging