[Foo2zjs-commits] r193 - in trunk/foo2zjs_20090301dfsg/debian: . hannah-package

[Michael Koch]

Author: mkoch
Date: 2009-08-01 12:04:10 +0000 (Sat, 01 Aug 2009)
New Revision: 193

Modified:
   trunk/foo2zjs_20090301dfsg/debian/changelog
   trunk/foo2zjs_20090301dfsg/debian/hannah-package/gui.cpp
Log:
* debian/hannah-package/gui.cpp: Fix list of argument names for getweb
  (Closes: #537325).


Modified: trunk/foo2zjs_20090301dfsg/debian/changelog
===================================================================
--- trunk/foo2zjs_20090301dfsg/debian/changelog	2009-08-01 11:50:02 UTC (rev 192)
+++ trunk/foo2zjs_20090301dfsg/debian/changelog	2009-08-01 12:04:10 UTC (rev 193)
@@ -1,20 +1,22 @@
-foo2zjs (20090301dfsg-5) UNRELEASED; urgency=low
+foo2zjs (20090301dfsg-6) UNRELEASED; urgency=low
 
+  * debian/hannah-package/gui.cpp: Fix list of argument names for getweb
+    (Closes: #537325).
   * debian/patches/40-hplj1000.dpatch: Updated to also guard globbered
-    names in find call (Closes: 526781).
+    names in find call (Closes: #526781).
   * debian/README.Debian: Clarify how hannah-foo2zjs is available
     (Closes: #529300).
   * debian/copyright: Link to /usr/share/common-licenses/GPL-2
     instead of /usr/share/common-licenses/GPL.
   * debian/control:
     + hannah-foo2zjs: Tighten Depends on kdebase-bin to (<< 4:4.4.0-1)
-      (Closes: 460480).
+      (Closes: #460480).
     + Updated Standards-Version to 3.8.2.
   * debian/patches/60-getweb.in.dpatch: Exit with failure when called
     as non-root.
   * debian/patches/90-manpages.dpatch: New dpatch to fix manpage errors.
 
- -- Michael Koch <konqueror at gmx.de>  Thu, 30 Jul 2009 21:44:44 +0200
+ -- Michael Koch <konqueror at gmx.de>  Sat, 01 Aug 2009 14:01:43 +0200
 
 foo2zjs (20090301dfsg-3) unstable; urgency=low
 

Modified: trunk/foo2zjs_20090301dfsg/debian/hannah-package/gui.cpp
===================================================================
--- trunk/foo2zjs_20090301dfsg/debian/hannah-package/gui.cpp	2009-08-01 11:50:02 UTC (rev 192)
+++ trunk/foo2zjs_20090301dfsg/debian/hannah-package/gui.cpp	2009-08-01 12:04:10 UTC (rev 193)
@@ -210,7 +210,7 @@
 	QAbstractButton *temporary_button;
 	int count = 0;
 	QStringList current_list;
-	current_list << "hp2600" << "hp1600" << "hp1020" << "hp1018" << "hp1005" << "hp1000" << "minolta2530" << "minolta2490" << "minolta2480" << "minolta2430" << "minolta2300" << "minolta2200" << "minoltapro" << "samsung3160" << "samsung600" << "samsung300" << "xerox6115" << "xerox6110";
+	current_list << "2600n" << "1600" << "1020" << "1018" << "1005" << "1000" << "2530" << "2490" << "2480" << "2430" << "2300" << "2200" << "cpwl" << "3160" << "600" << "300" << "6115" << "6110";
 	QStringList arguments;
 
 	foreach( temporary_button, buttonGroup->buttons() ) {
@@ -254,13 +254,12 @@
 			statusBar->showMessage(tr("Download and installation finished."));
 			break;
 		default:
-                        QMessageBox::critical(this, tr("Hannah - Firmware downloader"),
-                                tr(callProgram->readAllStandardError()));
 			QMessageBox::critical(this, tr("Hannah - Firmware downloader"),
+				tr(callProgram->readAllStandardError()));
+			QMessageBox::critical(this, tr("Hannah - Firmware downloader"),
 				tr("Something went wrong during the download and installation process for the following printers:\n"
 					"%1\n").arg(string), QMessageBox::Ok);
 			statusBar->showMessage(tr("An error occured during download and installation process."));
 			break;
 	}
-
 };