[SCM] deadbeef/master: Add all my changes, sorry for one commit
mati75-guest at users.alioth.debian.org
mati75-guest at users.alioth.debian.org
Sat Aug 9 15:02:21 UTC 2014
The following commit has been merged in the master branch:
commit dd6ec13851e8fb9620d1dc99c780161a0cbc5435
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date: Sat Aug 9 17:01:42 2014 +0200
Add all my changes, sorry for one commit
diff --git a/debian/changelog b/debian/changelog
index 90639f3..31c9eff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-deadbeef (0.6.0-1) UNRELEASED; urgency=low
+deadbeef (0.6.2-1) unstable; urgency=low
* Initial release. (Closes: #576975)
- -- Mateusz Łukasik <mati75 at linuxmint.pl> Fri, 22 Nov 2013 19:37:14 +0100
+ -- Mateusz Łukasik <mati75 at linuxmint.pl> Wed, 06 Aug 2014 18:25:53 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..aa53f9e
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,150 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: deadbeef
+Source: http://sourceforge.net/projects/deadbeef/files
+
+Files: *
+Copyright: 2009-2012 by Alexey Yakovenko <waker at users.sourceforge.net>
+ 2009-2010 Viktor Semykin <thesame.ml at gmail.com>
+ 2009-2010 Stas Akimushkin <uncle.lag at gmail.com>
+License: GPL-2+
+
+Files: gme/Game_Music_Emu-0.5.2/*
+Copyright: 2003-2006 Shay Green <gblargg at gmail.com>
+License: LGPL-2+
+
+Files: dumb/*
+Copyright: 2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere.
+License:
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event shall the authors be held liable for any damages arising from the
+ use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not claim
+ that you wrote the original software. If you use this software in a
+ product, you are requested to acknowledge its use in the product
+ documentation, along with details on where to get an unmodified version of
+ this software, but this is not a strict requirement.
+ .
+ [Note that the above point asks for a link to DUMB, not just a mention.
+ Googling for DUMB doesn't help much! The URL is "http://dumb.sf.net/".]
+ .
+ [The only reason why the link is not strictly required is that such a
+ requirement prevents DUMB from being used in projects with certain other
+ licences, notably the GPL. See http://www.gnu.org/philosophy/bsd.html .]
+ .
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ .
+ 3. This notice may not be removed from or altered in any source distribution.
+ .
+ 4. If you are using the Program in someone else's bedroom at any Monday
+ 3:05 PM, you are not allowed to modify the Program for ten minutes. [This
+ clause provided by Inphernic; every licence should contain at least one
+ clause, the reasoning behind which is far from obvious.]
+ .
+ [Note: clause 4 was resigned after a quick IRC talk with the author]
+ .
+ [Note 2: if I did not mention /usr/share/common-licenses here, lintian
+ would complain because he found the words "GPL" above, but this
+ software is not GPL. It is GPL-compatible, though.]
+
+Files: md5/*
+Copyright: 1995 Written by Ulrich Drepper <drepper at gnu.ai.mit.edu>
+ 1997 Modified by Gray Watson <http://256.com/gray/>
+License: GPL-2+
+
+Files: sid/sidplay-libs-2.1.0/*
+Copyright: 2000-2004 Simon White <sidplay2 at email.com>
+License: GPL-2+
+
+Files: plugins/adplug/adplug/*
+Copyright: 1999 - 2006 Simon Peter <dn.tlp at gmx.net>, et al.
+License: LGPL-2+
+
+Files: plugins/adplug/libbinio/*
+Copyright: 2002-2004 Simon Peter <dn.tlp at gmx.net>
+License: LGPL-2+
+
+Files: plugins/vtx/ay8912.c plugins/vtx/ayemu.h plugins/vtx/ayemu_8912.h plugins/vtx/auemu_vtxfile.h
+Copyright: 2003-2004 Sashnov Alexander <sashnov at ngs.ru>
+License: LGPL-2+
+
+Files: plugins/ao
+Copyright: 2007-2009, R. Belmont and Richard Bannister.
+ 1997-2008, Nicola Salmoria and the MAME team.
+ 2002-2003, 2002 by Pete Bernert.
+License: BSD
+
+Files: plugins/dca
+Copyright: 2004 Gildas Bazin <gbazin at videolan.org>
+ 2000-2003 Michel Lespinasse <walken at zoy.org>
+ 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
+License: GPL-2+
+
+Files: plugins/tta/ttadec.[hc] filter.h
+Copyright: 2004 Alexander Djourik.
+License: BSD
+
+Files: debian/*
+Copyright: 2012 Christian Marillat <marillat at deb-multimedia.org>
+ 2013 Mateusz Łukasik <mati75 at linuxmint.pl>
+License: GPL-2+
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ See /usr/share/common-licenses/LGPL-2 for the full license text.
diff --git a/debian/deadbeef-plugins-dev.install b/debian/deadbeef-plugins-dev.install
new file mode 100644
index 0000000..e43b95c
--- /dev/null
+++ b/debian/deadbeef-plugins-dev.install
@@ -0,0 +1 @@
+usr/include
diff --git a/debian/deadbeef.1 b/debian/deadbeef.1
new file mode 100644
index 0000000..c093659
--- /dev/null
+++ b/debian/deadbeef.1
@@ -0,0 +1,65 @@
+.TH DEADBEEF 1 "16 May 2011" "0.5.0" "deadbeef manual page"
+.SH NAME
+deadbeef \- ultimate music player for X.
+.SH SYNOPSIS
+.B deadbeef
+[\fIOptions\fR] [\fIFiles\fR]
+.SH DESCRIPTION
+\fIDeadbeef\fP DeaDBeeF (as in 0xDEADBEEF) is an audio player for GNU/Linux
+systems with X11.
+.SH OPTIONS
+.SS "Arguments:"
+.TP
+File(s)
+file(s) to open
+.SS "Options:"
+.TP
+.BI \-h,\-\-help
+Show help about options
+.TP
+.BI \-\-play
+Start playback
+.TP
+.BI \-\-stop
+Stop playback
+.TP
+.BI \-\-pause
+Pause playback
+.TP
+.BI \-\-toggle-pause
+Toggle pause
+.TP
+.BI \-\-play-pause
+Start playback if stopped, toggle pause otherwise
+.TP
+.BI \-\-next
+Next song in playlist
+.TP
+.BI \-\-prev
+Previous song in playlist
+.TP
+.BI \-\-random
+Random song in playlist
+.TP
+.BI \-\-queue
+Append file(s) to existing playlist
+.TP
+.BI \-\-version
+Print version info and exit
+.TP
+.BI \-\-nowplaying\ \fIFMT\fR
+Print formatted track name to stdout FMT %-syntax: [a]rtist, [t]itle, al[b]um,
+[l]ength, track[n]umber, [y]ear, [c]omment, copy[r]ight, [e]lapsed
+.SH "AUTHOR"
+DeaDBeeF was written by
+.nh
+.ad l
+Alexey Yakovenko <waker at users.sourceforge.net>
+.hy
+.br
+This manual page was prepared by
+.nh
+.ad l
+Alexey Smirnov <alexey.smirnov at gmx.com>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/deadbeef.docs b/debian/deadbeef.docs
new file mode 100644
index 0000000..eb9b151
--- /dev/null
+++ b/debian/deadbeef.docs
@@ -0,0 +1,3 @@
+NEWS
+README
+AUTHORS
diff --git a/debian/deadbeef.install b/debian/deadbeef.install
new file mode 100644
index 0000000..ee94136
--- /dev/null
+++ b/debian/deadbeef.install
@@ -0,0 +1,3 @@
+usr/bin
+usr/lib
+usr/share
diff --git a/debian/deadbeef.lintian-overrides b/debian/deadbeef.lintian-overrides
new file mode 100644
index 0000000..19074e2
--- /dev/null
+++ b/debian/deadbeef.lintian-overrides
@@ -0,0 +1,7 @@
+deadbeef: spelling-error-in-binary usr/bin/deadbeef Psychadelic Psychedelic
+deadbeef: spelling-error-in-binary usr/lib/x86_64-linux-gnu/deadbeef/aac.so.0.0.0 Psychadelic Psychedelic
+deadbeef: spelling-error-in-binary usr/lib/x86_64-linux-gnu/deadbeef/adplug.so.0.0.0 tEH the
+deadbeef: spelling-error-in-binary usr/lib/x86_64-linux-gnu/deadbeef/alac.so.0.0.0 Psychadelic Psychedelic
+deadbeef: spelling-error-in-binary usr/lib/x86_64-linux-gnu/deadbeef/ddb_gui_GTK2.so.0.0.0 backgroud background
+deadbeef: spelling-error-in-binary usr/lib/x86_64-linux-gnu/deadbeef/shellexec.so.0.0.0 Maintainance Maintenance
+
diff --git a/debian/deadbeef.manpages b/debian/deadbeef.manpages
new file mode 100644
index 0000000..4c861c4
--- /dev/null
+++ b/debian/deadbeef.manpages
@@ -0,0 +1 @@
+debian/deadbeef.1
diff --git a/debian/deadbeef.menu b/debian/deadbeef.menu
new file mode 100644
index 0000000..be44f16
--- /dev/null
+++ b/debian/deadbeef.menu
@@ -0,0 +1,3 @@
+?package(deadbeef):needs="X11" section="Applications/Sound" \
+ title="Deadbeef" longtitle="Deadbeef Audio Player" \
+ command="/usr/bin/deadbeef"
diff --git a/debian/patches/debian-copying.patch b/debian/patches/debian-copying.patch
new file mode 100644
index 0000000..52f6c1f
--- /dev/null
+++ b/debian/patches/debian-copying.patch
@@ -0,0 +1,23 @@
+Description: Use Debian's licence path.
+Author: Mateusz Łukasik <mati75 at linuxmint.pl>
+
+--- a/plugins/gtkui/callbacks.c
++++ b/plugins/gtkui/callbacks.c
+@@ -362,7 +362,7 @@ on_gpl1_activate (
+ gpointer user_data)
+ {
+ char fname[PATH_MAX];
+- snprintf (fname, sizeof (fname), "%s/%s", deadbeef->get_doc_dir (), "COPYING.GPLv2");
++ snprintf (fname, sizeof (fname), "%s", "/usr/share/common-licenses/GPL-2");
+ gtkui_show_info_window (fname, "GNU GENERAL PUBLIC LICENSE Version 2", &gplwindow);
+ }
+
+@@ -373,7 +373,7 @@ on_lgpl1_activate (
+ gpointer user_data)
+ {
+ char fname[PATH_MAX];
+- snprintf (fname, sizeof (fname), "%s/%s", deadbeef->get_doc_dir (), "COPYING.LGPLv2.1");
++ snprintf (fname, sizeof (fname), "%s", "/usr/share/common-licenses/LGPL-2.1");
+ gtkui_show_info_window (fname, "GNU LESSER GENERAL PUBLIC LICENSE Version 2.1", &lgplwindow);
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7d5087b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian-copying.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..beae768
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,25 @@
+#! /usr/bin/make -f
+
+%:
+ dh $@
+
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-gtk2 --disable-gtk3 --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/
+
+override_dh_install:
+ -rm debian/tmp/usr/lib/*/deadbeef/*.la
+ -rm debian/tmp/usr/lib/*/deadbeef/*.a
+ -rm debian/deadbeef/usr/lib/*/deadbeef/*.so.0*
+ dh_install --fail-missing -XCOPYING.GPLv2 -XCOPYING.LGPLv2.1
+
+override_dh_compress:
+ dh_compress -XChangeLog
+
+override_dh_strip:
+ dh_strip --dbg-package=deadbeef-dbg
+
+override_dh_makeshlibs:
+ dh_makeshlibs -n
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -z9
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..b7bc1f2
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+compression = "xz"
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..397344f
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/deadbeef/deadbeef-(\d[\d.-]+)\.tar\.bz2
--
deadbeef packaging
More information about the pkg-multimedia-commits
mailing list