[SCM] tora Debian packaging branch, master, updated. debian/2.0.0-1-11-g3b6dce5

Michael Meskes meskes at alioth.debian.org
Wed Sep 9 15:29:57 UTC 2009


The following commit has been merged in the master branch:
commit 3b6dce5fb9977ed74dc1d5b1e448449b8265f833
Author: Michael Meskes <meskes at debian.org>
Date:   Wed Sep 9 11:50:57 2009 +0200

    Removed patch that was no longer needed.
---
 debian/changelog                          |    3 +-
 debian/patches/00list                     |    1 -
 debian/patches/01_missing_includes.dpatch |   51 -----------------------------
 src/todebug.cpp                           |    1 -
 4 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 37df1fc..36b92f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ tora (2.1.0-1) unstable; urgency=low
   * New upstream version.
   * Bumped Standards-Version to 3.8.3, no changes needed.
   * New project homepage.
+  * Removed no longer needed 01_missing_includes.dpatch.
 
- -- Michael Meskes <meskes at debian.org>  Wed, 09 Sep 2009 11:42:35 +0200
+ -- Michael Meskes <meskes at debian.org>  Wed, 09 Sep 2009 11:50:20 +0200
 
 tora (2.0.0-4) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 171e679..a4b5c9b 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1 @@
-01_missing_includes
 03_README.LAYOUT
diff --git a/debian/patches/01_missing_includes.dpatch b/debian/patches/01_missing_includes.dpatch
deleted file mode 100755
index e154a2e..0000000
--- a/debian/patches/01_missing_includes.dpatch
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_missing_includes.dpatch by Michael Meskes <meskes at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Some missing include directives
-
- at DPATCH@
-
---- tora-2.0.0/src/toqvalue.cpp~	2009-04-29 17:02:16.000000000 +0000
-+++ tora-2.0.0/src/toqvalue.cpp	2009-04-29 17:02:23.000000000 +0000
-@@ -47,6 +47,8 @@
- #include <QVariant>
- #include <QApplication>
- 
-+#include <cstdio>
-+
- static int NumberFormat;
- static int NumberDecimals;
- 
---- tora-2.0.0/src/todebug.cpp~	2009-04-29 17:04:00.000000000 +0000
-+++ tora-2.0.0/src/todebug.cpp	2009-04-29 17:04:11.000000000 +0000
-@@ -58,6 +58,7 @@
- #include "totool.h"
- #include "tocodemodel.h"
- 
-+#include <cstdio>
- #include <stack>
- 
- #include <qcheckbox.h>
---- tora-2.0.0/src/tomodeleditor.cpp~	2009-04-29 17:09:30.000000000 +0000
-+++ tora-2.0.0/src/tomodeleditor.cpp	2009-04-29 17:09:42.000000000 +0000
-@@ -59,6 +59,8 @@
- #include <QSettings>
- #include <QAbstractItemModel>
- 
-+#include <cstdio>
-+
- #include "icons/commit.xpm"
- #include "icons/copy.xpm"
- #include "icons/cut.xpm"
---- tora-2.0.0/src/toresultview.cpp~	2009-04-29 17:17:49.000000000 +0000
-+++ tora-2.0.0/src/toresultview.cpp	2009-04-29 17:18:01.000000000 +0000
-@@ -54,6 +54,8 @@
- #include "totool.h"
- #include "toresultlistformat.h"
- 
-+#include <cstdio>
-+
- #include <qapplication.h>
- #include <qclipboard.h>
- #include <qcombobox.h>
diff --git a/src/todebug.cpp b/src/todebug.cpp
index 07c375f..aaafc1b 100644
--- a/src/todebug.cpp
+++ b/src/todebug.cpp
@@ -58,7 +58,6 @@
 #include "totool.h"
 #include "tocodemodel.h"
 
-#include <cstdio>
 #include <stack>
 
 #include <qcheckbox.h>

-- 
tora Debian packaging 



More information about the pkg-kde-commits mailing list