[SCM] mpg123/master: wrap-and-sort -a -s
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Tue Mar 27 09:50:39 UTC 2012
The following commit has been merged in the master branch:
commit ba0419d56dde54a3a06b37bb5523b6a99b663f4c
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Mar 27 11:50:19 2012 +0200
wrap-and-sort -a -s
Git-Dch: Ignore
diff --git a/debian/control b/debian/control
index 84d41c4..a0cd344 100644
--- a/debian/control
+++ b/debian/control
@@ -5,21 +5,45 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
Uploaders:
Alessio Treglia <alessio at debian.org>
Standards-Version: 3.8.4
-Build-Depends: debhelper (>> 5), autotools-dev, autoconf, automake, pkg-config, libltdl-dev, libesd0-dev, libaudio-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libjack-dev, libpulse-dev [!hurd-i386], python-minimal
+Build-Depends:
+ autoconf,
+ automake,
+ autotools-dev,
+ debhelper (>> 5),
+ libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libaudio-dev,
+ libesd0-dev,
+ libjack-dev,
+ libltdl-dev,
+ libpulse-dev [!hurd-i386],
+ pkg-config,
+ python-minimal
Vcs-Git: git://anonscm.debian.org/pkg-multimedia/mpg123.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/mpg123.git
Package: mpg123
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: ${shlibs:Recommends}, ${plugin:Recommends}
-Suggests: ${shlibs:Suggests}
-Provides: mp3-decoder, mpg123-oss-3dnow
-Replaces: mpg123-oss-3dnow, mpg123-alsa, mpg123-esd, mpg123-nas, mpg123-oss-i486
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends:
+ ${plugin:Recommends},
+ ${shlibs:Recommends}
+Suggests:
+ ${shlibs:Suggests}
+Provides:
+ mp3-decoder,
+ mpg123-oss-3dnow
+Replaces:
+ mpg123-alsa,
+ mpg123-esd,
+ mpg123-nas,
+ mpg123-oss-3dnow,
+ mpg123-oss-i486
Description: MPEG layer 1/2/3 audio player
Mpg123 is a fast and portable MPEG audio player for Unix. It supports
MPEG 1.0/2.0 layers 1, 2 and 3 (those famous "mp3" files).
- .
+ .
For full CD quality playback (44 kHz, 16 bit, stereo) a Pentium,
SPARCstation10, DEC Alpha or similar CPU is required. Mono and/or reduced
quality playback (22 kHz or 11 kHz) is even possible on 486 CPUs.
@@ -32,11 +56,13 @@ Description: MPEG layer 1/2/3 audio player
Package: libmpg123-0
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: MPEG layer 1/2/3 audio decoder -- runtime library
Mpg123 is a fast and portable MPEG audio decoder for Unix. It supports
MPEG 1.0/2.0 layers 1, 2 and 3 (those famous "mp3" files).
- .
+ .
For full CD quality playback (44 kHz, 16 bit, stereo) a Pentium,
SPARCstation10, DEC Alpha or similar CPU is required. Mono and/or reduced
quality playback (22 kHz or 11 kHz) is even possible on 486 CPUs.
@@ -47,11 +73,14 @@ Description: MPEG layer 1/2/3 audio decoder -- runtime library
Package: libmpg123-dev
Architecture: any
Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmpg123-0 (= ${binary:Version})
+Depends:
+ libmpg123-0 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: MPEG layer 1/2/3 audio decoder -- development files
Mpg123 is a fast and portable MPEG audio decoder for Unix. It supports
MPEG 1.0/2.0 layers 1, 2 and 3 (those famous "mp3" files).
- .
+ .
For full CD quality playback (44 kHz, 16 bit, stereo) a Pentium,
SPARCstation10, DEC Alpha or similar CPU is required. Mono and/or reduced
quality playback (22 kHz or 11 kHz) is even possible on 486 CPUs.
@@ -61,13 +90,19 @@ Description: MPEG layer 1/2/3 audio decoder -- development files
Package: mpg123-oss-i486
Architecture: i386 kfreebsd-i386
-Depends: mpg123 (>= 1.4.3-1), ${misc:Depends}, oss-compat
-Provides: mpg123, mp3-decoder
-Conflicts: mpg123 (<< 0.59r-2)
+Depends:
+ mpg123 (>= 1.4.3-1),
+ oss-compat,
+ ${misc:Depends}
+Provides:
+ mp3-decoder,
+ mpg123
+Conflicts:
+ mpg123 (<< 0.59r-2)
Description: MPEG layer 1/2/3 audio player for i486 machines - dummy package
Mpg123 is a fast and portable MPEG audio player for Unix. It supports
MPEG 1.0/2.0 layers 1, 2 and 3 (those famous "mp3" files).
- .
+ .
For full CD quality playback (44 kHz, 16 bit, stereo) a Pentium,
SPARCstation10, DEC Alpha or similar CPU is required. Mono and/or reduced
quality playback (22 kHz or 11 kHz) is even possible on 486 CPUs.
@@ -78,11 +113,13 @@ Description: MPEG layer 1/2/3 audio player for i486 machines - dummy package
Package: mpg123-oss-3dnow
Architecture: i386
-Depends: mpg123 (>= 0.61-1), ${misc:Depends}
+Depends:
+ mpg123 (>= 0.61-1),
+ ${misc:Depends}
Description: MPEG layer 1/2/3 audio player for 3DNow! machines - dummy package
Mpg123 is a fast and portable MPEG audio player for Unix. It supports
MPEG 1.0/2.0 layers 1, 2 and 3 (those famous "mp3" files).
- .
+ .
For full CD quality playback (44 kHz, 16 bit, stereo) a Pentium,
SPARCstation10, DEC Alpha or similar CPU is required. Mono and/or reduced
quality playback (22 kHz or 11 kHz) is even possible on 486 CPUs.
@@ -93,12 +130,16 @@ Description: MPEG layer 1/2/3 audio player for 3DNow! machines - dummy package
Package: mpg123-esd
Architecture: any
-Depends: mpg123 (>= 1.4.3-1), ${misc:Depends}, ${esdplugin:Recommends}
-Suggests: esound
+Depends:
+ mpg123 (>= 1.4.3-1),
+ ${esdplugin:Recommends},
+ ${misc:Depends}
+Suggests:
+ esound
Description: MPEG layer 1/2/3 audio player with Esound support - dummy package
Mpg123 is a fast and portable MPEG audio player for Unix. It supports
MPEG 1.0/2.0 layers 1, 2 and 3 (those famous "mp3" files).
- .
+ .
For full CD quality playback (44 kHz, 16 bit, stereo) a Pentium,
SPARCstation10, DEC Alpha or similar CPU is required. Mono and/or reduced
quality playback (22 kHz or 11 kHz) is even possible on 486 CPUs.
@@ -109,12 +150,16 @@ Description: MPEG layer 1/2/3 audio player with Esound support - dummy package
Package: mpg123-nas
Architecture: any
-Depends: mpg123 (>= 1.4.3-1), ${misc:Depends}, ${nasplugin:Recommends}
-Suggests: nas
+Depends:
+ mpg123 (>= 1.4.3-1),
+ ${misc:Depends},
+ ${nasplugin:Recommends}
+Suggests:
+ nas
Description: MPEG layer 1/2/3 audio player with NAS support - dummy package
Mpg123 is a fast and portable MPEG audio player for Unix. It supports
MPEG 1.0/2.0 layers 1, 2 and 3 (those famous "mp3" files).
- .
+ .
For full CD quality playback (44 kHz, 16 bit, stereo) a Pentium,
SPARCstation10, DEC Alpha or similar CPU is required. Mono and/or reduced
quality playback (22 kHz or 11 kHz) is even possible on 486 CPUs.
@@ -125,11 +170,14 @@ Description: MPEG layer 1/2/3 audio player with NAS support - dummy package
Package: mpg123-alsa
Architecture: any
-Depends: mpg123 (>= 1.4.3-1), ${misc:Depends}, ${alsaplugin:Recommends}
+Depends:
+ mpg123 (>= 1.4.3-1),
+ ${alsaplugin:Recommends},
+ ${misc:Depends}
Description: MPEG layer 1/2/3 audio player with ALSA support - dummy package
Mpg123 is a fast and portable MPEG audio player for Unix. It supports
MPEG 1.0/2.0 layers 1, 2 and 3 (those famous "mp3" files).
- .
+ .
For full CD quality playback (44 kHz, 16 bit, stereo) a Pentium,
SPARCstation10, DEC Alpha or similar CPU is required. Mono and/or reduced
quality playback (22 kHz or 11 kHz) is even possible on 486 CPUs.
diff --git a/debian/copyright b/debian/copyright
index ab77fd2..49c152c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -51,7 +51,7 @@ source distribution:
own are licensed under the terms of the LGPL 2.1; all files that do
carry either a LGPL or GPL note are licensed respectively under the
LGPL or GPL as follows:
-
+
(...)
where the complete texts of the GNU General Public License (GPL) version 2 and
diff --git a/debian/libmpg123-dev.install b/debian/libmpg123-dev.install
index 40c0738..8ff3625 100644
--- a/debian/libmpg123-dev.install
+++ b/debian/libmpg123-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/pkgconfig/libmpg123.pc
debian/tmp/usr/include/*.h
debian/tmp/usr/lib/*.a
debian/tmp/usr/lib/*.so
+debian/tmp/usr/lib/pkgconfig/libmpg123.pc
diff --git a/debian/mpg123.install b/debian/mpg123.install
index 1211e08..33fa6ca 100644
--- a/debian/mpg123.install
+++ b/debian/mpg123.install
@@ -1,5 +1,5 @@
+
debian/tmp/usr/bin/*
-debian/tmp/usr/share/man/*/*
debian/tmp/usr/lib/mpg123/*.la
debian/tmp/usr/lib/mpg123/*.so
-
+debian/tmp/usr/share/man/*/*
--
mpg123 packaging
More information about the pkg-multimedia-commits
mailing list