[SCM] kdenlive packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-561-gb8d8ab5
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Thu Feb 18 19:30:41 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdenlive.git;a=commitdiff;h=4449773
The following commit has been merged in the kubuntu_xenial_archive branch:
commit 4449773f6bcb7d4115de8e13a357db60f8af1c54
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date: Wed Feb 4 09:15:24 2009 +0000
Remove patches and dpatch.
git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk/debian@485 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
control | 2 +-
patches/00list | 1 -
patches/01-escape-hyphens-man.dpatch | 122 -----------------------------------
rules | 6 +-
4 files changed, 3 insertions(+), 128 deletions(-)
diff --git a/control b/control
index 38daa8f..5d320eb 100644
--- a/control
+++ b/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Patrick Matthäi <patrick.matthaei at web.de>
Homepage: http://www.kdenlive.org/
Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 7), dpatch, cmake, ccache, kdelibs5-dev, libavc1394-dev, libmlt-dev, libmlt++-dev, libiec61883-dev, libavcodec-dev, libavformat-dev, libavdevice-dev, libavutil-dev
+Build-Depends: debhelper (>= 7), cmake, ccache, kdelibs5-dev, libavc1394-dev, libmlt-dev, libmlt++-dev, libiec61883-dev, libavcodec-dev, libavformat-dev, libavdevice-dev, libavutil-dev
DM-Upload-Allowed: yes
Package: kdenlive
diff --git a/patches/00list b/patches/00list
deleted file mode 100644
index da9b644..0000000
--- a/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01-escape-hyphens-man.dpatch
diff --git a/patches/01-escape-hyphens-man.dpatch b/patches/01-escape-hyphens-man.dpatch
deleted file mode 100644
index 36d3347..0000000
--- a/patches/01-escape-hyphens-man.dpatch
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-escape-hyphens-man.dpatch by Patrick Matthäi <patrick.matthaei at web.de>
-##
-## DP: Escape all used hypens in the manpages.
-
- at DPATCH@
-
-diff -Naur kdenlive-0.7.1.orig/man/kdenlive.1 kdenlive-0.7.1/man/kdenlive.1
---- kdenlive-0.7.1.orig/man/kdenlive.1 2008-12-30 18:49:14.000000000 +0100
-+++ kdenlive-0.7.1/man/kdenlive.1 2008-12-30 19:17:11.000000000 +0100
-@@ -1,11 +1,11 @@
- .\" This file was generated by kdemangen.pl
- .TH KDENLIVE 1 "Nov 2008" "K Desktop Environment" "An open source video editor."
- .SH NAME
--kdenlive \- An open source non-linear video editor.
-+kdenlive \- An open source non\-linear video editor.
- .SH SYNOPSIS
- kdenlive [Qt\-options] [KDE\-options] [options] [file]
- .SH DESCRIPTION
--Kdenlive is an open source non-linear video editor which supports a
-+Kdenlive is an open source non\-linear video editor which supports a
- large number of formats for editing, including DV, AVCHD (experimental support) and HDV. Kdenlive relies on several other open source projects, such as FFmpeg and MLT video framework.
- .SH OPTIONS
- .SS
-@@ -65,23 +65,23 @@
- sets the application GUI style
- .TP
- .B \-\-geometry <geometry>
--sets the client geometry of the main widget - see man X for the argument format
-+sets the client geometry of the main widget \- see man X for the argument format
- .SS
- .SS Qt options:
- .TP
- .B \-\-display <displayname>
--Use the X-server display 'displayname'
-+Use the X\-server display 'displayname'
- .TP
- .B \-\-session <sessionId>
- Restore the application for the given 'sessionId'
- .TP
- .B \-\-cmap
- Causes the application to install a private color
--map on an 8-bit display
-+map on an 8\-bit display
- .TP
- .B \-\-ncols <count>
- Limits the number of colors allocated in the color
--cube on an 8-bit display, if the application is
-+cube on an 8\-bit display, if the application is
- using the QApplication::ManyColor color
- specification
- .TP
-@@ -90,7 +90,7 @@
- .TP
- .B \-\-dograb
- running under a debugger can cause an implicit
---nograb, use -dograb to override
-+\-nograb, use \-dograb to override
- .TP
- .B \-\-sync
- switches to synchronous mode for debugging
-@@ -117,7 +117,7 @@
- .TP
- .B \-\-visual TrueColor
- forces the application to use a TrueColor visual on
--an 8-bit display
-+an 8\-bit display
- .TP
- .B \-\-inputstyle <inputstyle>
- sets XIM (X Input Method) input style. Possible
-@@ -143,7 +143,7 @@
- .br
- .SH AUTHORS
- .nf
--Jean-Baptiste Mardelle <jb at kdenlive.org>
-+Jean\-Baptiste Mardelle <jb at kdenlive.org>
- .br
- Marco Gittler <g.marco at freenet.de>
- .br
-diff -Naur kdenlive-0.7.1.orig/man/kdenlive_render.1 kdenlive-0.7.1/man/kdenlive_render.1
---- kdenlive-0.7.1.orig/man/kdenlive_render.1 2008-12-30 18:49:14.000000000 +0100
-+++ kdenlive-0.7.1/man/kdenlive_render.1 2008-12-30 18:51:31.000000000 +0100
-@@ -4,7 +4,7 @@
- kdenlive_render
- \- Render program for Kdenlive.
- .SH SYNOPSIS
--kdenlive_render [-erase] [in=pos] [out=pos] [render] [profile] [rendermodule] [player] [src] [dest] [[arg1] [arg2] ...]
-+kdenlive_render [\-erase] [in=pos] [out=pos] [render] [profile] [rendermodule] [player] [src] [dest] [[arg1] [arg2] ...]
- .SH DESCRIPTION
- Render program for Kdenlive. Renders kdenlive project detached from Kdenlive, while providing feedback through kuiserver. This program is not meant to be called directly by users, but is called from Kdenlive, when a rendering process is started.
- .SH OPTIONS
-@@ -30,25 +30,25 @@
- The MLT consumer used for rendering, usually it is avformat
- .TP
- .B player
--Path to video player to play when rendering is over, use '-' to disable playing
-+Path to video player to play when rendering is over, use '\-' to disable playing
- .TP
- .B src
--Source file - usually MLT Westley playlist
-+Source file \- usually MLT Westley playlist
- .TP
- .B dest
- Destination file
- .TP
- .B args
- Space separated libavformat arguments
--.SS
-+.SS
-
- .SH SEE ALSO
--Please see the homepage at
-+Please see the homepage at
- .BR http://www.kdenlive.org/
- .br
- .SH AUTHORS
- .nf
--Jean-Baptiste Mardelle <jb at kdenlive.org>
-+Jean\-Baptiste Mardelle <jb at kdenlive.org>
- .br
- Marco Gittler <g.marco at freenet.de>
- .br
diff --git a/rules b/rules
index 1798ecd..987c53a 100755
--- a/rules
+++ b/rules
@@ -2,8 +2,6 @@
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -20,7 +18,7 @@ endif
CMAKE_SYSTEM_PROCESSOR = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
configure: configure-stamp
-configure-stamp: patch
+configure-stamp:
dh_testdir
[ -d build ] || mkdir build
cp CMakeLists.txt build
@@ -46,7 +44,7 @@ build-stamp: configure
cd build && $(MAKE) -j $(NCPUS)
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
--
kdenlive packaging
More information about the pkg-kde-commits
mailing list