[SCM] Attica packaging branch, master, updated. debian/0.1.4-1-11-g57bf83d
Didier Raboud
odyx-guest at alioth.debian.org
Fri Nov 26 10:23:31 UTC 2010
The following commit has been merged in the master branch:
commit 160f375e50403c9f157ebe699054708c12e23327
Author: Didier Raboud <didier at raboud.com>
Date: Fri Nov 26 10:39:56 2010 +0100
Update patches to 0.2.0
---
debian/changelog | 1 -
debian/patches/drop-unused-doc | 12 ------------
debian/patches/no-rpath | 8 +++++---
debian/patches/series | 1 -
4 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 027135d..b4394e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,6 @@ attica (0.2.0-1) UNRELEASED; urgency=low
[ Thibaut GRIDEL ]
* New Upstream version.
- * Patching to compile without doc dir.
* Adding new symbols.
* Bumping Standards-Version to 3.9.1.
diff --git a/debian/patches/drop-unused-doc b/debian/patches/drop-unused-doc
deleted file mode 100644
index a90e630..0000000
--- a/debian/patches/drop-unused-doc
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Drop unused doc dir
- The doc dir is not present in the tarball, so the makefile does not build
-Author: Thibaut Gridel <tgridel at free.fr>
-
---- attica-0.1.90.orig/CMakeLists.txt
-+++ attica-0.1.90/CMakeLists.txt
-@@ -16,5 +16,3 @@ endif (ATTICA_ENABLE_TESTS)
- set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
-
- add_subdirectory(lib)
--
--add_subdirectory( doc )
diff --git a/debian/patches/no-rpath b/debian/patches/no-rpath
index 06472f9..1eff7dc 100644
--- a/debian/patches/no-rpath
+++ b/debian/patches/no-rpath
@@ -1,9 +1,11 @@
Description: Upstream changes introduced in version 0.1.1-1
Author: Thibaut Gridel <tgridel at free.fr>
---- attica-0.1.1.orig/lib/CMakeLists.txt
-+++ attica-0.1.1/lib/CMakeLists.txt
-@@ -5,7 +5,6 @@ set(LIB_SUFFIX "" CACHE STRING "Define s
+Index: attica/lib/CMakeLists.txt
+===================================================================
+--- attica.orig/lib/CMakeLists.txt 2010-11-26 10:21:17.000000000 +0100
++++ attica/lib/CMakeLists.txt 2010-11-26 10:21:20.000000000 +0100
+@@ -5,7 +5,6 @@
set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
diff --git a/debian/patches/series b/debian/patches/series
index e1acc6f..c6a9f4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
no-rpath
-drop-unused-doc
--
Attica packaging
More information about the pkg-kde-commits
mailing list