[freecol] 76/125: wrap-and-sort -sa.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository freecol.

commit 9ad44bd36043957fc0f03d218618299b169f1758
Author: Markus Koschany <apo at debian.org>
Date:   Sat Dec 19 21:02:05 2015 +0100

    wrap-and-sort -sa.
    
    Use only Build-Depends field.
---
 debian/control         | 9 ++++-----
 debian/dirs            | 6 +++---
 debian/docs            | 2 +-
 debian/freecol.install | 2 +-
 debian/manpages        | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index 04f7381..c6c8f99 100644
--- a/debian/control
+++ b/debian/control
@@ -7,18 +7,17 @@ Uploaders:
  Markus Koschany <apo at debian.org>
 Build-Depends:
  ant,
- debhelper (>= 9),
- default-jdk
-Build-Depends-Indep:
  ant-optional,
+ debhelper (>= 9),
+ default-jdk,
  javahelper,
  libcommons-cli-java,
  libcortado-java,
  libmiglayout-java,
  tex4ht,
  texlive-binaries | texlive-base-bin,
- texlive-latex-recommended,
- texlive-fonts-recommended
+ texlive-fonts-recommended,
+ texlive-latex-recommended
 Standards-Version: 3.9.6
 Homepage: http://www.freecol.org
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/freecol.git
diff --git a/debian/dirs b/debian/dirs
index 1399945..028a595 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,4 +1,4 @@
-usr/share/java
-usr/share/games/freecol
 usr/share/applications
-usr/share/pixmaps
\ No newline at end of file
+usr/share/games/freecol
+usr/share/java
+usr/share/pixmaps
diff --git a/debian/docs b/debian/docs
index a2e72b6..1dd9100 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,3 @@
+doc/FreeCol.html
 doc/FreeCol.pdf
 doc/images
-doc/FreeCol.html
\ No newline at end of file
diff --git a/debian/freecol.install b/debian/freecol.install
index 415e651..4a1d93f 100644
--- a/debian/freecol.install
+++ b/debian/freecol.install
@@ -1,5 +1,5 @@
 data/* usr/share/games/freecol
+data/freecol.png usr/share/pixmaps
 debian/freecol.desktop usr/share/applications
 debian/wrapper/freecol usr/games
 freecol.xpm usr/share/pixmaps
-data/freecol.png usr/share/pixmaps
diff --git a/debian/manpages b/debian/manpages
index 2186e50..35fbed0 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1 +1 @@
-packaging/debian/freecol.6
\ No newline at end of file
+packaging/debian/freecol.6

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