[SCM] smplayer-themes/master: Tweak patches to be upstreamable

locutusofborg at users.alioth.debian.org locutusofborg at users.alioth.debian.org
Fri Jan 15 15:37:26 UTC 2016


The following commit has been merged in the master branch:
commit 88e42214a4b6419a8b5a8cb4f1747b0bfba5fa17
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Jan 15 16:36:04 2016 +0100

    Tweak patches to be upstreamable

diff --git a/debian/patches/use-usr-as-prefix.patch b/debian/patches/use-usr-as-prefix.patch
index 7ace0d7..b4b2591 100644
--- a/debian/patches/use-usr-as-prefix.patch
+++ b/debian/patches/use-usr-as-prefix.patch
@@ -1,12 +1,13 @@
-Description: Set /usr as prefix
+Description: Make PREFIX Configurable
 Author: Mateusz Łukasik <mati75 at linuxmint.pl>
+Author: Gianfranco Costamagna <locutusofborg at debian.org>
 
 --- a/Makefile
 +++ b/Makefile
 @@ -1,5 +1,5 @@
  
 -PREFIX=/usr/local
-+PREFIX=/usr
++PREFIX?=/usr/local
  #PREFIX=/tmp/smplayer
  
  THEMES_PATH=$(DESTDIR)$(PREFIX)/share/smplayer/themes
diff --git a/debian/rules b/debian/rules
index dd5a704..a11fdb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
 export QT_SELECT=5
-
+export PREFIX=/usr
 %:
 	dh $@

-- 
smplayer-themes packaging



More information about the pkg-multimedia-commits mailing list