[Pkg-crosswire-devel] [Branch ~pkgcrosswire/bibletime/main] Rev 24: Remove patches already in upstream.

[noreply at launchpad.net]

------------------------------------------------------------
revno: 24
committer: Jonathan Marsden <jmarsden at fastmail.fm>
branch nick: main
timestamp: Sat 2009-06-06 22:05:28 -0700
message:
  Remove patches already in upstream.
removed:
  debian/patches/01_main_window_icon.diff
  debian/patches/02_remove_unwanted_debug_code.diff
modified:
  debian/changelog

=== modified file 'debian/changelog'
--- debian/changelog	2009-06-07 05:01:50 +0000
+++ debian/changelog	2009-06-07 05:05:28 +0000
@@ -1,8 +1,11 @@
 bibletime (2.0.1-1) UNRELEASED; urgency=low
 
   * New upstream version.
+  * debian/patches/: 
+    - 01_main_window_icon.diff removed (now in upstream sources).
+    - 02_remove_unwanted_debug_code.diff removed (now in upstream sources).
 
- -- Jonathan Marsden <jmarsden at fastmail.fm>  Sat, 06 Jun 2009 21:58:36 -0700
+ -- Jonathan Marsden <jmarsden at fastmail.fm>  Sat, 06 Jun 2009 22:03:36 -0700
 
 bibletime (2.0-1) unstable; urgency=low
 

=== removed file 'debian/patches/01_main_window_icon.diff'
--- debian/patches/01_main_window_icon.diff	2009-06-03 06:41:07 +0000
+++ debian/patches/01_main_window_icon.diff	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-Associate an icon with the main window.  Upstream svn r1317.
-Index: ChangeLog
-===================================================================
---- old/ChangeLog	(revision 1316)
-+++ new/ChangeLog	(working copy)
-@@ -1,3 +1,6 @@
-+2009-05-30 Gary Holmlund 
-+	* Fix defect, the main window icon was missing - defect # 2798758
-+
- 2009-05-28 Martin Gruner <mgruner at crosswire.org>
- 	* release 2.0
- 
-Index: src/bibletime.cpp
-===================================================================
---- old/src/bibletime.cpp	(revision 1316)
-+++ new/src/bibletime.cpp	(working copy)
-@@ -20,6 +20,7 @@
- 
- #include "util/ctoolclass.h"
- #include "util/cpointers.h"
-+#include "util/cresmgr.h"
- #include "util/directoryutil.h"
- 
- #include "backend/drivers/cswordmoduleinfo.h"
-@@ -75,6 +76,7 @@
-    initConnections();
-    readSettings();
-    setPlainCaption(QString());
-+	setWindowIcon( util::filesystem::DirectoryUtil::getIcon(CResMgr::mainWindow::icon) );
- }
- 
- BibleTime::~BibleTime() 
-Index: src/util/cresmgr.cpp
-===================================================================
---- old/src/util/cresmgr.cpp	(revision 1316)
-+++ new/src/util/cresmgr.cpp	(working copy)
-@@ -13,6 +13,9 @@
- 
- 
- namespace CResMgr {
-+	namespace mainWindow {
-+		const QString icon = "bibletime.svg";
-+	} // mainWindow
- 	namespace modules {
- 		namespace bible {
- 			const QString icon_unlocked  = "bible.svg";
-Index: src/util/cresmgr.h
-===================================================================
---- old/src/util/cresmgr.h	(revision 1316)
-+++ new/src/util/cresmgr.h	(working copy)
-@@ -20,6 +20,9 @@
- namespace CResMgr {
- 	void init_tr();
- 
-+	namespace mainWindow {
-+		extern const QString icon;
-+	}
- 	namespace modules {
- 		namespace bible {
- 			extern const QString icon_unlocked;

=== removed file 'debian/patches/02_remove_unwanted_debug_code.diff'
--- debian/patches/02_remove_unwanted_debug_code.diff	2009-06-03 06:41:07 +0000
+++ debian/patches/02_remove_unwanted_debug_code.diff	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-Remove unwanted debug code that created ./out.txt.  Upstream svn r1318.
-Index: src/frontend/display/bthtmlreaddisplay.cpp
-===================================================================
---- src/frontend/display/bthtmlreaddisplay.cpp	(revision 1317)
-+++ src/frontend/display/bthtmlreaddisplay.cpp	(working copy)
-@@ -213,19 +213,11 @@
- 	return QString();
- }
- 
--#include <QTextStream>
- // Puts html text and javascript into QWebView
- void BtHtmlReadDisplay::setText( const QString& newText ) 
- {
- 	QString jsText = newText;
- 
--     QFile file("out.txt");
--     if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
--         return;
--
--     QTextStream out(&file);
--     out <<  newText << "\n";
--
- 	jsText.replace(body,jsBegin+javascript+jsEnd+body);
- 
- 	// Disconnect any previous connect and connect to slot that loads the javascript object
-@@ -379,4 +371,4 @@
-     if ( e->type() == QEvent::Leave )
-         m_display->m_jsObject->clearPrevAttribute();
-     return QWidget::event(e);
--}
-\ No newline at end of file
-+}



--
lp:~pkgcrosswire/bibletime/main
https://code.launchpad.net/~pkgcrosswire/bibletime/main

Your team Crosswire Packaging Team is subscribed to branch lp:~pkgcrosswire/bibletime/main.
To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/bibletime/main/+edit-subscription.