[SCM] supercollider/master: Install README.extensions via debian/rules instead of a patch

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Mon Jul 9 14:28:23 UTC 2012


The following commit has been merged in the master branch:
commit 9c212092c83c3cc013c2edefafb48a62c7d7b35a
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Jul 6 20:50:40 2012 -0400

    Install README.extensions via debian/rules instead of a patch
    
    There is no business in upstream cmake files knowing about files
    within debian/ subdir

diff --git a/debian/patches/install_readme_extensions.patch b/debian/patches/install_readme_extensions.patch
deleted file mode 100644
index 2cdef76..0000000
--- a/debian/patches/install_readme_extensions.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -295,6 +295,10 @@
-     )
- endif()
- 
-+install(FILES debian/README.extensions
-+	DESTINATION "${CMAKE_INSTALL_PREFIX}/share/SuperCollider/Extensions"
-+	RENAME README)
-+
- if(APPLE)
- 	# determines the app name and app install location (scappbundlename, scappdir):
- 	include (cmake_modules/MacAppFolder.cmake)
diff --git a/debian/patches/series b/debian/patches/series
index c1d82b9..897f4ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-install_readme_extensions.patch
 update_boostlockfree_prefixhpp.patch
diff --git a/debian/rules b/debian/rules
index c2e600c..13c50e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,10 @@ DEB_UPSTREAM_REPACKAGE_TAG = repack
 binary-fixup/supercollider-common::
 	dh_linktree -psupercollider-common
 
+install/supercollider-common::
+	install -m 644 debian/README.extensions \
+		$(DEB_DH_INSTALL_SOURCEDIR)/usr/share/SuperCollider/Extensions/README
+
 install/supercollider-emacs::
 	install -d $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/applications
 	install -m 644 debian/scel.desktop $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/applications

-- 
supercollider packaging



More information about the pkg-multimedia-commits mailing list