[SCM] audacious-plugins/master: Resolve the merge conflicts caused by me and Mattia duplicating work...
tsimonq2-guest at users.alioth.debian.org
tsimonq2-guest at users.alioth.debian.org
Thu Aug 24 14:19:39 UTC 2017
Drop build-dependency on dh-autoreconf, implied by debhelper >= 10.
d/control: Bump Standards-Version to 4.1.0, no changes needed.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 30a5d54136df1af0648323ec60445575c31940e2
X-Git-Newrev: 47d1cdc005262fad67af648e427552733dd335b4
The following commit has been merged in the master branch:
commit 92a676742e47bae44604d249da21dc44b82c3673
Merge: ec131ead4e70be4d78aa0a4b9881b766ee0e0f27 30a5d54136df1af0648323ec60445575c31940e2
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date: Thu Aug 24 09:17:09 2017 -0500
Resolve the merge conflicts caused by me and Mattia duplicating work...
diff --combined debian/changelog
index 611a632,0c7b18f..91f8a54
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,12 @@@
-audacious-plugins (3.8.2-1) UNRELEASED; urgency=medium
+audacious-plugins (3.9-1) unstable; urgency=medium
* Team upload.
[ Mattia Rizzolo ]
- * d/control: use /git/ instead of /cgit/ in Vcs-*
+ * debian/control:
+ + Use /git/ instead of /cgit/ in Vcs-*.
+ + Bump Standards-Version to 4.1.0, no changes needed.
+ + Drop build-dependency on dh-autoreconf, implied by debhelper >= 10.
[ Mateusz Åukasik ]
* New upstream release.
@@@ -15,13 -18,7 +18,13 @@@
* Update debian/copyright.
* debian/rules: Add hardening.
- -- Mattia Rizzolo <mattia at debian.org> Mon, 02 May 2016 08:16:51 +0000
+ [ Simon Quigley ]
+ * New upstream version.
+ * Bump Standards-version to 4.1.0, no changes needed.
+ * Run wrap-and-sort.
+ * Build-dep on the latest audacious-dev.
+
+ -- Simon Quigley <tsimonq2 at ubuntu.com> Thu, 24 Aug 2017 08:22:16 -0500
audacious-plugins (3.7.2-2.1) unstable; urgency=medium
@@@ -51,7 -48,7 +54,7 @@@ audacious-plugins (3.7.2-1) unstable; u
- Bump Build-Depends on audacious to 3.7.
- Bump Standards-Version to 3.9.7.
- Drop audacious-plugins-dbg package.
- * debian/watch:
+ * debian/watch:
- Bump version to 4.
* Update debian/copyright.
@@@ -110,7 -107,7 +113,7 @@@ audacious-plugins (3.5-1) unstable; urg
audacious-plugins (3.4.3-2) unstable; urgency=medium
* Team upload.
-
+
[ Jackson Doak ]
* New upstream release.
* Change libsid package to re-enable SID support. Closes: #716776
@@@ -267,7 -264,7 +270,7 @@@ audacious-plugins (3.2-2) unstable; urg
-- Cyril Lavier <cyril.lavier at davromaniak.eu> Sun, 19 Feb 2012 12:35:33 +0100
audacious-plugins (3.2-1) unstable; urgency=low
-
+
* New upstream release. (Closes: #657095)
* debian/control:
+ Added build-deps necessary for mp3, bs2b and modplug support.
@@@ -278,7 -275,7 +281,7 @@@
are not used anymore.
* Add correct_spelling_error.diff to suppress the lintian warning (patch
submitted upstream)
-
+
-- Cyril Lavier <cyril.lavier at davromaniak.eu> Fri, 27 Jan 2012 09:02:40 +0100
audacious-plugins (2.4.4-1) unstable; urgency=low
@@@ -361,7 -358,7 +364,7 @@@ audacious-plugins (2.3-1) experimental
* New uploader.
- Remove old uploaders.
* New upstream release.
- * Bump standards version.
+ * Bump standards version.
* Use source format 3.0 (quilt).
* Remove audacious-plugins-extra.
- Add replaces in debian/control.
@@@ -376,7 -373,7 +379,7 @@@ audacious-plugins (2.1-1.1) unstable; u
* Fixes FTBFS due to conflicting types for jack_free (Closes: #560510)
[debian/patches/10_jack_fix_conflicting_types.diff]
* Fixes FTBFS on kFreeBSD (Closes: #543329)
-
+
-- Axel Beckert <abe at deuxchevaux.org> Sun, 24 Jan 2010 01:09:51 +0100
audacious-plugins (2.1-1) unstable; urgency=low
@@@ -407,11 -404,11 +410,11 @@@ audacious-plugins (2.0.1-1) unstable; u
(Closes: #456558, #460802, #500081)
- Do not crash when invalid monkey's audio chunks are encountered.
(Closes: #514674)
-
+
* Acknowledge NMU, thanks Rafael for your work.
- debian/patches/004-compile-with-libmtp8.patch: dropped,
different patch integrated upstream to solve the same issue.
-
+
* debian/audacious-plugins.install: add crossfade.so, skins.so.
* debian/audacious-plugins-extra.install: add icecast.so, psf2.so, xsf.so
* debian/control: enable projectm again.
@@@ -428,7 -425,7 +431,7 @@@ audacious-plugins (1.5.1-2.1) unstable
* NMU for helping with the libmtp7 -> libmtp8 transition, with the
authorization of the Release Team
(http://lists.debian.org/debian-release/2009/03/msg00085.html)
- * debian/patches/004-compile-with-libmtp8.patch: New patch for fixing
+ * debian/patches/004-compile-with-libmtp8.patch: New patch for fixing
the new number of arguments in function LIBMTP_Send_Track_From_File
(closes: #516559)
* debian/audacious-plugins-extra.install: Do not install musepack.so, as
diff --combined debian/control
index bdbcdc3,ff10dbc..bfcf765
--- a/debian/control
+++ b/debian/control
@@@ -2,63 -2,67 +2,62 @@@ Source: audacious-plugin
Section: sound
Priority: optional
Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders:
- Chris Taylor <ctaylor at debian.org>,
- Bilal Akhtar <bilalakhtar at ubuntu.com>,
- Cyril Lavier <cyril.lavier at davromaniak.eu>
-Build-Depends:
- audacious-dev (>= 3.8),
- debhelper (>= 10),
- libasound2-dev (>= 1.0) [linux-any],
- libavcodec-dev (>= 4:0.6.1),
- libavformat-dev (>= 4:0.6.1),
- libavutil-dev (>= 4:0.6.1),
- libbinio-dev (>= 1.4),
- libbs2b-dev,
- libcairo2-dev (>= 1.2.4),
- libcddb2-dev (>= 1.2.1),
- libcdio-cdda-dev (>= 0.70),
- libcue-dev,
- libcurl4-gnutls-dev,
- libdbus-glib-1-dev,
- libfaad-dev,
- libflac-dev (>= 1.2.1),
- libfluidsynth-dev (>= 1.0.6) [linux-any],
- libgtk2.0-dev,
- libjack-dev,
- liblircclient-dev,
- libmms-dev (>= 0.3),
- libmodplug-dev,
- libmp3lame-dev,
- libmpg123-dev,
- libneon27-gnutls-dev (>= 0.26),
- libnotify-dev,
- libogg-dev (>= 1.0),
- libpulse-dev (>= 0.9) [linux-any],
- libsamplerate0-dev (>= 0.0.15),
- libsdl2-dev,
- libsidplayfp-dev,
- libsndfile1-dev (>= 0.19),
- libsndio-dev,
- libsoxr-dev,
- libtagc0-dev (>= 1.4),
- libvorbis-dev (>= 1.1),
- libwavpack-dev (>= 4.31),
- libxcomposite-dev,
- libxml2-dev,
- oss4-dev [!linux-any]
+Uploaders: Chris Taylor <ctaylor at debian.org>,
+ Bilal Akhtar <bilalakhtar at ubuntu.com>,
+ Cyril Lavier <cyril.lavier at davromaniak.eu>
- Build-Depends: audacious-dev (>= 3.9),
++Build-Depends: audacious-dev (>= 3.8),
+ debhelper (>= 10),
- dh-autoreconf,
+ libasound2-dev (>= 1.0) [linux-any],
+ libavcodec-dev (>= 4:0.6.1),
+ libavformat-dev (>= 4:0.6.1),
+ libavutil-dev (>= 4:0.6.1),
+ libbinio-dev (>= 1.4),
+ libbs2b-dev,
+ libcairo2-dev (>= 1.2.4),
+ libcddb2-dev (>= 1.2.1),
+ libcdio-cdda-dev (>= 0.70),
+ libcue-dev,
+ libcurl4-gnutls-dev,
+ libdbus-glib-1-dev,
+ libfaad-dev,
+ libflac-dev (>= 1.2.1),
+ libfluidsynth-dev (>= 1.0.6) [linux-any],
+ libgtk2.0-dev,
+ libjack-dev,
+ liblircclient-dev,
+ libmms-dev (>= 0.3),
+ libmodplug-dev,
+ libmp3lame-dev,
+ libmpg123-dev,
+ libneon27-gnutls-dev (>= 0.26),
+ libnotify-dev,
+ libogg-dev (>= 1.0),
+ libpulse-dev (>= 0.9) [linux-any],
+ libsamplerate0-dev (>= 0.0.15),
+ libsdl2-dev,
+ libsidplayfp-dev,
+ libsndfile1-dev (>= 0.19),
+ libsndio-dev,
+ libsoxr-dev,
+ libtagc0-dev (>= 1.4),
+ libvorbis-dev (>= 1.1),
+ libwavpack-dev (>= 4.31),
+ libxcomposite-dev,
+ libxml2-dev,
+ oss4-dev [!linux-any]
- Homepage: http://www.audacious-media-player.org/
Standards-Version: 4.1.0
+ Homepage: http://www.audacious-media-player.org/
Vcs-Browser: https://anonscm.debian.org/git/pkg-multimedia/audacious-plugins.git
Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/audacious-plugins.git
Package: audacious-plugins
Architecture: any
Multi-Arch: same
-Depends:
- audacious-plugins-data (= ${source:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends:
- audacious (>= 3.8)
-Breaks:
- audacious (<< 3.8)
+Depends: audacious-plugins-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: audacious (>= 3.8)
+Breaks: audacious (<< 3.8)
Description: Base plugins for audacious
Audacious is a fork of beep-media-player which supports winamp skins
and many codecs.
@@@ -92,7 -96,8 +91,7 @@@
Package: audacious-plugins-data
Architecture: all
Multi-Arch: foreign
-Depends:
- ${misc:Depends}
+Depends: ${misc:Depends}
Description: Data files for Audacious plugins
Audacious is a fork of beep-media-player which supports winamp skins
and many codecs.
--
Plugins for audacious
More information about the pkg-multimedia-commits
mailing list