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

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Mar 5 10:14:46 UTC 2012


The following commit has been merged in the master branch:
commit 8127c5e4ec712d18fca2997a222f71c032280e9d
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Mar 5 11:11:03 2012 +0100

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

diff --git a/debian/control.in b/debian/control.in
index 3e32a8b..443c1ff 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,49 +2,52 @@ Source: gmerlin-avdecoder
 Section: libs
 Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Romain Beauxis <toots at rastageeks.org>,
+Uploaders:
+ Romain Beauxis <toots at rastageeks.org>,
  Jonas Smedegaard <dr at jones.dk>,
  IOhannes m zmoelnig (gpg-key at iem) <zmoelnig at iem.at>,
  Alessio Treglia <alessio at debian.org>
 Homepage: http://gmerlin.sourceforge.net/
 Standards-Version: 3.9.2
-Build-Depends: @cdbs@,
+Build-Depends:
+ @cdbs@,
  dh-autoreconf,
  doxygen,
- libxext-dev,
- libgavl-dev (>=  1.2.0),
- libgmerlin-dev (>= 1.0.0~),
+ liba52-0.7.4-dev,
  libavcodec-dev,
  libavformat-dev,
- libpostproc-dev,
- libflac-dev,
- libtheora-dev,
- libvorbis-dev,
  libcdio-paranoia-dev,
- libtiff4-dev,
+ libdca-dev,
+ libdts-dev,
+ libdvdread-dev (>= 4.1.3),
+ libfaad-dev,
+ libflac-dev,
+ libgavl-dev (>=  1.2.0),
+ libgmerlin-dev (>= 1.0.0~),
+ libgsm1-dev,
+ libmad0-dev,
+ libmpcdec-dev,
+ libmpeg2-4-dev,
  libopenjpeg-dev,
  libpng12-dev,
+ libpostproc-dev,
+ libschroedinger-dev,
  libsmbclient-dev,
- libdca-dev,
- libmpcdec-dev,
  libspeex-dev,
- libmad0-dev,
- libmpeg2-4-dev,
- libdts-dev,
  libswscale-dev,
- libdvdread-dev (>= 4.1.3),
- libfaad-dev,
- liba52-0.7.4-dev,
+ libtheora-dev,
+ libtiff4-dev,
  libvdpau-dev,
- libschroedinger-dev,
- libgsm1-dev
+ libvorbis-dev,
+ libxext-dev
 Vcs-Git: git://git.debian.org/pkg-multimedia/gmerlin-avdecoder.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/gmerlin-avdecoder.git
 
 Package: libgmerlin-avdec1
 Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: general multimedia decoding library
  Gmerlin_avdecoder is a general purpose media decoding library. It was
  written as a support library for gmerlin, but it can also be used by other
@@ -56,9 +59,10 @@ Description: general multimedia decoding library
 Package: libgmerlin-avdec-dev
 Architecture: all
 Section: libdevel
-Depends: libgmerlin-avdec1 (>= ${source:Version}),
- libgmerlin-avdec1 (<< ${source:Upstream-Version}+1~),
+Depends:
  libgavl-dev,
+ libgmerlin-avdec1 (<< ${source:Upstream-Version}+1~),
+ libgmerlin-avdec1 (>= ${source:Version}),
  ${misc:Depends}
 Description: general multimedia decoding library (development files)
  Gmerlin_avdecoder is a general purpose media decoding library. It was
@@ -71,7 +75,8 @@ Description: general multimedia decoding library (development files)
 Package: libgmerlin-avdec-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends}
 Description: general multimedia decoding library (documentation)
  Gmerlin_avdecoder is a general purpose media decoding library. It was
  written as a support library for gmerlin, but it can also be used by other
@@ -82,7 +87,8 @@ Description: general multimedia decoding library (documentation)
 Package: gmerlin-avdecoder-dbg
 Architecture: any
 Section: debug
-Depends: libgmerlin-avdec1 (= ${binary:Version}),
+Depends:
+ libgmerlin-avdec1 (= ${binary:Version}),
  ${misc:Depends}
 Description: debugging symbols for Gmerlin_avdecoder
  Gmerlin_avdecoder is a general purpose media decoding library. It was
@@ -93,15 +99,17 @@ Description: debugging symbols for Gmerlin_avdecoder
 
 Package: gmerlin-plugins-avdecoder
 Architecture: any
-Enhances: gmerlin
-Depends: ${shlibs:Depends},
+Enhances:
+ gmerlin
+Depends:
  libgmerlin-avdec1 (= ${binary:Version}),
  libgmerlin0 (>= 1.0.0~),
- ${misc:Depends}
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: avdecoder plugins for Gmerlin
  Gmerlin_avdecoder is a general purpose media decoding library. It was
  written as a support library for gmerlin, but it can also be used by other
- applications. 
+ applications.
  .
  This package contains the decoder plugins for gmerlin that are based on
  Gmerlin_avdecoder.
diff --git a/debian/libgmerlin-avdec-dev.install b/debian/libgmerlin-avdec-dev.install
index ddc486a..d722505 100644
--- a/debian/libgmerlin-avdec-dev.install
+++ b/debian/libgmerlin-avdec-dev.install
@@ -1,3 +1,3 @@
 debian/tmp/usr/include
-debian/tmp/usr/lib/pkgconfig
 debian/tmp/usr/lib/libgmerlin_avdec.so
+debian/tmp/usr/lib/pkgconfig
diff --git a/debian/libgmerlin-avdec1.install b/debian/libgmerlin-avdec1.install
index ef31cc2..20af2b7 100644
--- a/debian/libgmerlin-avdec1.install
+++ b/debian/libgmerlin-avdec1.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/locale
 debian/tmp/usr/lib/libgmerlin_avdec.so.1*
+debian/tmp/usr/share/locale

-- 
gmerlin-avdecoder packaging



More information about the pkg-multimedia-commits mailing list