[SCM] csoundqt/master: Drop install-path.patch, applied upstream
fsateler at users.alioth.debian.org
fsateler at users.alioth.debian.org
Wed Apr 13 23:28:46 UTC 2016
The following commit has been merged in the master branch:
commit 7dbc54f50771a402b029554043c24e3c486f9427
Author: Felipe Sateler <fsateler at debian.org>
Date: Wed Apr 13 20:08:43 2016 -0300
Drop install-path.patch, applied upstream
diff --git a/debian/patches/install-path.patch b/debian/patches/install-path.patch
deleted file mode 100644
index 5d1fdd9..0000000
--- a/debian/patches/install-path.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/qcs.pro
-+++ b/qcs.pro
-@@ -155,10 +155,14 @@ message(TARGET is: $${TARGET})
- # install commands for linux (for make install)
- # use 'sudo make install' for system wide installation
- unix {
-- INSTALL_DIR=/usr/local # ~ #for HOME
-- SHARE_DIR=/usr/share # ~/.local for HOME install
-+ isEmpty(INSTALL_DIR) {
-+ INSTALL_DIR=/usr/local # ~ #for HOME
-+ }
-+ isEmpty(SHARE_DIR) {
-+ SHARE_DIR=/usr/share # ~/.local for HOME install
-+ }
- target.path = $$INSTALL_DIR/bin
-- target.commands = ln -sf $$INSTALL_DIR/bin/$$TARGET $$INSTALL_DIR/bin/csoundqt # create link always with the same name
-+ target.commands = ln -sf $$TARGET $(INSTALL_ROOT)/$$INSTALL_DIR/bin/csoundqt # create link always with the same name
- target.files = $$DESTDIR/$$TARGET
-
-
-@@ -168,8 +172,8 @@ unix {
- icon.path=$$SHARE_DIR/icons # not sure in fact, if /usr/share/icons is enough or better to put into hicolor...
- icon.files=images/qtcs.svg
-
-- mimetypes.path=$$PWD # in some reason path must be set to create install target in Makefile
-- mimetypes.commands = cd $$PWD/mime-types/; ./add_csound_mimetypes.sh
-+ mimetypes.path=$$INSTALL_DIR # in some reason path must be set to create install target in Makefile
-+ mimetypes.commands = cd $$PWD/mime-types/; ./add_csound_mimetypes.sh $(INSTALL_ROOT)/$$INSTALL_DIR no-update
-
-
- #TODO: mime types
---- a/mime-types/add_csound_mimetypes.sh
-+++ b/mime-types/add_csound_mimetypes.sh
-@@ -1,7 +1,10 @@
- #!/bin/sh
-
- #copy icon for csound mimetypes
--INSTALLDIR=/usr #~/.local # use the latter one for local install
-+INSTALLDIR="$1"
-+if [ -z "$INSTALLDIR" ] ; then
-+ INSTALLDIR=/usr #~/.local # use the latter one for local install
-+fi
- ICONDIR=$INSTALLDIR/share/icons/hicolor/128x128/mimetypes
- mkdir -v -p $ICONDIR
- cp -v csound-light-128.png $ICONDIR/csound.png
-@@ -11,6 +14,8 @@ MIMEDIR=$INSTALLDIR/share/mime # or /usr
- DESTDIR=$MIMEDIR/packages
- mkdir -v -p $DESTDIR # make if does not exist
- cp -v *.xml $DESTDIR
--update-mime-database -V $MIMEDIR
-+if [ "$2" != "no-update" ] ; then
-+ update-mime-database -V $MIMEDIR
-+fi
-
- echo "You may need to log out and log in to make changes effective."
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 31f7921..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-install-path.patch
--
csoundqt packaging
More information about the pkg-multimedia-commits
mailing list