[SCM] audacious/master: Drop use-system-licenses.patch (see Bug #883731)
sten-guest at users.alioth.debian.org
sten-guest at users.alioth.debian.org
Fri Dec 8 18:32:18 UTC 2017
The following commit has been merged in the master branch:
commit a512ad0a76727cc8103aa9f84171e2ff6eefec35
Author: Nicholas D Steeves <nsteeves at gmail.com>
Date: Fri Dec 8 13:12:46 2017 -0500
Drop use-system-licenses.patch (see Bug #883731)
diff --git a/debian/patches/series b/debian/patches/series
index bb69562..f52783b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
add-keywords.patch
-use-system-licenses.patch
diff --git a/debian/patches/use-system-licenses.patch b/debian/patches/use-system-licenses.patch
deleted file mode 100644
index 495a715..0000000
--- a/debian/patches/use-system-licenses.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Drop COPYING file to install and use for it system path.
-Author: Mateusz Łukasik <mati75 at linuxmint.pl>
-Origin: vendor
-
---- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,6 @@ SUBDIRS = src man images po
- DISTCLEAN = audacious.pc buildsys.mk config.h config.log config.status extra.mk
-
- DATA = AUTHORS \
-- COPYING \
- images/about-logo.png \
- images/about-logo.svg \
- images/album.png \
-
---- a/src/libaudgui/about.cc
-+++ b/src/libaudgui/about.cc
-@@ -98,7 +98,7 @@ static GtkWidget * create_about_window (
- if (! g_file_get_contents (credits_path, & credits, nullptr, nullptr))
- credits = g_strdup_printf ("Unable to load %s; check your installation.", (const char *) credits_path);
-
-- StringBuf license_path = filename_build ({data_dir, "COPYING"});
-+ StringBuf license_path = filename_build ({"/usr/share/common-licenses/BSD"});
- if (! g_file_get_contents (license_path, & license, nullptr, nullptr))
- license = g_strdup_printf ("Unable to load %s; check your installation.", (const char *) license_path);
-
-
--
Small and fast audio player which supports lots of formats
More information about the pkg-multimedia-commits
mailing list