[SCM] audacious/master: Add use-system-licenses.patch to use system system licenses path.

mati75-guest at users.alioth.debian.org mati75-guest at users.alioth.debian.org
Wed Apr 6 10:55:39 UTC 2016


The following commit has been merged in the master branch:
commit 124bf3bdccdac9d0eb78ce65b53c9a4ba128e052
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Wed Apr 6 12:55:52 2016 +0200

    Add use-system-licenses.patch to use system system licenses path.

diff --git a/debian/changelog b/debian/changelog
index af4a2b1..5f2bdb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,9 @@ audacious (3.7.2-1) UNRELEASED; urgency=medium
   * Update symbols files for new version.
   * Work around libaudqt package:
     - Add install and symbols files.
-  * Add debian/patches/add-keywords.patch to provides keywords in desktop file.
+  * debian/patches:
+    - Add add-keywords.patch to provides keywords in desktop file.
+    - Add use-system-licenses.patch to use system system licenses path.
   * debian/rules:
     - Use bindnow flag.
   * debian/control:
diff --git a/debian/patches/series b/debian/patches/series
index f52783b..bb69562 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 add-keywords.patch
+use-system-licenses.patch
diff --git a/debian/patches/use-system-licenses.patch b/debian/patches/use-system-licenses.patch
new file mode 100644
index 0000000..662303b
--- /dev/null
+++ b/debian/patches/use-system-licenses.patch
@@ -0,0 +1,37 @@
+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);
+ 
+--- a/src/libaudqt/about.cc
++++ b/src/libaudqt/about.cc
+@@ -35,7 +35,7 @@ static QTabWidget * buildCreditsNotebook
+ {
+     const char * data_dir = aud_get_path (AudPath::DataDir);
+     const char * titles[2] = {N_("Credits"), N_("License")};
+-    const char * filenames[2] = {"AUTHORS", "COPYING"};
++    const char * filenames[2] = {"AUTHORS", "/usr/share/common-licenses/BSD"};
+ 
+     auto tabs = new QTabWidget (parent);
+ 

-- 
Small and fast audio player which supports lots of formats



More information about the pkg-multimedia-commits mailing list