diff -Nru sqlitebrowser-2.0.0~beta1+ds.1/debian/changelog sqlitebrowser-2.0.0~beta1+ds.1/debian/changelog --- sqlitebrowser-2.0.0~beta1+ds.1/debian/changelog 2011-05-19 14:24:08.000000000 +0000 +++ sqlitebrowser-2.0.0~beta1+ds.1/debian/changelog 2012-03-22 18:43:01.000000000 +0000 @@ -1,3 +1,14 @@ +sqlitebrowser (2.0.0~beta1+ds.1-3) unstable; urgency=low + + * Use current alioth urls for Vcs-Browser and Vcs-Git + * Apply patch from Pablo Duboue to replace newlines with in the schema + browser (Closes: #520345) + * Update to debhelper 9 + * Update Standards-Version to 3.9.3.0, no changes + * Add patch to fix qDebug() use in edittableform::renameTable() + + -- Arto Jantunen Thu, 22 Mar 2012 20:42:40 +0200 + sqlitebrowser (2.0.0~beta1+ds.1-2) unstable; urgency=low * Take over as maintainer diff -Nru sqlitebrowser-2.0.0~beta1+ds.1/debian/compat sqlitebrowser-2.0.0~beta1+ds.1/debian/compat --- sqlitebrowser-2.0.0~beta1+ds.1/debian/compat 2011-05-19 14:24:08.000000000 +0000 +++ sqlitebrowser-2.0.0~beta1+ds.1/debian/compat 2012-03-22 18:43:01.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru sqlitebrowser-2.0.0~beta1+ds.1/debian/control sqlitebrowser-2.0.0~beta1+ds.1/debian/control --- sqlitebrowser-2.0.0~beta1+ds.1/debian/control 2011-05-19 14:24:08.000000000 +0000 +++ sqlitebrowser-2.0.0~beta1+ds.1/debian/control 2012-03-22 18:43:01.000000000 +0000 @@ -2,11 +2,11 @@ Section: database Priority: extra Maintainer: Arto Jantunen -Build-Depends: debhelper (>= 7.4.12), libqt4-dev, libsqlite3-dev -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 9), libqt4-dev, libsqlite3-dev +Standards-Version: 3.9.3.0 Homepage: http://sqlitebrowser.sourceforge.net/ -Vcs-Browser: http://git.debian.org/?p=collab-maint/sqlitebrowser.git -Vcs-Git: git://git.debian.org/git/collab-maint/sqlitebrowser.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/sqlitebrowser.git +Vcs-Git: git://anonscm.debian.org/collab-maint/sqlitebrowser.git Package: sqlitebrowser Architecture: any diff -Nru sqlitebrowser-2.0.0~beta1+ds.1/debian/patches/edittableform-fix-qdebug-use.patch sqlitebrowser-2.0.0~beta1+ds.1/debian/patches/edittableform-fix-qdebug-use.patch --- sqlitebrowser-2.0.0~beta1+ds.1/debian/patches/edittableform-fix-qdebug-use.patch 1970-01-01 00:00:00.000000000 +0000 +++ sqlitebrowser-2.0.0~beta1+ds.1/debian/patches/edittableform-fix-qdebug-use.patch 2012-03-22 18:43:01.000000000 +0000 @@ -0,0 +1,33 @@ +From: Arto Jantunen +Date: Thu, 22 Mar 2012 20:39:26 +0200 +Subject: Add patch to fix qDebug() use in edittableform::renameTable() + +This gets rid of a format string warning noticed by turning on hardening +options. + +Forwarded: no +--- + edittableform.cpp | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/edittableform.cpp b/edittableform.cpp +index 4d064f7..3e236c6 100644 +--- a/edittableform.cpp ++++ b/edittableform.cpp +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + #include "renametableform.h" + #include "addfieldform.h" +@@ -86,7 +87,7 @@ void editTableForm::renameTable() + QApplication::setOverrideCursor( Qt::waitCursor ); // this might take time + modified = true; + QString newName = renTableForm->getTableName(); +- qDebug(newName); ++ qDebug() << newName; + QString sql; + //do the sql rename here + //if (!pdb->executeSQL(QString("BEGIN TRANSACTION;"))) goto rollback; diff -Nru sqlitebrowser-2.0.0~beta1+ds.1/debian/patches/replace-new-line-in-sqlstring.patch sqlitebrowser-2.0.0~beta1+ds.1/debian/patches/replace-new-line-in-sqlstring.patch --- sqlitebrowser-2.0.0~beta1+ds.1/debian/patches/replace-new-line-in-sqlstring.patch 1970-01-01 00:00:00.000000000 +0000 +++ sqlitebrowser-2.0.0~beta1+ds.1/debian/patches/replace-new-line-in-sqlstring.patch 2012-03-22 18:43:01.000000000 +0000 @@ -0,0 +1,26 @@ +Description: If the stored SQL statement contains new lines, +the table form shows the string centered and unreadable. This +patch replaces the new-lines with spaces, fixing that problem. +Author: Pablo Duboue +Forwarded: no + +--- a/form1.cpp ++++ b/form1.cpp +@@ -195,7 +195,7 @@ + //tbitem->setOpen( TRUE ); + tbitem->setText( 0, it.data().getname() ); + tbitem->setText( 1, "table" ); +- tbitem->setText( 3, it.data().getsql() ); ++ tbitem->setText( 3, it.data().getsql().replace('\n', ' ') ); + fieldMap::Iterator fit; + fieldMap fmap = it.data().fldmap; + Q3ListViewItem * lastflditem = 0; +@@ -214,7 +214,7 @@ + Q3ListViewItem * item = new Q3ListViewItem( dblistView, lasttbitem ); + item->setText( 0, it2.data().getname()); + item->setText( 1, "index" ); +- item->setText( 3, it2.data().getsql() ); ++ item->setText( 3, it2.data().getsql().replace('\n', ' ') ); + lasttbitem = item ; + } + } diff -Nru sqlitebrowser-2.0.0~beta1+ds.1/debian/patches/series sqlitebrowser-2.0.0~beta1+ds.1/debian/patches/series --- sqlitebrowser-2.0.0~beta1+ds.1/debian/patches/series 2011-05-19 14:24:08.000000000 +0000 +++ sqlitebrowser-2.0.0~beta1+ds.1/debian/patches/series 2012-03-22 18:43:01.000000000 +0000 @@ -2,3 +2,5 @@ initialize-qstring-with-empty-string.patch ignore-canceled-import.patch use-qstring-fromlocal8bit-when-reading-argv.patch +replace-new-line-in-sqlstring.patch +edittableform-fix-qdebug-use.patch