[med-svn] [SCM] Free software framework for ludic-therapeutic activities branch, master, updated. upstream/1.0.1-18-g9fe3035

[Andreas Tille]

The following commit has been merged in the master branch:
commit 6fa1ef5d15a31d059d0bcc3ce448f14aac6a84c4
Author: Andreas Tille <tille at debian.org>
Date:   Mon Mar 5 10:43:38 2012 +0100

    debian/patches/lib_location_fix.diff: Removed because applied upstream

diff --git a/debian/changelog b/debian/changelog
index f94a2cf..8dfa2c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 sitplus (1.0.3-1) unstable; urgency=low
 
   * New upstream version
+    debian/patches/lib_location_fix.diff: Removed because applied upstream 
 
- -- Andreas Tille <tille at debian.org>  Mon, 05 Mar 2012 09:32:07 +0100
+ -- Andreas Tille <tille at debian.org>  Mon, 05 Mar 2012 10:42:53 +0100
 
 sitplus (1.0.1-4) unstable; urgency=low
 
diff --git a/debian/patches/lib_location_fix.diff b/debian/patches/lib_location_fix.diff
deleted file mode 100644
index 4932781..0000000
--- a/debian/patches/lib_location_fix.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: Luis Rivas Vañó <luinix at gmail.com>
-Description: This patch fixes the lib directory location
-
-* CMakeLists.txt: Fix PLUGINDIR and LIBRUNTIMEDIR
-
-Forwarded: no
-Index: sitplus-1.0/CMakeLists.txt
-===================================================================
---- sitplus-1.0.orig/CMakeLists.txt	2011-07-05 15:32:19.995503942 +0200
-+++ sitplus-1.0/CMakeLists.txt	2011-07-05 15:32:53.035515874 +0200
-@@ -38,7 +38,7 @@
- #
- 
- set (BINDIR "bin")
--set (LIBDIR "lib")
-+set (LIBDIR "lib/sitplus")
- if (WIN32)
- 	set (LOCALEDIR "${BINDIR}/locale")
- 	set (DATADIR "${BINDIR}")
-@@ -49,8 +49,8 @@
- 	set (LOCALEDIR "share/locale")
- 	set (DATADIR "share/${APP_NAME}")
- 	set (DOCDIR "${DATADIR}/doc")
--	set (PLUGINDIR "lib")
--	set (LIBRUNTIMEDIR "lib")
-+	set (PLUGINDIR "lib/sitplus")
-+	set (LIBRUNTIMEDIR "lib/sitplus")
- endif(WIN32)
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index b9d5a07..1541e5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-lib_location_fix.diff
 packager.diff
 spelling.diff
 as-needed.patch

-- 
Free software framework for ludic-therapeutic activities