diff -Nru retext-2.1.4/debian/changelog retext-2.1.4/debian/changelog --- retext-2.1.4/debian/changelog 2012-01-08 09:41:26.000000000 +0000 +++ retext-2.1.4/debian/changelog 2012-02-22 14:56:18.000000000 +0000 @@ -1,3 +1,18 @@ +retext (2.1.4-2) unstable; urgency=low + + * debian/patches/git_01_gdata_improvements.patch: + - Support gdata 2.0.16 + - Remove temporary files correctly + * debian/patches/git_02_handle_subprocess_errors.patch: + - Display an error message when subprocess.Popen fails + * debian/patches/01_recent_files_menu.patch: + - Use recent files menu instead of a dialog (backported from master) + * debian/rules: Install the upstream changelog correctly + * debian/compat, debian/control: Switch to debhelper 8 + * debian/copyright: Update format to fix lintian warning + + -- Dmitry Shachnev Wed, 22 Feb 2012 18:55:46 +0400 + retext (2.1.4-1) unstable; urgency=low * New upstream bugfix release diff -Nru retext-2.1.4/debian/compat retext-2.1.4/debian/compat --- retext-2.1.4/debian/compat 2011-02-21 15:32:44.000000000 +0000 +++ retext-2.1.4/debian/compat 2012-02-21 15:07:46.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru retext-2.1.4/debian/control retext-2.1.4/debian/control --- retext-2.1.4/debian/control 2011-08-18 11:30:05.000000000 +0000 +++ retext-2.1.4/debian/control 2012-02-21 15:08:02.000000000 +0000 @@ -2,7 +2,7 @@ Section: editors Priority: optional Maintainer: Dmitry Shachnev -Build-Depends: debhelper (>= 7.0.50~), imagemagick +Build-Depends: debhelper (>= 8), imagemagick Standards-Version: 3.9.2 Homepage: http://retext.sourceforge.net/ diff -Nru retext-2.1.4/debian/copyright retext-2.1.4/debian/copyright --- retext-2.1.4/debian/copyright 2011-07-28 12:27:17.000000000 +0000 +++ retext-2.1.4/debian/copyright 2012-02-19 08:53:16.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn +Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=213 Upstream-Name: ReText Source: http://retext.sourceforge.net/ diff -Nru retext-2.1.4/debian/patches/01_recent_files_menu.patch retext-2.1.4/debian/patches/01_recent_files_menu.patch --- retext-2.1.4/debian/patches/01_recent_files_menu.patch 1970-01-01 00:00:00.000000000 +0000 +++ retext-2.1.4/debian/patches/01_recent_files_menu.patch 2012-02-22 14:52:18.000000000 +0000 @@ -0,0 +1,57 @@ +# Description: Use "Recent files" menu instead of a dialog +# Origin/Author: Dmitry Shachnev +Index: retext-2.1.4/retext.py +=================================================================== +--- retext-2.1.4.orig/retext.py 2012-02-19 13:09:54.356535764 +0400 ++++ retext-2.1.4/retext.py 2012-02-19 13:10:25.153248882 +0400 +@@ -328,8 +328,6 @@ + self.actionPlainText = QAction(self.tr('Plain text'), self) + self.actionPlainText.setCheckable(True) + self.connect(self.actionPlainText, SIGNAL('triggered(bool)'), self.enablePlainText) +- self.actionRecentFiles = QAction(self.actIcon('document-open-recent'), self.tr('Open recent'), self) +- self.connect(self.actionRecentFiles, SIGNAL('triggered()'), self.openRecent) + if wpgen: + self.actionWpgen = QAction(self.tr('Generate webpages'), self) + self.connect(self.actionWpgen, SIGNAL('triggered()'), self.startWpgen) +@@ -396,7 +394,9 @@ + self.menuHelp = self.menubar.addMenu(self.tr('Help')) + self.menuFile.addAction(self.actionNew) + self.menuFile.addAction(self.actionOpen) +- self.menuFile.addAction(self.actionRecentFiles) ++ self.menuRecentFiles = self.menuFile.addMenu(self.tr('Open recent')) ++ self.connect(self.menuRecentFiles, SIGNAL('aboutToShow()'), self.updateRecentFiles) ++ self.menuFile.addMenu(self.menuRecentFiles) + self.menuDir = self.menuFile.addMenu(self.tr('Directory')) + self.menuDir.addAction(self.actionShow) + if wpgen: +@@ -747,19 +747,26 @@ + self.ind = self.tabWidget.count()-1 + self.tabWidget.setCurrentIndex(self.ind) + +- def openRecent(self): ++ def updateRecentFiles(self): ++ self.menuRecentFiles.clear() ++ self.recentFilesActions = [] + filesOld = settings.value("recentFileList").toStringList() + files = QStringList() + for i in filesOld: + if QFile.exists(i): + files.append(i) ++ action = QAction(i, self) ++ self.connect(action, SIGNAL('triggered()'), self.openFunction(i)) ++ self.recentFilesActions.append(action) + if files: + settings.setValue("recentFileList", files) + else: + settings.remove("recentFileList") +- item, ok = QInputDialog.getItem(self, app_name, self.tr("Open recent"), files, 0, False) +- if ok and not item.isEmpty(): +- self.openFileWrapper(item) ++ for action in self.recentFilesActions: ++ self.menuRecentFiles.addAction(action) ++ ++ def openFunction(self, fileName): ++ return lambda: self.openFileWrapper(fileName) + + def openFile(self): + fileNames = QFileDialog.getOpenFileNames(self, self.tr("Select one or several files to open"), "", \ diff -Nru retext-2.1.4/debian/patches/git_01_gdata_improvements.patch retext-2.1.4/debian/patches/git_01_gdata_improvements.patch --- retext-2.1.4/debian/patches/git_01_gdata_improvements.patch 1970-01-01 00:00:00.000000000 +0000 +++ retext-2.1.4/debian/patches/git_01_gdata_improvements.patch 2012-02-19 08:17:29.000000000 +0000 @@ -0,0 +1,68 @@ +diff --git a/retext.py b/retext.py +index 134d52d..047a69e 100755 +--- a/retext.py ++++ b/retext.py +@@ -45,7 +45,7 @@ else: + md = markdown.Markdown() + + try: +- import gdata.docs ++ import gdata.docs.data + import gdata.docs.client + from gdata.data import MediaSource + except: +@@ -1010,36 +1010,42 @@ class ReTextWindow(QMainWindow): + else: + return + if self.actionPlainText.isChecked(): +- self.saveFileWrapper('temp.txt') ++ tempFile = '.retext-temp.txt' ++ contentType = 'text/plain' ++ self.saveFileWrapper(tempFile) + else: +- self.saveHtml('temp.html') ++ tempFile = '.retext-temp.html' ++ contentType = 'text/html' ++ self.saveHtml(tempFile) + gdClient = gdata.docs.client.DocsClient(source=app_name) + gdClient.ssl = True + try: + gdClient.ClientLogin(unicode(login), unicode(passwd), gdClient.source) + except gdata.client.BadAuthentication: ++ QFile(tempFile).remove() + return QMessageBox.warning(self, app_name, self.tr("Incorrect user name or password!")) + except: ++ QFile(tempFile).remove() + return QMessageBox.warning(self, app_name, \ + self.tr("Authentification failed, please check your internet connection!")) + settings.setValue("GDocsLogin", login) + settings.setValue("GDocsPasswd", passwd) +- if self.actionPlainText.isChecked(): +- ms = MediaSource(file_path='temp.txt', content_type='text/plain') +- else: +- ms = MediaSource(file_path='temp.html', content_type='text/html') ++ title = unicode(self.getDocumentTitle()) ++ ms = MediaSource(file_path=tempFile, content_type=contentType) + entry = self.gDocsEntries[self.ind] + if entry: +- entry.title.text = unicode(self.getDocumentTitle()) ++ entry.title.text = title + entry = gdClient.Update(entry, media_source=ms, force=True) + else: +- entry = gdClient.Upload(ms, unicode(self.getDocumentTitle())) ++ try: ++ resource = gdata.docs.data.Resource(title=title) ++ entry = gdClient.CreateResource(resource, media=ms) ++ except AttributeError: ++ # For old gdata versions ++ entry = gdClient.Upload(ms, title) + QDesktopServices.openUrl(QUrl(entry.GetAlternateLink().href)) + self.gDocsEntries[self.ind] = entry +- if self.actionPlainText.isChecked(): +- QFile('temp.txt').remove() +- else: +- QFile('temp.html').remove() ++ QFile(tempFile).remove() + + def autoSaveActive(self): + return self.autoSave and self.fileNames[self.ind] and \ diff -Nru retext-2.1.4/debian/patches/git_02_handle_subprocess_errors.patch retext-2.1.4/debian/patches/git_02_handle_subprocess_errors.patch --- retext-2.1.4/debian/patches/git_02_handle_subprocess_errors.patch 1970-01-01 00:00:00.000000000 +0000 +++ retext-2.1.4/debian/patches/git_02_handle_subprocess_errors.patch 2012-02-19 08:16:13.000000000 +0000 @@ -0,0 +1,17 @@ +diff --git a/retext.py b/retext.py +index 047a69e..1581eff 100755 +--- a/retext.py ++++ b/retext.py +@@ -971,7 +971,11 @@ class ReTextWindow(QMainWindow): + command.replace('%if', tmpname) + args = str(command).split() + self.saveFileWrapper(tmpname) +- subprocess.Popen(args).wait() ++ try: ++ subprocess.Popen(args).wait() ++ except OSError as error: ++ errorstr = QString.fromUtf8(str(error)) ++ QMessageBox.warning(self, app_name, errorstr) + QFile(tmpname).remove() + QFile('out.'+item).rename(fileName) + diff -Nru retext-2.1.4/debian/patches/series retext-2.1.4/debian/patches/series --- retext-2.1.4/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ retext-2.1.4/debian/patches/series 2012-02-19 08:22:21.000000000 +0000 @@ -0,0 +1,3 @@ +git_01_gdata_improvements.patch +git_02_handle_subprocess_errors.patch +01_recent_files_menu.patch diff -Nru retext-2.1.4/debian/rules retext-2.1.4/debian/rules --- retext-2.1.4/debian/rules 2011-08-16 11:43:01.000000000 +0000 +++ retext-2.1.4/debian/rules 2012-02-21 15:05:39.000000000 +0000 @@ -15,3 +15,6 @@ mkdir -p $(ICONSDIR)/$$size\x$$size/apps/; \ convert -resize $$size icons/retext.png $(ICONSDIR)/$$size\x$$size/apps/retext.png; \ done + +override_dh_installchangelogs: + dh_installchangelogs changelog