[SCM] triplea packaging branch, master, updated. upstream/1.3.2.2-3-g06fd104

[Scott Howard]

The following commit has been merged in the master branch:
commit 06fd104c29bd443f9f82ad788787aad27c8f8899
Author: Scott Howard <showard at debian.org>
Date:   Fri Nov 11 10:06:18 2011 -0500

    added more packaging files

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..fcfc504
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+triplea
+triplea-server
+debian/triplea.xpm
diff --git a/debian/control b/debian/control
index 16ec308..153051c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: 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
+ libcommons-codec-java, substance, junit, imagemagick
 Standards-Version: 3.9.2
 Homepage: http://triplea.sourceforge.net
 
@@ -12,7 +12,7 @@ Package: triplea
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}
 Recommends: ${java:Recommends}
-Description: World War II turn based strategy game
+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
  community. Supports single player vs AI, hot-seat, Play by Email,
diff --git a/debian/copyright b/debian/copyright
index 6d23bbd..0401fc6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -395,7 +395,7 @@ License: Sun Public License 1.0
  	which have been validly granted by You or any distributor hereunder 
  	prior to termination shall survive termination.
  .
-9. LIMITATION OF LIABILITY. 
+ 9. LIMITATION OF LIABILITY. 
  .
  	UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT 
  	(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL 
@@ -412,7 +412,7 @@ License: Sun Public License 1.0
  	EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO 
  	THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
  .
-10. U.S. GOVERNMENT END USERS. 
+ 10. U.S. GOVERNMENT END USERS. 
  .
  	The Covered Code is a "commercial item," as that term is defined in 48 
  	C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" 
@@ -422,7 +422,7 @@ License: Sun Public License 1.0
  	U.S. Government End Users acquire Covered Code with only those rights 
  	set forth herein.
  .
-11. MISCELLANEOUS. 
+ 11. MISCELLANEOUS. 
  .
  	This License represents the complete agreement concerning subject 
  	matter hereof. If any provision of this License is held to be 
@@ -443,7 +443,7 @@ License: Sun Public License 1.0
  	shall be construed against the drafter shall not apply to this 
  	License.
  .
-12. RESPONSIBILITY FOR CLAIMS. 
+ 12. RESPONSIBILITY FOR CLAIMS. 
  .
  	As between Initial Developer and the Contributors, each party is 
  	responsible for claims and damages arising, directly or indirectly, 
@@ -452,7 +452,7 @@ License: Sun Public License 1.0
  	responsibility on an equitable basis. Nothing herein is intended or 
  	shall be deemed to constitute any admission of liability.
  .
-13. MULTIPLE-LICENSED CODE. 
+ 13. MULTIPLE-LICENSED CODE. 
  .
  	Initial Developer may designate portions of the Covered Code as 
  	?Multiple-Licensed?. ?Multiple-Licensed? means that the Initial 
diff --git a/debian/rules b/debian/rules
index af4fad2..ee5fbe0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,5 +14,25 @@ override_dh_install:
 	dh_install
 	-rm triplea-server triplea
 
+override_dh_clean:
+	find debian -name *.png -delete
+	dh_clean
+
+override_dh_installchangelogs:
+	dh_installchangelogs changelog.txt
+
+override_dh_auto_configure:
+	dh_auto_configure
+	convert icons/triplea_icon.png -resize 48x48 debian/icons/48x48/apps/triplea.png
+	convert icons/triplea_icon.png -resize 64x64 debian/icons/64x64/apps/triplea.png
+	convert icons/triplea_icon.png -resize 72x72 debian/icons/72x72/apps/triplea.png
+	convert icons/triplea_icon.png -resize 96x96 debian/icons/96x96/apps/triplea.png
+	convert icons/triplea_icon.png -resize 128x128 debian/icons/128x128/apps/triplea.png
+	convert icons/triplea_icon.png -resize 192x192 debian/icons/192x192/apps/triplea.png
+	cp icons/triplea_icon.png debian/icons/256x256/apps/triplea.png
+	convert icons/triplea_icon.png -resize 32x32 debian/triplea.xpm
+
+
+
 get-orig-source:
 	uscan --rename --repack --download-current-version
diff --git a/debian/triplea-server.6 b/debian/triplea-server.6
new file mode 100644
index 0000000..649c1cf
--- /dev/null
+++ b/debian/triplea-server.6
@@ -0,0 +1,14 @@
+.\" Manpage for triplea-server
+.TH TRIPLEA-SERVER 6 "11 Nov 2011"
+.SH NAME
+triplea-server \- server for turn based strategy game
+.SH SYNOPSIS
+triplea-server
+.SH DESCRIPTION
+TripleA is a turn based strategy game. TripleA comes with multiple games and over 100 more games can be downloaded from the user community. Supports single player vs AI, hot-seat, Play by Email, and a hosted online lobby. This command starts a server for multiplayer games.
+.SH OPTIONS
+The triplea-server command does not take any options.
+.SH SEE ALSO
+triplea(6), /usr/share/doc/triplea
+.SH AUTHOR
+TripleA Developers (triplea-developers at lists.sourceforge.net)
diff --git a/debian/triplea.6 b/debian/triplea.6
new file mode 100644
index 0000000..60a4cae
--- /dev/null
+++ b/debian/triplea.6
@@ -0,0 +1,14 @@
+.\" Manpage for triplea.
+.TH TRIPLEA 6 "11 Nov 2011"
+.SH NAME
+triplea \- turn based strategy game
+.SH SYNOPSIS
+triplea
+.SH DESCRIPTION
+TripleA is a turn based strategy game. TripleA comes with multiple games and over 100 more games can be downloaded from the user community. Supports single player vs AI, hot-seat, Play by Email, and a hosted online lobby.
+.SH OPTIONS
+The triplea command does not take any options.
+.SH SEE ALSO
+triplea-server(6), /usr/share/doc/triplea
+.SH AUTHOR
+TripleA Developers (triplea-developers at lists.sourceforge.net)
diff --git a/debian/triplea.desktop b/debian/triplea.desktop
new file mode 100644
index 0000000..b0f7f24
--- /dev/null
+++ b/debian/triplea.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=TripleA
+Comment=Turn based strategy war game
+TryExec=triplea
+Exec=triplea
+Icon=triplea
+Categories=Game;StrategyGame;BoardGame;
diff --git a/debian/triplea.install b/debian/triplea.install
index 252e853..0c00c5c 100644
--- a/debian/triplea.install
+++ b/debian/triplea.install
@@ -1,9 +1,11 @@
 bin/* usr/share/triplea/bin
-doc/* usr/share/triplea/doc
+doc/* usr/share/doc/triplea/doc
 dice_servers/* usr/share/triplea/dice_servers
 icons/* usr/share/triplea/icons
 images/* usr/share/triplea/images
 maps/* usr/share/triplea/maps
-readme.html usr/share/triplea
+readme.html usr/share/doc/triplea
 triplea usr/games
-triplea-server usr/games
+debian/icons/* usr/share/icons/hicolor
+debian/triplea.desktop usr/share/applications
+debian/triplea.xpm usr/share/pixmaps
diff --git a/debian/triplea.links b/debian/triplea.links
new file mode 100644
index 0000000..59f6bd4
--- /dev/null
+++ b/debian/triplea.links
@@ -0,0 +1,2 @@
+usr/share/doc/triplea/readme.html usr/share/triplea/readme.html
+usr/share/doc/triplea/doc usr/share/triplea/doc
diff --git a/debian/triplea.manpages b/debian/triplea.manpages
new file mode 100644
index 0000000..21cb294
--- /dev/null
+++ b/debian/triplea.manpages
@@ -0,0 +1 @@
+debian/triplea.6
diff --git a/debian/triplea.menu b/debian/triplea.menu
new file mode 100644
index 0000000..00c43b2
--- /dev/null
+++ b/debian/triplea.menu
@@ -0,0 +1,4 @@
+?package(triplea):needs="X11" \
+        section="Games/Strategy"\
+        title="triplea" command="/usr/games/triplea"\
+        icon="/usr/share/pixmaps/triplea.xpm"

-- 
triplea packaging