[SCM] kwave packaging branch, master, updated. 5920fec97d57d659e6325f5c84c70fd6ab654315
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Wed Dec 14 15:41:42 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kwave.git;a=commitdiff;h=5920fec
The following commit has been merged in the master branch:
commit 5920fec97d57d659e6325f5c84c70fd6ab654315
Author: Jonathan Riddell <jr at jriddell.org>
Date: Wed Dec 14 15:41:39 2016 +0000
update for 16.12
---
debian/changelog | 6 ++
debian/control | 4 +-
debian/patches/07-no-rpath | 23 ------
debian/patches/cmake-verbose.diff | 18 -----
debian/patches/series | 3 -
...-for-ppc-optimized-memcpy-support-for-pow.patch | 88 ----------------------
debian/rules | 3 +
debian/watch | 9 +--
8 files changed, 13 insertions(+), 141 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f6a0dd5..a54079c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kwave (16.12.0-0) UNRELEASED; urgency=medium
+
+ * Moved to KDE Applications, new version number
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 14 Dec 2016 14:59:59 +0000
+
kwave (0.9.2-1-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index c1638a6..fef36a6 100644
--- a/debian/control
+++ b/debian/control
@@ -13,10 +13,10 @@ Build-Depends: debhelper (>= 9), pkg-kde-tools (>= 0.15.16),
libkf5coreaddons-dev,
libkf5crash-dev,
libkf5dbusaddons-dev,
- kdoctools-dev,
+ libkf5doctools-dev,
libkf5i18n-dev,
libkf5iconthemes-dev,
- kio-dev,
+ libkf5kio-dev,
libkf5service-dev,
libkf5textwidgets-dev,
libkf5widgetsaddons-dev,
diff --git a/debian/patches/07-no-rpath b/debian/patches/07-no-rpath
deleted file mode 100644
index fe04670..0000000
--- a/debian/patches/07-no-rpath
+++ /dev/null
@@ -1,23 +0,0 @@
-Author: Ralf Treinen <treinen at debian.org>
-Originator: Ruben Molina <rmolina at udea.edu.co>
-Description: Do not set rpath
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -245,11 +245,11 @@ INCLUDE_DIRECTORIES(
- #############################################################################
- ### RPATH settings ###
-
--SET(CMAKE_SKIP_BUILD_RPATH TRUE)
--SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
--SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
--SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
--MESSAGE(STATUS "Using ${CMAKE_INSTALL_RPATH} as install RPATH")
-+#SET(CMAKE_SKIP_BUILD_RPATH TRUE)
-+#SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-+#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
-+#SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-+#MESSAGE(STATUS "Using ${CMAKE_INSTALL_RPATH} as install RPATH")
-
- #############################################################################
- ### checks for needed header files ###
diff --git a/debian/patches/cmake-verbose.diff b/debian/patches/cmake-verbose.diff
deleted file mode 100644
index c45da23..0000000
--- a/debian/patches/cmake-verbose.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Do not force a silent build
- Do not force CMAKE_VERBOSE_MAKEFILE to OFF, so it can be set if needed
- (e.g. as cmake parameter).
-Last-Update: 2015-12-12
-Forwarded: not-needed
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -144,7 +144,7 @@ INCLUDE(CheckFunctionExists)
-
- #############################################################################
-
--SET(CMAKE_VERBOSE_MAKEFILE OFF)
-+#SET(CMAKE_VERBOSE_MAKEFILE OFF)
-
- #############################################################################
- ### toplevel compiler flags ###
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ebba165..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-07-no-rpath
-cmake-verbose.diff
-upstream_compile-fix-for-ppc-optimized-memcpy-support-for-pow.patch
diff --git a/debian/patches/upstream_compile-fix-for-ppc-optimized-memcpy-support-for-pow.patch b/debian/patches/upstream_compile-fix-for-ppc-optimized-memcpy-support-for-pow.patch
deleted file mode 100644
index 0d5ccfd..0000000
--- a/debian/patches/upstream_compile-fix-for-ppc-optimized-memcpy-support-for-pow.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 1bf6aa2f3c1742415755748fe80b5980a8b239e5 Mon Sep 17 00:00:00 2001
-From: Thomas Eschenbacher <Thomas.Eschenbacher at gmx.de>
-Date: Thu, 30 Jun 2016 18:13:45 +0200
-Subject: [PATCH] compile fix for ppc: optimized memcpy support for powerpc has
- been removed
-
-(see commit 92589a6d71fc32615b9390f87e10932d9ffebdb3)
----
- AUTHORS | 5 -----
- doc/en/index.docbook | 9 ---------
- libkwave/memcpy.c | 11 -----------
- 3 files changed, 25 deletions(-)
-
-diff --git a/AUTHORS b/AUTHORS
-index 63f57f0..d113f27 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -114,11 +114,6 @@ Matthias Kretz, <kretz at kde.org>
- Miguel Freitas
- * parts of libkwave/memcpy.c
-
--Paul Mackerras <paulus at samba.org>
-- * libkwave/ppcasm_string.h
-- * libkwave/ppcasm_string.S
-- * libkwave/ppc_asm.tmpl
--
- Richard Laerkaeng, <richard at goteborg.utfors.se>
- * cmake/FindOggVorbis.cmake
-
-diff --git a/doc/en/index.docbook b/doc/en/index.docbook
-index a56acc8..2e8ff11 100644
---- a/doc/en/index.docbook
-+++ b/doc/en/index.docbook
-@@ -8493,15 +8493,6 @@
- </listitem>
- <listitem>
- <para><emphasis role="bold">
-- Paul Mackerras <email>paulus at samba.org</email>
-- </emphasis></para><para>
-- libkwave/ppcasm_string.h,
-- libkwave/ppcasm_string.S,
-- libkwave/ppc_asm.tmpl
-- </para>
-- </listitem>
-- <listitem>
-- <para><emphasis role="bold">
- Richard Laerkaeng, <email>richard at goteborg.utfors.se</email>
- </emphasis></para><para>
- cmake/FindOggVorbis.cmake
-diff --git a/libkwave/memcpy.c b/libkwave/memcpy.c
-index 4df3d8e..cc25c2d 100644
---- a/libkwave/memcpy.c
-+++ b/libkwave/memcpy.c
-@@ -48,10 +48,6 @@
- #include "config.h"
- #endif
-
--#if defined (ARCH_PPC) && !defined (HOST_OS_DARWIN)
--#include "ppcasm_string.h"
--#endif
--
- #ifdef HAVE_SYS_TIMES_H
- #include <sys/times.h>
- #else
-@@ -528,10 +524,6 @@ static const struct {
- { "AVX", avx_memcpy, MM_ACCEL_X86_AVX },
- # endif /* HAVE_AVX */
- #endif /* ARCH_X86 */
--#if defined (ARCH_PPC) && !defined (HOST_OS_DARWIN)
-- { "ppcasm", ppcasm_memcpy, 0 },
-- { "ppcasm_cached", ppcasm_cacheable_memcpy, MM_ACCEL_PPC_CACHE32 },
--#endif /* ARCH_PPC && !HOST_OS_DARWIN */
- { "", NULL, 0 }
- };
-
-@@ -627,9 +619,6 @@ void probe_fast_memcpy(void)
- "avx",
- # endif /* HAVE_AVX */
- #endif
--#if defined (ARCH_PPC) && !defined (HOST_OS_DARWIN)
-- "ppcasm_memcpy", "ppcasm_cacheable_memcpy",
--#endif
- NULL
- };
-
---
-2.8.1
-
diff --git a/debian/rules b/debian/rules
index 178f17e..c1fd540 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,3 +16,6 @@ override_dh_auto_configure:
override_dh_strip:
dh_strip --dbgsym-migration='kwave-dbg (<< 0.9.2-1-1~)'
+
+override_dh_auto_test:
+ true
diff --git a/debian/watch b/debian/watch
index ca2c64b..6fd72b5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,7 +1,2 @@
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-# Uncomment to find new files on sourceforge, for devscripts >= 2.9
-http://sf.net/kwave/kwave-(.*)\.tar\.bz2 debian svn-upgrade
+version=4
+opts=pgpsigurlmangle=s/$/.sig/ http://download.kde.org/stable/applications/([\d.]+)/src/kwave-([\d.]+).tar.xz
--
kwave packaging
More information about the pkg-kde-commits
mailing list