[SCM] lives/master: wrap and sort

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 04d12592352f97c0f8d50a263ceeb62e84466d89
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun May 4 02:27:48 2014 +0100

    wrap and sort
    
    Git-Dch: Ignore

diff --git a/debian/control b/debian/control
index 2d34c45..3f37817 100644
--- a/debian/control
+++ b/debian/control
@@ -171,10 +171,10 @@ Pre-Depends:
  ${misc:Pre-Depends}
 Depends:
  python3,
+ ${misc:Depends},
  ${perl:Depends},
  ${python3:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
+ ${shlibs:Depends}
 Replaces:
  lives (<< 2.2.2~ds0-4~exp1),
  lives-data (<< 2.2.2~ds0-4~exp1)
diff --git a/debian/copyright b/debian/copyright
index 4d344d4..caa75ef 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -64,7 +64,7 @@ License: GPL-1+
 Files: src/osc.h
 Copyright:
   1992-2004 The Regents of the University of California (Regents)
-  2003-2012 G. Finch 
+  2003-2012 G. Finch
 License: GPL-3+
 Comment: Some parts are based on libOSC, see the
  libosc-1 license.

-- 
lives packaging