[megaglest] 71/143: wrap-and-sort -s

[Markus Koschany]

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

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

commit 8446042baa0d023d7e743bcefceff1f84438bdef
Author: Paul Wise <pabs at debian.org>
Date:   Thu Nov 15 01:54:25 2012 +0000

    wrap-and-sort -s
---
 debian/changelog |  1 +
 debian/control   |  2 +-
 debian/copyright | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 444fe09..9618de1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ megaglest (3.7.0-1) experimental; urgency=low
 
   [ Paul Wise ]
   * Upstream switched away from luajit, change build-deps
+  * wrap-and-sort -s
 
  -- Mark Vejvoda <mark_vejvoda at hotmail.com>  Mon, 29 Oct 2012 12:30:18 +0800
 
diff --git a/debian/control b/debian/control
index 1a439c7..2282366 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends:
  cmake,
  debhelper (>= 7.0.50~),
  help2man,
- vlc,
  libcurl4-gnutls-dev | libcurl4-nss-dev,
  libfontconfig1-dev,
  libftgl-dev,
@@ -29,6 +28,7 @@ Build-Depends:
  libxerces-c2-dev,
  libxml2-dev,
  libz-dev,
+ vlc,
  xauth,
  xvfb
 Standards-Version: 3.9.3
diff --git a/debian/copyright b/debian/copyright
index 833a1aa..ad1ca64 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,11 +27,11 @@ License: GPL-3+
 Files: source/shared_lib/sources/platform/win32/glob.cpp source/shared_lib/include/platform/win32/glob.h
 Copyright: Copyright 2002-2010 Matthew Wilson and Synesis Software
 License: BSD-2-clause
- * Redistribution and use in source and binary forms, with or without 
+ * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * - Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer. 
+ *   list of conditions and the following disclaimer.
  * - Redistributions in binary form must reproduce the above copyright notice,
  *   this list of conditions and the following disclaimer in the documentation
  *   and/or other materials provided with the distribution.
@@ -104,7 +104,7 @@ License: BSL-1.0
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
-Files: source/shared_lib/sources/streflop/libm/flt-32/s_llroundf.cpp 
+Files: source/shared_lib/sources/streflop/libm/flt-32/s_llroundf.cpp
        source/shared_lib/sources/streflop/libm/flt-32/s_lrintf.cpp
        source/shared_lib/sources/streflop/libm/flt-32/s_roundf.cpp
        source/shared_lib/sources/streflop/libm/flt-32/s_lroundf.cpp
@@ -136,8 +136,8 @@ License: BSD-2-clause
         notice, this list of conditions and the following disclaimer in the
         documentation and/or other materials provided with the distribution.
  .
-     3. The names of its contributors may not be used to endorse or promote 
-        products derived from this software without specific prior written 
+     3. The names of its contributors may not be used to endorse or promote
+        products derived from this software without specific prior written
         permission.
  .
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

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