[SCM] kajongg packaging branch, master, updated. debian/4.11.3-1-3-gf9c60be

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kajongg.git;a=commitdiff;h=f9c60be

The following commit has been merged in the master branch:
commit f9c60be89a9bc4b3a560a0618898b3965762f8bd
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Jan 29 19:04:32 2014 +0100

    wrap-and-sort
---
 debian/control         | 41 ++++++++++++++++++++++-------------------
 debian/copyright       |  9 ++++-----
 debian/kajongg.install |  2 +-
 3 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/debian/control b/debian/control
index bce887a..f857ef4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,20 @@ Section: games
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Daniel Schepler <schepler at debian.org>,
- Sune Vuorela <sune at debian.org>,
- Fathi Boudra <fabo at debian.org>,
- Modestas Vainius <modax at debian.org>,
- George Kiagiadakis <gkiagiad at csd.uoc.gr>,
- Eshat Cakar <info at eshat.de>,
- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
- Maximiliano Curia <maxy at debian.org>
-Build-Depends: kdelibs5-dev (>= 4:4.11),
- libkdegames-dev (>= 4:4.11),
- kde-sc-dev-latest (>= 4:4.11),
- cmake, debhelper (>= 9), pkg-kde-tools (>= 0.14),
- python (>= 2.6.6-3~)
+           Sune Vuorela <sune at debian.org>,
+           Fathi Boudra <fabo at debian.org>,
+           Modestas Vainius <modax at debian.org>,
+           George Kiagiadakis <gkiagiad at csd.uoc.gr>,
+           Eshat Cakar <info at eshat.de>,
+           Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
+           Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake,
+               debhelper (>= 9),
+               kde-sc-dev-latest (>= 4:4.11),
+               kdelibs5-dev (>= 4:4.11),
+               libkdegames-dev (>= 4:4.11),
+               pkg-kde-tools (>= 0.14),
+               python (>= 2.6.6-3~)
 Standards-Version: 3.9.5
 X-Python-Version: >= 2.6
 Homepage: http://games.kde.org/
@@ -23,13 +25,14 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kajongg.git
 
 Package: kajongg
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends},
- kdegames-mahjongg-data (>= 4:4.10),
- python-kde4 (>= 4:4.3.0),
- python-qt4-sql (>= 4.6),
- libqt4-sql-sqlite (>= 4.6),
- python-twisted-core (>= 8.2.0),
- vorbis-tools
+Depends: kdegames-mahjongg-data (>= 4:4.10),
+         libqt4-sql-sqlite (>= 4.6),
+         python-kde4 (>= 4:4.3.0),
+         python-qt4-sql (>= 4.6),
+         python-twisted-core (>= 8.2.0),
+         vorbis-tools,
+         ${misc:Depends},
+         ${python:Depends}
 Recommends: khelpcenter4
 Description: classical Mah Jongg game
  This is the classical Mah Jongg for four players.
diff --git a/debian/copyright b/debian/copyright
index 28717da..aeda039 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -82,7 +82,7 @@ License: Expat
  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 Files: debian/*
 Copyright: 2007-2013, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
@@ -98,7 +98,7 @@ License: BSD-3-clause
  2. Redistributions in binary form must reproduce the copyright
  notice, this list of conditions and the following disclaimer in the
  documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products 
+ 3. The name of the author may not be used to endorse or promote products
  derived from this software without specific prior written permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
@@ -120,7 +120,7 @@ License: GPL-2+
  .
  This package is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
@@ -136,7 +136,7 @@ License: GPL-2
  .
  This package is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
@@ -155,4 +155,3 @@ License: GFDL-1.2+
  .
  On Debian systems, the complete text of the GNU Free Documentation
  License version 1.2 can be found in "/usr/share/common-licenses/GFDL-1.2".
-
diff --git a/debian/kajongg.install b/debian/kajongg.install
index 99a04d4..006df05 100644
--- a/debian/kajongg.install
+++ b/debian/kajongg.install
@@ -14,5 +14,5 @@ usr/share/icons/hicolor/scalable/actions/games-kajongg-law.svgz
 usr/share/icons/hicolor/scalable/apps/kajongg.svgz
 usr/share/kde4/apps/kajongg/*.py
 usr/share/kde4/apps/kajongg/*.ui
-usr/share/kde4/apps/kajongg/voices/*
 usr/share/kde4/apps/kajongg/kajonggui.rc
+usr/share/kde4/apps/kajongg/voices/*

-- 
kajongg packaging