[SCM] kalgebra packaging branch, master, updated. debian/4.7.2-1-3-g0345f0e

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Wed Dec 7 23:04:55 UTC 2011


The following commit has been merged in the master branch:
commit 8c2b6792dd309d3485db7fdfe1ecd7d5491b4b91
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed Dec 7 23:50:53 2011 +0100

    Remove patches applied upstream.
---
 debian/changelog                            |    3 ++
 debian/patches/add_findanalitza.diff        |   48 ---------------------------
 debian/patches/install_variables_model.diff |   19 ----------
 debian/patches/series                       |    2 -
 4 files changed, 3 insertions(+), 69 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5da350b..b1f74b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ kalgebra (4:4.7.4-0r0) UNRELEASED; urgency=low
 
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4:4.7.2.
+  * Remove patches:
+   - add_findanalitza.diff, applied upstream.
+   - install_variables_model.diff, applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 07 Dec 2011 23:16:28 +0100
 
diff --git a/debian/patches/add_findanalitza.diff b/debian/patches/add_findanalitza.diff
deleted file mode 100644
index 7812b6e..0000000
--- a/debian/patches/add_findanalitza.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Author: Aleix Pol <aleixpol at kde.org>
-Author: José Manuel Santamaría Lema <panfaust at gmail.com>
-Origin: https://projects.kde.org/projects/kde/kdeedu/kalgebra/repository/revisions/45f52755
-Origin: https://projects.kde.org/projects/kde/kdeedu/kalgebra/repository/revisions/22be6e20
-Applied-Upstream: 4.7.3
-Description: Provide a cmake file to allow cantor to link against libanalitza[gui]
- Without this patch wouldn't be possible to build cantor-backend-kalgebra, built
- in the cantor source package.
---- a/analitza/CMakeLists.txt
-+++ b/analitza/CMakeLists.txt
-@@ -62,6 +62,6 @@ if(INSTALL_ANALITZA_HEADERS)
- 		DESTINATION ${INCLUDE_INSTALL_DIR}/analitza/ COMPONENT Devel)
- 	
- 	install(FILES
--	#		../FindAnalitza.cmake
-+			../cmake/FindAnalitza.cmake
- 			DESTINATION ${DATA_INSTALL_DIR}/cmake/modules)
- endif(INSTALL_ANALITZA_HEADERS)
---- /dev/null
-+++ b/cmake/FindAnalitza.cmake
-@@ -0,0 +1,27 @@
-+# Find libanalitza
-+# Once done this will define
-+#
-+#  ANALITZA_FOUND    - system has Analitza Library
-+#  ANALITZA_INCLUDES - the Analitza include directory
-+#  ANALITZA_LIBS     - link these to use Analitza
-+#  ANALITZA_VERSION  - the version of the Analitza Library
-+
-+# Copyright (c) 2011, Aleix Pol Gonzalez <aleixpol at kde.org>
-+#
-+# Redistribution and use is allowed according to the terms of the BSD license.
-+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-+
-+find_library(ANALITZA_LIBRARY NAMES analitza HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
-+find_library(ANALITZAGUI_LIBRARY NAMES analitzagui HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
-+
-+find_path(ANALITZA_INCLUDE_DIR NAMES analitza/analitzaexport.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR})
-+
-+if(ANALITZA_INCLUDE_DIR AND ANALITZA_LIBRARY)
-+   set(ANALITZA_LIBS ${analitza_LIB_DEPENDS} ${ANALITZA_LIBRARY} ${ANALITZAGUI_LIBRARY})
-+   set(ANALITZA_INCLUDES ${ANALITZA_INCLUDE_DIR}/KDE ${ANALITZA_INCLUDE_DIR})
-+endif(ANALITZA_INCLUDE_DIR AND ANALITZA_LIBRARY)
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Analitza  DEFAULT_MSG  ANALITZA_INCLUDE_DIR ANALITZA_LIBRARY)
-+
-+mark_as_advanced(ANALITZA_INCLUDE_DIR ANALITZA_LIBRARY)
diff --git a/debian/patches/install_variables_model.diff b/debian/patches/install_variables_model.diff
deleted file mode 100644
index 3338479..0000000
--- a/debian/patches/install_variables_model.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Aleix Pol <aleixpol at kde.org>
-Origin: https://projects.kde.org/projects/kde/kdeedu/kalgebra/repository/revisions/840838ef
-Applied-Upstream: 4.7.3
-Description: Install analitzagui/variablesmodel.h
- Without this patch wouldn't be possible to build cantor-backend-kalgebra, built
- in the cantor source package.
---- a/analitzagui/CMakeLists.txt
-+++ b/analitzagui/CMakeLists.txt
-@@ -41,6 +41,7 @@ if(INSTALL_ANALITZA_HEADERS)
- 		algebrahighlighter.h
- 		analitzaguiexport.h
- 		operatorsmodel.h
-+		variablesmodel.h
- 
-                 DESTINATION ${INCLUDE_INSTALL_DIR}/analitzagui/ COMPONENT Devel)
- endif(INSTALL_ANALITZA_HEADERS)
--- 
-1.7.7
-
diff --git a/debian/patches/series b/debian/patches/series
index dbd0f36..ba161c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-add_findanalitza.diff
-install_variables_model.diff
 enable_debianabimanager.diff

-- 
kalgebra packaging



More information about the pkg-kde-commits mailing list