[SCM] smplayer/master: Wrap and sort

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 69e76c2a25af38d3c3ccd1344c743cb8d657ff51
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Feb 16 11:36:41 2012 +0100

    Wrap and sort
    
    Git-Dch: Ignore

diff --git a/debian/control b/debian/control
index 665e6fc..de53145 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,11 @@ DM-Upload-Allowed: yes
 
 Package: smplayer
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}, mplayer
-Recommends: smplayer-translations, smplayer-themes
+Depends: mplayer,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: smplayer-themes,
+            smplayer-translations
 Description: complete front-end for MPlayer
  Qt Mplayer front-end, with basic features like playing
  videos, DVDs, and VCDs to more advanced features like support
@@ -30,8 +32,8 @@ Description: complete front-end for MPlayer
 
 Package: smplayer-translations
 Architecture: all
-Depends: ${misc:Depends},
-         smplayer (>= ${source:Version})
+Depends: smplayer (>= ${source:Version}),
+         ${misc:Depends}
 Replaces: smplayer (<< 0.5.62)
 Description: complete front-end for MPlayer - translation files
  Qt Mplayer front-end, with basic features like playing
diff --git a/debian/copyright b/debian/copyright
index 6789755..fe254aa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -45,7 +45,7 @@ src/myslider.cpp, src/myslider.h:
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public 
+    You should have received a copy of the GNU Lesser General Public
     License along with this library.  If not, see http://www.gnu.org/licenses/.
 
 On Debian GNU/Linux systems, the complete text of the GNU Lesser General
@@ -59,12 +59,12 @@ src/verticaltext.cpp, src/verticaltext.h:
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
-  
+
    This program 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 GNU
    Library General Public License for more details.
-  
+
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the
    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
@@ -75,7 +75,7 @@ src/findsubtitles/filedownloader/main.cpp:
    Copyright © 2004-2008 Trolltech ASA.
 
    This file is part of the example classes of the Qt Toolkit.
-  
+
    This file may be used under the terms of the GNU General Public
    License versions 2.0 or 3.0 as published by the Free Software
    Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
@@ -88,7 +88,7 @@ src/findsubtitles/filedownloader/main.cpp:
    Exception version 1.2, which can be found at
    http://www.trolltech.com/products/qt/gplexception/ and in the file
    GPL_EXCEPTION.txt in this package.
-  
+
    Please review the following information to ensure GNU General
    Public Licensing requirements will be met:
    http://trolltech.com/products/qt/licenses/licensing/opensource/. If
@@ -96,18 +96,18 @@ src/findsubtitles/filedownloader/main.cpp:
    review the following information:
    http://trolltech.com/products/qt/licenses/licensing/licensingoverview
    or contact the sales department at sales at trolltech.com.
-  
+
    In addition, as a special exception, Trolltech, as the sole
    copyright holder for Qt Designer, grants users of the Qt/Eclipse
    Integration plug-in the right for the Qt/Eclipse Integration to
    link to functionality provided by Qt Designer and its related
    libraries.
-  
+
    This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
    INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
    A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
    granted herein.
-  
+
    This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -161,7 +161,7 @@ src/findsubtitles/quazip/unzip.c:
 src/findsubtitles/quazip/unzip.h:
 src/findsubtitles/quazip/zip.h:
    Copyright © 1998-2005 Gilles Vollant
-   
+
    Condition of use and distribution are the same than zlib :
 
   This software is provided 'as-is', without any express or implied
diff --git a/debian/smplayer.install b/debian/smplayer.install
index fb27599..7786fc5 100644
--- a/debian/smplayer.install
+++ b/debian/smplayer.install
@@ -1,7 +1,7 @@
-smplayer*.desktop usr/share/applications
 debian/smplayer.xpm usr/share/pixmaps
 debian/tmp/usr/bin/smplayer
 debian/tmp/usr/share/icons
 debian/tmp/usr/share/man
-debian/tmp/usr/share/smplayer/shortcuts
 debian/tmp/usr/share/smplayer/input.conf
+debian/tmp/usr/share/smplayer/shortcuts
+smplayer*.desktop usr/share/applications

-- 
smplayer packaging