[SCM] gmerlin/master: wrap-and-sort -a -s

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f8b680d77b5c90ac837b111f879d472a4c3fccdb
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 17:43:32 2012 +0200

    wrap-and-sort -a -s
    
    Git-Dch: Ignore

diff --git a/debian/control.in b/debian/control.in
index f13a6af..3cb7176 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -69,12 +69,15 @@ Package: gmerlin-plugins-base
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Breaks: gmerlin (<= 1.0.0~dfsg-12~)
-Replaces: gmerlin (<= 1.0.0~dfsg-12~)
+Breaks:
+ gmerlin (<= 1.0.0~dfsg-12~)
+Replaces:
+ gmerlin (<= 1.0.0~dfsg-12~)
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Enhances: gmerlin
+Enhances:
+ gmerlin
 Description: gmerlin plugins from the "base" set
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It
@@ -138,7 +141,8 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Recommends: libgmerlin-common
+Recommends:
+ libgmerlin-common
 Description: core library for gmerlin - runtime files
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It
@@ -182,8 +186,10 @@ Depends:
  libxml2-dev,
  pkg-config,
  ${misc:Depends}
-Breaks: libgmerlin-common (<= 1.0.0~dfsg-12)
-Replaces: libgmerlin-common (<= 1.0.0~dfsg-12)
+Breaks:
+ libgmerlin-common (<= 1.0.0~dfsg-12)
+Replaces:
+ libgmerlin-common (<= 1.0.0~dfsg-12)
 Description: core library for gmerlin - development files
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It
diff --git a/debian/gmerlin.install b/debian/gmerlin.install
index d927ac3..fc0b361 100644
--- a/debian/gmerlin.install
+++ b/debian/gmerlin.install
@@ -1,3 +1,3 @@
 usr/bin
-usr/share/man/man1
 usr/share/applications
+usr/share/man/man1
diff --git a/debian/libgmerlin-dev.install b/debian/libgmerlin-dev.install
index 70bec87..4129d70 100644
--- a/debian/libgmerlin-dev.install
+++ b/debian/libgmerlin-dev.install
@@ -1,5 +1,5 @@
 usr/include
-usr/lib/*/pkgconfig
 usr/lib/*/libgmerlin.so
 usr/lib/*/libgmerlin_gtk.so
+usr/lib/*/pkgconfig
 usr/share/gmerlin/plugin.sym

-- 
gmerlin packaging