Package: subtitleeditor
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From efd6b63603cab8ad7d4c445c87adadfd2baea0e8 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Tue, 28 Feb 2012 12:48:55 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/changelog | 8 +
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 2 -
...cc_4.4_ftbfs.dpatch => fix_gcc_4.4_ftbfs.patch} | 8 +-
debian/patches/series | 2 +
...tch => subtitleeditor-0.30.0-fix-linkage.patch} | 224 +++++++++-----------
debian/rules | 14 +-
debian/source/format | 1 +
9 files changed, 123 insertions(+), 142 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{fix_gcc_4.4_ftbfs.dpatch => fix_gcc_4.4_ftbfs.patch} (81%)
create mode 100644 debian/patches/series
rename debian/patches/{subtitleeditor-0.30.0-fix-linkage.dpatch => subtitleeditor-0.30.0-fix-linkage.patch} (83%)
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 299e262..86a3ce5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+subtitleeditor (0.30.0-1.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net> Tue, 28 Feb 2012 11:50:23 -0500
+
subtitleeditor (0.30.0-1.2) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 758e23f..3981b6f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: subtitleeditor
Section: gnome
Priority: optional
Maintainer: Anibal Avelar <aave...@cofradia.org>
-Build-Depends: debhelper (>= 5), libtool, automake1.9, libgtkmm-2.4-dev, libglademm-2.4-dev, libgstreamer-plugins-base0.10-dev, x11proto-fixes-dev, libenchant-dev, iso-codes, gstreamer0.10-tools, gstreamer0.10-plugins-good, libxml++2.6-dev, intltool, libglibmm-2.4-dev, libcairomm-1.0-dev, libgtk2.0-dev, libatk1.0-dev, libpango1.0-dev, libglib2.0-dev, dpatch
+Build-Depends: debhelper (>= 9), libtool, automake1.9, libgtkmm-2.4-dev, libglademm-2.4-dev, libgstreamer-plugins-base0.10-dev, x11proto-fixes-dev, libenchant-dev, iso-codes, gstreamer0.10-tools, gstreamer0.10-plugins-good, libxml++2.6-dev, intltool, libglibmm-2.4-dev, libcairomm-1.0-dev, libgtk2.0-dev, libatk1.0-dev, libpango1.0-dev, libglib2.0-dev
Homepage: http://home.gna.org/subtitleeditor/
-Standards-Version: 3.8.1
+Standards-Version: 3.9.3
Package: subtitleeditor
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 8b9f852..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-subtitleeditor-0.30.0-fix-linkage
-fix_gcc_4.4_ftbfs.dpatch
diff --git a/debian/patches/fix_gcc_4.4_ftbfs.dpatch b/debian/patches/fix_gcc_4.4_ftbfs.patch
similarity index 81%
rename from debian/patches/fix_gcc_4.4_ftbfs.dpatch
rename to debian/patches/fix_gcc_4.4_ftbfs.patch
index 5dc6217..b756e3c 100644
--- a/debian/patches/fix_gcc_4.4_ftbfs.dpatch
+++ b/debian/patches/fix_gcc_4.4_ftbfs.patch
@@ -1,8 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_gcc_4.4_ftbfs.dpatch.dpatch by Filippo Giunchedi <fili...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix FTBFS with gcc 4.4 headers
+From: Filippo Giunchedi <fili...@debian.org>
+Subject: Fix FTBFS with gcc 4.4 headers
+
--- ./plugins/subtitleformats/mpsub/mpsub.cc~ 2009-04-29 16:32:23.000000000 +0000
+++ ./plugins/subtitleformats/mpsub/mpsub.cc 2009-04-29 16:32:31.000000000 +0000
@@ -22,6 +22,7 @@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3231eaa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+subtitleeditor-0.30.0-fix-linkage.patch
+fix_gcc_4.4_ftbfs.patch
diff --git a/debian/patches/subtitleeditor-0.30.0-fix-linkage.dpatch b/debian/patches/subtitleeditor-0.30.0-fix-linkage.patch
similarity index 83%
rename from debian/patches/subtitleeditor-0.30.0-fix-linkage.dpatch
rename to debian/patches/subtitleeditor-0.30.0-fix-linkage.patch
index e531d4b..61a12c2 100644
--- a/debian/patches/subtitleeditor-0.30.0-fix-linkage.dpatch
+++ b/debian/patches/subtitleeditor-0.30.0-fix-linkage.patch
@@ -1,30 +1,8 @@
-#! /bin/sh -e
-## subtitleeditor-0.30.0-fix-linkage.patch by Anibal Avelar <aave...@cofradia.org>
-## Taken from RPM package written for Funda Wang <fundaw...@mandriva.org>
-## for the Mandriva project
-## DP: the patch fixed a problem with bad links with some libraries
+From: Anibal Avelar <aave...@cofradia.org>
+Subject: the patch fixed a problem with bad links with some libraries
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p0 < $0;;
- -unpatch) patch $patch_opts -p0 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argum
-ent"
- exit 1;;
-esac
-
-exit 0
-Index: plugins/actions/insertsubtitle/Makefile.am
-===================================================================
---- plugins/actions/insertsubtitle/Makefile.am (révision 478)
-+++ plugins/actions/insertsubtitle/Makefile.am (copie de travail)
+--- a/plugins/actions/insertsubtitle/Makefile.am (révision 478)
++++ b/plugins/actions/insertsubtitle/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
insertsubtitle.cc
@@ -36,8 +14,8 @@ Index: plugins/actions/insertsubtitle/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/reversetextandtranslation/Makefile.am
===================================================================
---- plugins/actions/reversetextandtranslation/Makefile.am (révision 478)
-+++ plugins/actions/reversetextandtranslation/Makefile.am (copie de travail)
+--- a/plugins/actions/reversetextandtranslation/Makefile.am (révision 478)
++++ b/plugins/actions/reversetextandtranslation/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
reversetextandtranslation.cc
@@ -49,8 +27,8 @@ Index: plugins/actions/reversetextandtranslation/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/moveafterprecedingsubtitle/Makefile.am
===================================================================
---- plugins/actions/moveafterprecedingsubtitle/Makefile.am (révision 478)
-+++ plugins/actions/moveafterprecedingsubtitle/Makefile.am (copie de travail)
+--- a/plugins/actions/moveafterprecedingsubtitle/Makefile.am (révision 478)
++++ b/plugins/actions/moveafterprecedingsubtitle/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
moveafterprecedingsubtitle.cc
@@ -62,8 +40,8 @@ Index: plugins/actions/moveafterprecedingsubtitle/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/scalesubtitles/Makefile.am
===================================================================
---- plugins/actions/scalesubtitles/Makefile.am (révision 478)
-+++ plugins/actions/scalesubtitles/Makefile.am (copie de travail)
+--- a/plugins/actions/scalesubtitles/Makefile.am (révision 478)
++++ b/plugins/actions/scalesubtitles/Makefile.am (copie de travail)
@@ -17,7 +17,7 @@
scalesubtitles.cc
@@ -75,8 +53,8 @@ Index: plugins/actions/scalesubtitles/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/dialoguize/Makefile.am
===================================================================
---- plugins/actions/dialoguize/Makefile.am (révision 478)
-+++ plugins/actions/dialoguize/Makefile.am (copie de travail)
+--- a/plugins/actions/dialoguize/Makefile.am (révision 478)
++++ b/plugins/actions/dialoguize/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
dialoguize.cc
@@ -88,8 +66,8 @@ Index: plugins/actions/dialoguize/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/findandreplace/Makefile.am
===================================================================
---- plugins/actions/findandreplace/Makefile.am (révision 478)
-+++ plugins/actions/findandreplace/Makefile.am (copie de travail)
+--- a/plugins/actions/findandreplace/Makefile.am (révision 478)
++++ b/plugins/actions/findandreplace/Makefile.am (copie de travail)
@@ -18,7 +18,7 @@
findandreplace.cc
@@ -101,8 +79,8 @@ Index: plugins/actions/findandreplace/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/timemodemanagement/Makefile.am
===================================================================
---- plugins/actions/timemodemanagement/Makefile.am (révision 478)
-+++ plugins/actions/timemodemanagement/Makefile.am (copie de travail)
+--- a/plugins/actions/timemodemanagement/Makefile.am (révision 478)
++++ b/plugins/actions/timemodemanagement/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
timemodemanagement.cc
@@ -114,8 +92,8 @@ Index: plugins/actions/timemodemanagement/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/movesubtitles/Makefile.am
===================================================================
---- plugins/actions/movesubtitles/Makefile.am (révision 478)
-+++ plugins/actions/movesubtitles/Makefile.am (copie de travail)
+--- a/plugins/actions/movesubtitles/Makefile.am (révision 478)
++++ b/plugins/actions/movesubtitles/Makefile.am (copie de travail)
@@ -18,7 +18,7 @@
movesubtitles.cc
@@ -127,8 +105,8 @@ Index: plugins/actions/movesubtitles/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/styleeditor/Makefile.am
===================================================================
---- plugins/actions/styleeditor/Makefile.am (révision 478)
-+++ plugins/actions/styleeditor/Makefile.am (copie de travail)
+--- a/plugins/actions/styleeditor/Makefile.am (révision 478)
++++ b/plugins/actions/styleeditor/Makefile.am (copie de travail)
@@ -19,7 +19,7 @@
styleeditor.cc
@@ -140,8 +118,8 @@ Index: plugins/actions/styleeditor/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/removesubtitle/Makefile.am
===================================================================
---- plugins/actions/removesubtitle/Makefile.am (révision 478)
-+++ plugins/actions/removesubtitle/Makefile.am (copie de travail)
+--- a/plugins/actions/removesubtitle/Makefile.am (révision 478)
++++ b/plugins/actions/removesubtitle/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
removesubtitle.cc
@@ -153,8 +131,8 @@ Index: plugins/actions/removesubtitle/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/adjusttime/Makefile.am
===================================================================
---- plugins/actions/adjusttime/Makefile.am (révision 478)
-+++ plugins/actions/adjusttime/Makefile.am (copie de travail)
+--- a/plugins/actions/adjusttime/Makefile.am (révision 478)
++++ b/plugins/actions/adjusttime/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
adjusttime.cc
@@ -166,8 +144,8 @@ Index: plugins/actions/adjusttime/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/documentmanagement/Makefile.am
===================================================================
---- plugins/actions/documentmanagement/Makefile.am (révision 478)
-+++ plugins/actions/documentmanagement/Makefile.am (copie de travail)
+--- a/plugins/actions/documentmanagement/Makefile.am (révision 478)
++++ b/plugins/actions/documentmanagement/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
documentmanagement.cc
@@ -179,8 +157,8 @@ Index: plugins/actions/documentmanagement/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/changeframerate/Makefile.am
===================================================================
---- plugins/actions/changeframerate/Makefile.am (révision 478)
-+++ plugins/actions/changeframerate/Makefile.am (copie de travail)
+--- a/plugins/actions/changeframerate/Makefile.am (révision 478)
++++ b/plugins/actions/changeframerate/Makefile.am (copie de travail)
@@ -18,7 +18,7 @@
changeframerate.cc
@@ -192,8 +170,8 @@ Index: plugins/actions/changeframerate/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/italicize/Makefile.am
===================================================================
---- plugins/actions/italicize/Makefile.am (révision 478)
-+++ plugins/actions/italicize/Makefile.am (copie de travail)
+--- a/plugins/actions/italicize/Makefile.am (révision 478)
++++ b/plugins/actions/italicize/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
italicize.cc
@@ -205,8 +183,8 @@ Index: plugins/actions/italicize/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/command/Makefile.am
===================================================================
---- plugins/actions/command/Makefile.am (révision 478)
-+++ plugins/actions/command/Makefile.am (copie de travail)
+--- a/plugins/actions/command/Makefile.am (révision 478)
++++ b/plugins/actions/command/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
command.cc
@@ -218,8 +196,8 @@ Index: plugins/actions/command/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/videoplayermanagement/Makefile.am
===================================================================
---- plugins/actions/videoplayermanagement/Makefile.am (révision 478)
-+++ plugins/actions/videoplayermanagement/Makefile.am (copie de travail)
+--- a/plugins/actions/videoplayermanagement/Makefile.am (révision 478)
++++ b/plugins/actions/videoplayermanagement/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
videoplayermanagement.cc
@@ -231,8 +209,8 @@ Index: plugins/actions/videoplayermanagement/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/configurekeyboardshortcuts/Makefile.am
===================================================================
---- plugins/actions/configurekeyboardshortcuts/Makefile.am (révision 478)
-+++ plugins/actions/configurekeyboardshortcuts/Makefile.am (copie de travail)
+--- a/plugins/actions/configurekeyboardshortcuts/Makefile.am (révision 478)
++++ b/plugins/actions/configurekeyboardshortcuts/Makefile.am (copie de travail)
@@ -18,7 +18,7 @@
configurekeyboardshortcuts.cc
@@ -244,8 +222,8 @@ Index: plugins/actions/configurekeyboardshortcuts/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/wavefrommanagement/Makefile.am
===================================================================
---- plugins/actions/wavefrommanagement/Makefile.am (révision 478)
-+++ plugins/actions/wavefrommanagement/Makefile.am (copie de travail)
+--- a/plugins/actions/wavefrommanagement/Makefile.am (révision 478)
++++ b/plugins/actions/wavefrommanagement/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
waveformmanagement.cc
@@ -257,8 +235,8 @@ Index: plugins/actions/wavefrommanagement/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/selection/Makefile.am
===================================================================
---- plugins/actions/selection/Makefile.am (révision 478)
-+++ plugins/actions/selection/Makefile.am (copie de travail)
+--- a/plugins/actions/selection/Makefile.am (révision 478)
++++ b/plugins/actions/selection/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
selection.cc
@@ -270,8 +248,8 @@ Index: plugins/actions/selection/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/editcell/Makefile.am
===================================================================
---- plugins/actions/editcell/Makefile.am (révision 478)
-+++ plugins/actions/editcell/Makefile.am (copie de travail)
+--- a/plugins/actions/editcell/Makefile.am (révision 478)
++++ b/plugins/actions/editcell/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
editcell.cc
@@ -283,8 +261,8 @@ Index: plugins/actions/editcell/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/errorchecking/Makefile.am
===================================================================
---- plugins/actions/errorchecking/Makefile.am (révision 478)
-+++ plugins/actions/errorchecking/Makefile.am (copie de travail)
+--- a/plugins/actions/errorchecking/Makefile.am (révision 478)
++++ b/plugins/actions/errorchecking/Makefile.am (copie de travail)
@@ -27,7 +27,7 @@
tooshortdisplaytime.h
@@ -296,8 +274,8 @@ Index: plugins/actions/errorchecking/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/duplicatesubtitle/Makefile.am
===================================================================
---- plugins/actions/duplicatesubtitle/Makefile.am (révision 478)
-+++ plugins/actions/duplicatesubtitle/Makefile.am (copie de travail)
+--- a/plugins/actions/duplicatesubtitle/Makefile.am (révision 478)
++++ b/plugins/actions/duplicatesubtitle/Makefile.am (copie de travail)
@@ -12,7 +12,7 @@
duplicatesubtitle.cc
@@ -309,8 +287,8 @@ Index: plugins/actions/duplicatesubtitle/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/externalvideoplayer/Makefile.am
===================================================================
---- plugins/actions/externalvideoplayer/Makefile.am (révision 478)
-+++ plugins/actions/externalvideoplayer/Makefile.am (copie de travail)
+--- a/plugins/actions/externalvideoplayer/Makefile.am (révision 478)
++++ b/plugins/actions/externalvideoplayer/Makefile.am (copie de travail)
@@ -18,7 +18,7 @@
externalvideoplayer.cc
@@ -322,8 +300,8 @@ Index: plugins/actions/externalvideoplayer/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/extendlength/Makefile.am
===================================================================
---- plugins/actions/extendlength/Makefile.am (révision 478)
-+++ plugins/actions/extendlength/Makefile.am (copie de travail)
+--- a/plugins/actions/extendlength/Makefile.am (révision 478)
++++ b/plugins/actions/extendlength/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
extendlength.cc
@@ -335,8 +313,8 @@ Index: plugins/actions/extendlength/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/splitdocument/Makefile.am
===================================================================
---- plugins/actions/splitdocument/Makefile.am (révision 478)
-+++ plugins/actions/splitdocument/Makefile.am (copie de travail)
+--- a/plugins/actions/splitdocument/Makefile.am (révision 478)
++++ b/plugins/actions/splitdocument/Makefile.am (copie de travail)
@@ -18,7 +18,7 @@
splitdocument.cc
@@ -348,8 +326,8 @@ Index: plugins/actions/splitdocument/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/joindocument/Makefile.am
===================================================================
---- plugins/actions/joindocument/Makefile.am (révision 478)
-+++ plugins/actions/joindocument/Makefile.am (copie de travail)
+--- a/plugins/actions/joindocument/Makefile.am (révision 478)
++++ b/plugins/actions/joindocument/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
joindocument.cc
@@ -361,8 +339,8 @@ Index: plugins/actions/joindocument/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/preferences/Makefile.am
===================================================================
---- plugins/actions/preferences/Makefile.am (révision 478)
-+++ plugins/actions/preferences/Makefile.am (copie de travail)
+--- a/plugins/actions/preferences/Makefile.am (révision 478)
++++ b/plugins/actions/preferences/Makefile.am (copie de travail)
@@ -25,7 +25,7 @@
preferencesplugin.cc
@@ -374,8 +352,8 @@ Index: plugins/actions/preferences/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/applytranslation/Makefile.am
===================================================================
---- plugins/actions/applytranslation/Makefile.am (révision 478)
-+++ plugins/actions/applytranslation/Makefile.am (copie de travail)
+--- a/plugins/actions/applytranslation/Makefile.am (révision 478)
++++ b/plugins/actions/applytranslation/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
applytranslation.cc
@@ -387,8 +365,8 @@ Index: plugins/actions/applytranslation/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/viewmanager/Makefile.am
===================================================================
---- plugins/actions/viewmanager/Makefile.am (révision 478)
-+++ plugins/actions/viewmanager/Makefile.am (copie de travail)
+--- a/plugins/actions/viewmanager/Makefile.am (révision 478)
++++ b/plugins/actions/viewmanager/Makefile.am (copie de travail)
@@ -18,7 +18,7 @@
viewmanager.cc
@@ -400,8 +378,8 @@ Index: plugins/actions/viewmanager/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/splitsubtitle/Makefile.am
===================================================================
---- plugins/actions/splitsubtitle/Makefile.am (révision 478)
-+++ plugins/actions/splitsubtitle/Makefile.am (copie de travail)
+--- a/plugins/actions/splitsubtitle/Makefile.am (révision 478)
++++ b/plugins/actions/splitsubtitle/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
splitsubtitle.cc
@@ -413,8 +391,8 @@ Index: plugins/actions/splitsubtitle/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/plaintext/Makefile.am
===================================================================
---- plugins/actions/plaintext/Makefile.am (révision 478)
-+++ plugins/actions/plaintext/Makefile.am (copie de travail)
+--- a/plugins/actions/plaintext/Makefile.am (révision 478)
++++ b/plugins/actions/plaintext/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
plaintext.cc
@@ -426,8 +404,8 @@ Index: plugins/actions/plaintext/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/about/Makefile.am
===================================================================
---- plugins/actions/about/Makefile.am (révision 478)
-+++ plugins/actions/about/Makefile.am (copie de travail)
+--- a/plugins/actions/about/Makefile.am (révision 478)
++++ b/plugins/actions/about/Makefile.am (copie de travail)
@@ -14,7 +14,7 @@
about.cc
@@ -439,8 +417,8 @@ Index: plugins/actions/about/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/spellchecking/Makefile.am
===================================================================
---- plugins/actions/spellchecking/Makefile.am (révision 478)
-+++ plugins/actions/spellchecking/Makefile.am (copie de travail)
+--- a/plugins/actions/spellchecking/Makefile.am (révision 478)
++++ b/plugins/actions/spellchecking/Makefile.am (copie de travail)
@@ -19,7 +19,7 @@
spellchecking.cc
@@ -452,8 +430,8 @@ Index: plugins/actions/spellchecking/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/combinesubtitles/Makefile.am
===================================================================
---- plugins/actions/combinesubtitles/Makefile.am (révision 478)
-+++ plugins/actions/combinesubtitles/Makefile.am (copie de travail)
+--- a/plugins/actions/combinesubtitles/Makefile.am (révision 478)
++++ b/plugins/actions/combinesubtitles/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
combinesubtitles.cc
@@ -465,8 +443,8 @@ Index: plugins/actions/combinesubtitles/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/subtitleformats/substationalpha/Makefile.am
===================================================================
---- plugins/subtitleformats/substationalpha/Makefile.am (révision 478)
-+++ plugins/subtitleformats/substationalpha/Makefile.am (copie de travail)
+--- a/plugins/subtitleformats/substationalpha/Makefile.am (révision 478)
++++ b/plugins/subtitleformats/substationalpha/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
substationalpha.cc
@@ -478,8 +456,8 @@ Index: plugins/subtitleformats/substationalpha/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/subtitleformats/timedtextauthoringformat1/Makefile.am
===================================================================
---- plugins/subtitleformats/timedtextauthoringformat1/Makefile.am (révision 478)
-+++ plugins/subtitleformats/timedtextauthoringformat1/Makefile.am (copie de travail)
+--- a/plugins/subtitleformats/timedtextauthoringformat1/Makefile.am (révision 478)
++++ b/plugins/subtitleformats/timedtextauthoringformat1/Makefile.am (copie de travail)
@@ -15,7 +15,7 @@
libtimedtextauthoringformat1_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
@@ -491,8 +469,8 @@ Index: plugins/subtitleformats/timedtextauthoringformat1/Makefile.am
plugindescription_in_files = timedtextauthoringformat1.se-plugin.in
Index: plugins/subtitleformats/adobeencoredvd/Makefile.am
===================================================================
---- plugins/subtitleformats/adobeencoredvd/Makefile.am (révision 478)
-+++ plugins/subtitleformats/adobeencoredvd/Makefile.am (copie de travail)
+--- a/plugins/subtitleformats/adobeencoredvd/Makefile.am (révision 478)
++++ b/plugins/subtitleformats/adobeencoredvd/Makefile.am (copie de travail)
@@ -16,7 +16,7 @@
adobeencoredvdntsc.cc
@@ -513,8 +491,8 @@ Index: plugins/subtitleformats/adobeencoredvd/Makefile.am
adobeencoredvdntsc.se-plugin.in \
Index: plugins/subtitleformats/subrip/Makefile.am
===================================================================
---- plugins/subtitleformats/subrip/Makefile.am (révision 478)
-+++ plugins/subtitleformats/subrip/Makefile.am (copie de travail)
+--- a/plugins/subtitleformats/subrip/Makefile.am (révision 478)
++++ b/plugins/subtitleformats/subrip/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
subrip.cc
@@ -526,8 +504,8 @@ Index: plugins/subtitleformats/subrip/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/subtitleformats/mpsub/Makefile.am
===================================================================
---- plugins/subtitleformats/mpsub/Makefile.am (révision 478)
-+++ plugins/subtitleformats/mpsub/Makefile.am (copie de travail)
+--- a/plugins/subtitleformats/mpsub/Makefile.am (révision 478)
++++ b/plugins/subtitleformats/mpsub/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
mpsub.cc
@@ -539,8 +517,8 @@ Index: plugins/subtitleformats/mpsub/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/subtitleformats/advancedsubstationalpha/Makefile.am
===================================================================
---- plugins/subtitleformats/advancedsubstationalpha/Makefile.am (révision 478)
-+++ plugins/subtitleformats/advancedsubstationalpha/Makefile.am (copie de travail)
+--- a/plugins/subtitleformats/advancedsubstationalpha/Makefile.am (révision 478)
++++ b/plugins/subtitleformats/advancedsubstationalpha/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
advancedsubstationalpha.cc
@@ -552,8 +530,8 @@ Index: plugins/subtitleformats/advancedsubstationalpha/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/subtitleformats/microdvd/Makefile.am
===================================================================
---- plugins/subtitleformats/microdvd/Makefile.am (révision 478)
-+++ plugins/subtitleformats/microdvd/Makefile.am (copie de travail)
+--- a/plugins/subtitleformats/microdvd/Makefile.am (révision 478)
++++ b/plugins/subtitleformats/microdvd/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
microdvd.cc
@@ -565,8 +543,8 @@ Index: plugins/subtitleformats/microdvd/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/subtitleformats/subtitleeditorproject/Makefile.am
===================================================================
---- plugins/subtitleformats/subtitleeditorproject/Makefile.am (révision 478)
-+++ plugins/subtitleformats/subtitleeditorproject/Makefile.am (copie de travail)
+--- a/plugins/subtitleformats/subtitleeditorproject/Makefile.am (révision 478)
++++ b/plugins/subtitleformats/subtitleeditorproject/Makefile.am (copie de travail)
@@ -15,7 +15,7 @@
libsubtitleeditorproject_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
@@ -578,8 +556,8 @@ Index: plugins/subtitleformats/subtitleeditorproject/Makefile.am
plugindescription_in_files = subtitleeditorproject.se-plugin.in
Index: plugins/subtitleformats/mpl2/Makefile.am
===================================================================
---- plugins/subtitleformats/mpl2/Makefile.am (révision 478)
-+++ plugins/subtitleformats/mpl2/Makefile.am (copie de travail)
+--- a/plugins/subtitleformats/mpl2/Makefile.am (révision 478)
++++ b/plugins/subtitleformats/mpl2/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
mpl2.cc
@@ -591,8 +569,8 @@ Index: plugins/subtitleformats/mpl2/Makefile.am
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/subtitleformats/subviewer2/Makefile.am
===================================================================
---- plugins/subtitleformats/subviewer2/Makefile.am (révision 478)
-+++ plugins/subtitleformats/subviewer2/Makefile.am (copie de travail)
+--- a/plugins/subtitleformats/subviewer2/Makefile.am (révision 478)
++++ b/plugins/subtitleformats/subviewer2/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
subviewer2.cc
@@ -602,10 +580,10 @@ Index: plugins/subtitleformats/subviewer2/Makefile.am
plugindescription_in_files = subviewer2.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
-Index: configure.in
+Index: a/configure.in
===================================================================
---- configure.in (révision 478)
-+++ configure.in (copie de travail)
+--- a/configure.in (révision 478)
++++ b/configure.in (copie de travail)
@@ -213,7 +213,7 @@
# =========================================================================
# Set SUBTITLEEDITOR_LIBS and SUBTITLEEDITOR_CFLAGS
@@ -617,8 +595,8 @@ Index: configure.in
AC_SUBST(SUBTITLEEDITOR_LIBS)
Index: src/main.cc
===================================================================
---- src/main.cc (révision 478)
-+++ src/main.cc (copie de travail)
+--- a/src/main.cc (révision 478)
++++ b/src/main.cc (copie de travail)
@@ -37,110 +37,7 @@
#include <gtkglmm.h>
#endif//ENABLE_GL
@@ -732,8 +710,8 @@ Index: src/main.cc
void parse_debug_options(OptionGroup &op)
Index: src/defaultcfg.h
===================================================================
---- src/defaultcfg.h (révision 0)
-+++ src/defaultcfg.h (révision 0)
+--- a/src/defaultcfg.h (révision 0)
++++ b/src/defaultcfg.h (révision 0)
@@ -0,0 +1,34 @@
+#ifndef _defaultcfg_h
+#define _defaultcfg_h
@@ -771,8 +749,8 @@ Index: src/defaultcfg.h
+#endif//_defaultcfg_h
Index: src/defaultcfg.cc
===================================================================
---- src/defaultcfg.cc (révision 0)
-+++ src/defaultcfg.cc (révision 0)
+--- a/src/defaultcfg.cc (révision 0)
++++ b/src/defaultcfg.cc (révision 0)
@@ -0,0 +1,128 @@
+/*
+ * subtitleeditor -- a tool to create or edit subtitle
@@ -904,8 +882,8 @@ Index: src/defaultcfg.cc
+
Index: src/Makefile.am
===================================================================
---- src/Makefile.am (révision 478)
-+++ src/Makefile.am (copie de travail)
+--- a/src/Makefile.am (révision 478)
++++ b/src/Makefile.am (copie de travail)
@@ -21,6 +21,8 @@
cfg.h \
debug.cc \
diff --git a/debian/rules b/debian/rules
index 5fbd3b3..cf41565 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -28,6 +27,8 @@ endif
config.status: configure
dh_testdir
# Add here commands to configure the package.
+ cp -f /usr/share/misc/config.sub config.sub
+ cp -f /usr/share/misc/config.guess config.guess
libtoolize --force --copy
autoreconf -v -i -f
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -36,7 +37,7 @@ config.status: configure
LDFLAGS="-Wl,-z,defs" GTKMM_LIBS="$(GTKMM_LIBS)" \
GTKMM_CFLAGS="$(GTKMM_CFLAGS)"
-build: patch build-stamp
+build: build-stamp
build-stamp: config.status
dh_testdir
@@ -45,17 +46,12 @@ build-stamp: config.status
#docbook-to-man debian/subtitleeditor.sgml > subtitleeditor.1
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp po/es.gmo
[ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
+ rm config.guess config.sub
dh_clean
install: install-stamp
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.9
