[SCM] libavc1394/master: Convert dpatch patches to quilt format.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Feb 8 18:36:30 UTC 2012


The following commit has been merged in the master branch:
commit 8ebcce97003e63cfebb5796d16f6db4d23f79bd3
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Feb 8 19:36:43 2012 +0100

    Convert dpatch patches to quilt format.

diff --git a/debian/patches/10_plugs_are_devel_only.dpatch b/debian/patches/0001-plugs_are_devel_only.patch
similarity index 67%
rename from debian/patches/10_plugs_are_devel_only.dpatch
rename to debian/patches/0001-plugs_are_devel_only.patch
index ec1e74e..0ebdbea 100644
--- a/debian/patches/10_plugs_are_devel_only.dpatch
+++ b/debian/patches/0001-plugs_are_devel_only.patch
@@ -1,13 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_plugs_are_devel_only.dpatch by Daniel Kobras <kobras at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Update documentation to clarify that pluginfo option is not meant
-## DP: to be understood by non-developers.
+Author: Daniel Kobras <kobras at debian.org>
+Description: Update documentation to clarify that pluginfo option is not meant
+ to be understood by non-developers.
+---
+ test/dvcont.1 |    5 +++--
+ test/dvcont.c |    2 +-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
 
- at DPATCH@
---- libavc1394-0.5.0.orig/test/dvcont.1
-+++ libavc1394-0.5.0/test/dvcont.1
+--- libavc1394.orig/test/dvcont.1
++++ libavc1394/test/dvcont.1
 @@ -18,7 +18,7 @@
  .\" This manual page was written especially for Debian Linux. It is based
  .\" on dvcont's help output using help2man and manual hacking.
@@ -17,7 +17,7 @@
  .SH NAME
  dvcont \- send control commands to DV cameras
  .SH SYNOPSIS
-@@ -95,7 +95,8 @@
+@@ -95,7 +95,8 @@ given in format HH:MM:SS:FF as above.
  Report the status of the device.
  .TP
  .B pluginfo
@@ -27,9 +27,9 @@
  .TP
  .B verbose
  Tell the program to tell you debug info.
---- libavc1394-0.5.0.orig/test/dvcont.c
-+++ libavc1394-0.5.0/test/dvcont.c
-@@ -65,7 +65,7 @@
+--- libavc1394.orig/test/dvcont.c
++++ libavc1394/test/dvcont.c
+@@ -65,7 +65,7 @@ printf("\neject - Tell the camera to eje
  printf("\ntimecode - Report the timecode from the tape (HH:MM:SS:FF)");
  printf("\nseek - Tell the camera to go to the <timecode> (HH:MM:SS:FF)");
  printf("\nstatus - Report the status of the device");
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1573422..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-10_plugs_are_devel_only
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..16be49d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-plugs_are_devel_only.patch

-- 
libavc1394 packaging



More information about the pkg-multimedia-commits mailing list