summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise/dependencies/arts
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-09-11 21:42:05 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-09-11 21:42:05 +0200
commitd8260a6ce3beb4f6aa74e66f9f9b56995a36d79e (patch)
treec9ce19741b0d33903ac7e6e267c5bcdeab17da8f /ubuntu/precise/dependencies/arts
parentd27e5e6838cded96c7f11370af49a74f5bab0aa8 (diff)
parente52ee671cbb3dfd521892b659f54cb4e647aca3d (diff)
downloadtde-packaging-d8260a6ce3beb4f6aa74e66f9f9b56995a36d79e.tar.gz
tde-packaging-d8260a6ce3beb4f6aa74e66f9f9b56995a36d79e.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/precise/dependencies/arts')
-rw-r--r--ubuntu/precise/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff4
-rwxr-xr-xubuntu/precise/dependencies/arts/debian/rules2
2 files changed, 4 insertions, 2 deletions
diff --git a/ubuntu/precise/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff b/ubuntu/precise/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff
index 603ffdf37..57a8122f9 100644
--- a/ubuntu/precise/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff
+++ b/ubuntu/precise/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff
@@ -1,3 +1,5 @@
+Index: b/artsc/artsc-config.in
+===================================================================
--- a/artsc/artsc-config.in
+++ b/artsc/artsc-config.in
@@ -27,7 +27,7 @@
@@ -8,4 +10,4 @@
+ flags="$flags -L$libdir -lartsc"
;;
--cflags)
- flags="$flags -I$includedir/artsc @GLIB_CFLAGS@"
+ flags="$flags -I$includedir @GLIB_CFLAGS@"
diff --git a/ubuntu/precise/dependencies/arts/debian/rules b/ubuntu/precise/dependencies/arts/debian/rules
index 9c9730bda..1b4911297 100755
--- a/ubuntu/precise/dependencies/arts/debian/rules
+++ b/ubuntu/precise/dependencies/arts/debian/rules
@@ -41,6 +41,6 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
binary-predeb/libarts1-trinity-dev::
ifeq (linux,$(DEB_HOST_ARCH_OS))
- echo "libasound2-trinity-dev=libasound2-trinity-dev" >> debian/libarts1-dev.substvars
+ echo "libasound2-dev=libasound2-dev" >> debian/libarts1-trinity-dev.substvars
endif