--- qpxtool-0.6.1.orig/debian/rules +++ qpxtool-0.6.1/debian/rules @@ -0,0 +1,73 @@ +#!/usr/bin/make -f + +include /usr/share/dpatch/dpatch.make + +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) + +ifeq (kfreebsd,$(DEB_HOST_ARCH_OS)) + SUBLIBS="-lcam" +else + SUBLIBS="" +endif + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + [ ! -f Makefile ] || $(MAKE) QTDIR="/usr/share/qt3/" clean + + rm -f qpxtool-gui/*.o + rm -f qpxtool-gui/qpxtool + + dh_clean + +build: build-stamp +build-stamp: patch-stamp + dh_testdir + + CFLAGS="$(CFLAGS)" $(MAKE) + + touch build-stamp + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/qpxtool PREFIX=/usr MANDIR=/usr/share/man + install -D -m 0644 debian/pixmap/qpxtool.xpm debian/qpxtool/usr/share/pixmaps/qpxtool.xpm + + # Uncompress manpages (they are not max compressed) + gunzip debian/qpxtool/usr/share/man/man*/*.gz + + # Moving pxfw + mkdir -p debian/pxfw/usr/bin + mv debian/qpxtool/usr/bin/pxfw debian/pxfw/usr/bin + mkdir -p debian/pxfw/usr/share/man/man8 + mv debian/qpxtool/usr/share/man/man8/pxfw* debian/pxfw/usr/share/man/man8 + +binary: binary-arch + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installmenu + dh_installman + dh_lintian + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-indep: + +.PHONY: clean build install binary binary-arch binary-indep --- qpxtool-0.6.1.orig/debian/compat +++ qpxtool-0.6.1/debian/compat @@ -0,0 +1 @@ +7 --- qpxtool-0.6.1.orig/debian/qpxtool.manpages +++ qpxtool-0.6.1/debian/qpxtool.manpages @@ -0,0 +1 @@ +debian/manpage/* --- qpxtool-0.6.1.orig/debian/control +++ qpxtool-0.6.1/debian/control @@ -0,0 +1,27 @@ +Source: qpxtool +Section: otherosfs +Priority: optional +Maintainer: Debian QA Group +Build-Depends: debhelper (>= 7), dpatch, libqt3-mt-dev, libcam-dev [kfreebsd-i386 kfreebsd-amd64] +Standards-Version: 3.8.3 +Homepage: http://qpxtool.sourceforge.net/ + +Package: qpxtool +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: pxfw +Description: CD/DVD quality checker + QPxTool gives you access to all available Quality Checks (Q-Checks) on written + and blank media, that are available for your drive. This will help you to find + the right media and the optimized writing speed for your hardware, which will + increase the change for a long data lifetime. + . + QPxTool depends on the used drive, not all drives are able to read the Q-Checks + and not all of them are supported by QPxTool. Currently, most newer drives of + LiteOn, NEC, Pioneer and Plextor are supported. + +Package: pxfw +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Plextor firmware updater + pxfw is a firmware flash program for Plextor optical drives. --- qpxtool-0.6.1.orig/debian/qpxtool.menu +++ qpxtool-0.6.1/debian/qpxtool.menu @@ -0,0 +1,3 @@ +?package(qpxtool):needs="X11" section="Applications/System/Hardware"\ + title="QPxTool" description="CD/DVD quality checker"\ + command="/usr/bin/qpxtool" icon="/usr/share/pixmaps/qpxtool.xpm" --- qpxtool-0.6.1.orig/debian/qpxtool.docs +++ qpxtool-0.6.1/debian/qpxtool.docs @@ -0,0 +1,2 @@ +README +TODO --- qpxtool-0.6.1.orig/debian/changelog +++ qpxtool-0.6.1/debian/changelog @@ -0,0 +1,131 @@ +qpxtool (0.6.1-5) unstable; urgency=low + + * Updating package to standards version 3.8.3. + * Removing vcs fields. + * Orphaning package. + + -- Daniel Baumann Thu, 27 Aug 2009 10:17:45 +0200 + +qpxtool (0.6.1-4) unstable; urgency=medium + + * Adding patch from Mirko Parthey + to make qpxtool work with libata (Closes: #463886). + * Rediffing 0.6.1.1.dpatch. + * Completing clean target in rules, thanks to Barry deFreese + (Closes: #442718). + * Reordering rules file. + * Using lintian debhelper to install lintian overrides. + * Rewriting copyright file in machine-interpretable format. + * Adding suggests to pxfw in qpxtool. + * Adding vcs fields to control file. + * Upgrading package to standards 3.8.0. + * Upgrading package to debhelper 7. + * Removing watch file. + * Reverting Makefile.qmake to upstream. + + -- Daniel Baumann Wed, 02 Jul 2008 12:42:00 +0200 + +qpxtool (0.6.1-3) unstable; urgency=low + + * Bumped to new policy. + * Using new homepage field in control. + * Don't hide make errors in clean target of rules. + * Added manpage for deadreader and pioquiet. + + -- Daniel Baumann Thu, 27 Dec 2007 14:13:00 +0100 + +qpxtool (0.6.1-2) unstable; urgency=low + + * Applied patch from upstream to fix FTBFS with linux 2.6.23, thanks to + Thomas Maguin . + + -- Daniel Baumann Tue, 23 Oct 2007 14:47:00 +0200 + +qpxtool (0.6.1-1) unstable; urgency=low + + * New upstream release: + - Including pxfw. + * Updated 02-typos.dpatch. + + -- Daniel Baumann Sun, 02 Sep 2007 17:50:00 +0200 + +qpxtool (0.6.0.9-5) unstable; urgency=low + + * Extendet 04-patch.dpatch to also cover install, not just build. + All build system caused breakages are now fixed (Closes: #413211). + + -- Daniel Baumann Thu, 08 Mar 2007 14:40:00 +0100 + +qpxtool (0.6.0.9-4) unstable; urgency=low + + * Reordered dpatches, thanks Eduard for taking care about it before. + * Added patch to disable another ldconfig call. + * Added lintian overrides. + + -- Daniel Baumann Thu, 08 Mar 2007 13:06:00 +0100 + +qpxtool (0.6.0.9-3) unstable; urgency=low + + * 02-libflags.dpatch, 03-typos.dpatch: dpatch'ified upstream relevant + changes from 0.6.0.9-2.1 + * 04-CWDA.dpatch: fixes typo in ./build, causing failure in a build + environment with invalid $HOME (closes: #413211) + + -- Eduard Bloch Tue, 06 Mar 2007 18:30:31 +0100 + +qpxtool (0.6.0.9-2.1) unstable; urgency=low + + * NMU, blessed by maintainer + * Added missing -fPIC flags on libraries, work around hidden build failures + on amd64 + * setting provisional SONAMEs on the supplementary libraries + * debian/rules: explicit removal of final build files + * qpxtool/qcheck/test_threads.cpp: minor typo fix + + -- Eduard Bloch Tue, 06 Mar 2007 17:03:01 +0100 + +qpxtool (0.6.0.9-2) unstable; urgency=low + + * Replaced 01-libdeps.dpatch with a patch from upstream. + + -- Daniel Baumann Sun, 04 Mar 2007 17:42:00 +0100 + +qpxtool (0.6.0.9-1) unstable; urgency=low + + * New upstream release. + * Removed 01-kfreebsd.dpatch, went upstream. + + -- Daniel Baumann Sat, 03 Mar 2007 10:49:00 +0100 + +qpxtool (0.5.4-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Tue, 01 Aug 2006 13:13:00 +0200 + +qpxtool (0.5.3-3) unstable; urgency=low + + * Making sure, the patch gets really applied in the right order this time + (Closes: #376196). + + -- Daniel Baumann Sat, 08 Jul 2006 13:26:00 +0200 + +qpxtool (0.5.3-2) unstable; urgency=low + + * New email address. + * Added patch to fix FTBFS on kFreeBSD (Closes: #376196). + + -- Daniel Baumann Fri, 07 Jul 2006 08:33:00 +0200 + +qpxtool (0.5.3-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Mon, 26 Jun 2006 14:03:00 +0200 + +qpxtool (0.5.0-1) unstable; urgency=low + + * Initial release (Closes: #357847). + * Added manpage. + + -- Daniel Baumann Tue, 21 Mar 2006 11:01:00 +0100 --- qpxtool-0.6.1.orig/debian/copyright +++ qpxtool-0.6.1/debian/copyright @@ -0,0 +1,42 @@ +Author: Gennady "ShultZ" Kozlov +Download: http://qpxtool.sourceforge.net/ + +Files: * +Copyright: (C) 2005-2007 Gennady "ShultZ" Kozlov +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +Files: debian/* +Copyright: (C) 2006-2008 Daniel Baumann +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. --- qpxtool-0.6.1.orig/debian/qpxtool.lintian-overrides +++ qpxtool-0.6.1/debian/qpxtool.lintian-overrides @@ -0,0 +1,2 @@ +qpxtool: non-dev-pkg-with-shlib-symlink +qpxtool: package-name-doesnt-match-sonames --- qpxtool-0.6.1.orig/debian/patches/01-qtdir.dpatch +++ qpxtool-0.6.1/debian/patches/01-qtdir.dpatch @@ -0,0 +1,23 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 01-qtdir.dpatch by Daniel Baumann +## +## DP: Replace QTDIR which seems to be not respected. + +@DPATCH@ + +diff -Naur qpxtool-0.6.1.orig/qpxtool-gui/Makefile qpxtool-0.6.1/qpxtool-gui/Makefile +--- qpxtool-0.6.1.orig/qpxtool-gui/Makefile 2007-08-19 14:04:14.000000000 +0000 ++++ qpxtool-0.6.1/qpxtool-gui/Makefile 2007-09-02 16:02:01.000000000 +0000 +@@ -8,10 +8,10 @@ + rm -f qpxtool + + Makefile.qmake: qproject +- $(QTDIR)/bin/qmake -o Makefile.qmake ++ qmake -o Makefile.qmake + + qproject: +- $(QTDIR)/bin/qmake -project -o qpxtool.pro \ ++ qmake -project -o qpxtool.pro \ + CONFIG+="thread" \ + INCLUDEPATH+="../lib/include" \ + LIBS+="-lqpxtransport -lqpxplextor -lqpxpioneer -lqpxscan" \ --- qpxtool-0.6.1.orig/debian/patches/03-0.6.1.1.dpatch +++ qpxtool-0.6.1/debian/patches/03-0.6.1.1.dpatch @@ -0,0 +1,241 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 03-0.6.1.1.dpatch +## +## DP: Patch from upstream to fix FTBFS with linux 2.6.23. + +@DPATCH@ + +diff -Naurp qpxtool.orig/console/deadreader/deadreader.cpp qpxtool/console/deadreader/deadreader.cpp +--- qpxtool.orig/console/deadreader/deadreader.cpp 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/console/deadreader/deadreader.cpp 2008-07-02 10:31:47.000000000 +0000 +@@ -2,7 +2,7 @@ + * + * DeadDiscReader + * Copyright (C) 2006, Gennady "ShultZ" Kozlov +- * it uses QPxTool SCSI transport lbrary ++ * it uses QPxTool SCSI transport library + * + */ + +diff -Naurp qpxtool.orig/console/pxcontrol/pxcontrol.cpp qpxtool/console/pxcontrol/pxcontrol.cpp +--- qpxtool.orig/console/pxcontrol/pxcontrol.cpp 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/console/pxcontrol/pxcontrol.cpp 2008-07-02 10:31:47.000000000 +0000 +@@ -554,17 +554,18 @@ int main (int argc, char* argv[]) + } + else if(!strcmp(argv[i],"--as-create")) { + flags |= FL_AS_CREATE; ++ ascre = 0; + if (argc>(i+1)) { + i++; +- if (!strcmp(argv[i],"q")) ascre = ASDB_CRE_QUICK; +- else if (!strcmp(argv[i],"f")) ascre = ASDB_CRE_FULL; ++ if (!strcmp(argv[i],"q")) ascre |= ASDB_CRE_QUICK; ++ else if (!strcmp(argv[i],"f")) ascre |= ASDB_CRE_FULL; + else + printf("invalid --as-create parameter 1: '%s'. Only 'q|f' are valid\n", argv[i]); + } + if (argc>(i+1)) { + i++; +- if (!strcmp(argv[i],"a")) ascre = ASDB_ADD; +- else if (!strcmp(argv[i],"r")) ascre = ASDB_REPLACE; ++ if (!strcmp(argv[i],"a")) ascre |= ASDB_ADD; ++ else if (!strcmp(argv[i],"r")) ascre |= ASDB_REPLACE; + else + printf("invalid --as-create parameter 2: '%s'. Only 'a|r' are valid\n", argv[i]); + } +diff -Naurp qpxtool.orig/console/pxcontrol/version.h qpxtool/console/pxcontrol/version.h +--- qpxtool.orig/console/pxcontrol/version.h 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/console/pxcontrol/version.h 2008-07-02 10:31:47.000000000 +0000 +@@ -9,4 +9,4 @@ + * See the file "COPYING" for the exact licensing terms. + */ + +-#define VERSION "1.1" ++#define VERSION "1.2" +diff -Naurp qpxtool.orig/lib/include/common_functions.h qpxtool/lib/include/common_functions.h +--- qpxtool.orig/lib/include/common_functions.h 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/lib/include/common_functions.h 2008-07-02 10:31:47.000000000 +0000 +@@ -1,6 +1,6 @@ + /* + * This file is part of the QPxTool project. +- * Copyright (C) 2005 Gennady "ShultZ" Kozlov ++ * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +diff -Naurp qpxtool.orig/lib/include/plextor_features.h qpxtool/lib/include/plextor_features.h +--- qpxtool.orig/lib/include/plextor_features.h 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/lib/include/plextor_features.h 2008-07-02 10:31:47.000000000 +0000 +@@ -1,6 +1,6 @@ + /* + * This file is part of the QPxTool project. +- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov ++ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +diff -Naurp qpxtool.orig/lib/include/qpx_mmc.h qpxtool/lib/include/qpx_mmc.h +--- qpxtool.orig/lib/include/qpx_mmc.h 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/lib/include/qpx_mmc.h 2008-07-02 10:31:47.000000000 +0000 +@@ -1,6 +1,6 @@ + /* + * This file is part of the QPxTool project. +- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov ++ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +diff -Naurp qpxtool.orig/lib/include/qpx_opcodes.h qpxtool/lib/include/qpx_opcodes.h +--- qpxtool.orig/lib/include/qpx_opcodes.h 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/lib/include/qpx_opcodes.h 2008-07-02 10:31:47.000000000 +0000 +@@ -1,6 +1,6 @@ + /* + * This file is part of the QPxTool project. +- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov ++ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +diff -Naurp qpxtool.orig/lib/qpxplextor/include/plextor_features.h qpxtool/lib/qpxplextor/include/plextor_features.h +--- qpxtool.orig/lib/qpxplextor/include/plextor_features.h 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/lib/qpxplextor/include/plextor_features.h 2008-07-02 10:31:47.000000000 +0000 +@@ -1,6 +1,6 @@ + /* + * This file is part of the QPxTool project. +- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov ++ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +diff -Naurp qpxtool.orig/lib/qpxplextor/plextor_features.cpp qpxtool/lib/qpxplextor/plextor_features.cpp +--- qpxtool.orig/lib/qpxplextor/plextor_features.cpp 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/lib/qpxplextor/plextor_features.cpp 2008-07-02 10:31:47.000000000 +0000 +@@ -1,6 +1,6 @@ + /* + * This file is part of the QPxTool project. +- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov ++ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +diff -Naurp qpxtool.orig/lib/qpxscan/plextor_qcheck.cpp qpxtool/lib/qpxscan/plextor_qcheck.cpp +--- qpxtool.orig/lib/qpxscan/plextor_qcheck.cpp 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/lib/qpxscan/plextor_qcheck.cpp 2008-07-02 10:31:47.000000000 +0000 +@@ -1,6 +1,6 @@ + /* + * This file is part of the QPxTool project. +- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov ++ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov + * + * + * Some Plextor commands got from PxScan and CDVDlib (C) Alexander Noe` +diff -Naurp qpxtool.orig/lib/qpxtransport/common_functions.cpp qpxtool/lib/qpxtransport/common_functions.cpp +--- qpxtool.orig/lib/qpxtransport/common_functions.cpp 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/lib/qpxtransport/common_functions.cpp 2008-07-02 10:31:47.000000000 +0000 +@@ -1,6 +1,6 @@ + /* + * This file is part of the QPxTool project. +- * Copyright (C) 2005 Gennady "ShultZ" Kozlov ++ * Copyright (C) 2005-2006, Gennady "ShultZ" Kozlov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +diff -Naurp qpxtool.orig/lib/qpxtransport/include/common_functions.h qpxtool/lib/qpxtransport/include/common_functions.h +--- qpxtool.orig/lib/qpxtransport/include/common_functions.h 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/lib/qpxtransport/include/common_functions.h 2008-07-02 10:31:47.000000000 +0000 +@@ -1,6 +1,6 @@ + /* + * This file is part of the QPxTool project. +- * Copyright (C) 2005 Gennady "ShultZ" Kozlov ++ * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +diff -Naurp qpxtool.orig/lib/qpxtransport/include/qpx_mmc.h qpxtool/lib/qpxtransport/include/qpx_mmc.h +--- qpxtool.orig/lib/qpxtransport/include/qpx_mmc.h 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/lib/qpxtransport/include/qpx_mmc.h 2008-07-02 10:31:47.000000000 +0000 +@@ -1,6 +1,6 @@ + /* + * This file is part of the QPxTool project. +- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov ++ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +diff -Naurp qpxtool.orig/lib/qpxtransport/include/qpx_opcodes.h qpxtool/lib/qpxtransport/include/qpx_opcodes.h +--- qpxtool.orig/lib/qpxtransport/include/qpx_opcodes.h 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/lib/qpxtransport/include/qpx_opcodes.h 2008-07-02 10:31:47.000000000 +0000 +@@ -1,6 +1,6 @@ + /* + * This file is part of the QPxTool project. +- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov ++ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +diff -Naurp qpxtool.orig/lib/qpxtransport/qpx_transport.cpp qpxtool/lib/qpxtransport/qpx_transport.cpp +--- qpxtool.orig/lib/qpxtransport/qpx_transport.cpp 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/lib/qpxtransport/qpx_transport.cpp 2008-07-02 10:31:47.000000000 +0000 +@@ -142,12 +142,17 @@ autofree::~autofree() + + #if defined(__linux) + ++#if !defined(INT_MAX) ++#include ++#endif ++ + #include + #include + #include + #include + #include + #include ++ + #if !defined(SG_FLAG_LUN_INHIBIT) + # if defined(SG_FLAG_UNUSED_LUN_INHIBIT) + # define SG_FLAG_LUN_INHIBIT SG_FLAG_UNUSED_LUN_INHIBIT +diff -Naurp qpxtool.orig/qpxtool-gui/QPxTool.cpp qpxtool/qpxtool-gui/QPxTool.cpp +--- qpxtool.orig/qpxtool-gui/QPxTool.cpp 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/qpxtool-gui/QPxTool.cpp 2008-07-02 10:31:47.000000000 +0000 +@@ -1,6 +1,6 @@ + /* + * This file is part of the QPxTool project. +- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov ++ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +diff -Naurp qpxtool.orig/qpxtool-gui/main.cpp qpxtool/qpxtool-gui/main.cpp +--- qpxtool.orig/qpxtool-gui/main.cpp 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/qpxtool-gui/main.cpp 2008-07-02 10:31:47.000000000 +0000 +@@ -31,7 +31,7 @@ int main(int argc, char *argv[]) + { + // const char *program_name = argv[0]; + printf("\n________________________________________"); +- printf("\n QPxTool-%s\n (c) 2005-2006, Gennady \"ShultZ\" Kozlov",VERSION); ++ printf("\n QPxTool-%s\n (c) 2005-2007, Gennady \"ShultZ\" Kozlov",VERSION); + printf("\n________________________________________"); + printf("\ncurrent system:"); + uname(&sys); +diff -Naurp qpxtool.orig/qpxtool-gui/qcheck/test_threads.cpp qpxtool/qpxtool-gui/qcheck/test_threads.cpp +--- qpxtool.orig/qpxtool-gui/qcheck/test_threads.cpp 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/qpxtool-gui/qcheck/test_threads.cpp 2008-07-02 10:31:47.000000000 +0000 +@@ -1,6 +1,6 @@ + /* + * This file is part of the QPxTool project. +- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov ++ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +diff -Naurp qpxtool.orig/qpxtool-gui/version.h qpxtool/qpxtool-gui/version.h +--- qpxtool.orig/qpxtool-gui/version.h 2008-07-02 10:13:18.000000000 +0000 ++++ qpxtool/qpxtool-gui/version.h 2008-07-02 10:31:47.000000000 +0000 +@@ -1,6 +1,6 @@ + /* + * This file is part of the QPxTool project. +- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov ++ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by --- qpxtool-0.6.1.orig/debian/patches/02-typos.dpatch +++ qpxtool-0.6.1/debian/patches/02-typos.dpatch @@ -0,0 +1,31 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 02-typos.dpatch by Eduard Bloch +## +## DP: Some nasty typo in a label. + +@DPATCH@ + +diff -Naur qpxtool-0.6.1.orig/console/pioquiet/pioquiet.cpp qpxtool-0.6.1/console/pioquiet/pioquiet.cpp +--- qpxtool-0.6.1.orig/console/pioquiet/pioquiet.cpp 2007-08-19 14:04:14.000000000 +0000 ++++ qpxtool-0.6.1/console/pioquiet/pioquiet.cpp 2007-09-02 16:11:02.000000000 +0000 +@@ -87,7 +87,7 @@ + printf("\t--current, -c show current drive settings\n"); + printf("\t--limit limit read speed by 24x for CD and 8x for DVD\n"); + printf("\t--nolimit turn off speed limit\n"); +- printf("\t--quiet [quiet|perf|std] select QuietMode setting: Quiet, Performance or Standart (default: quiet)\n"); ++ printf("\t--quiet [quiet|perf|std] select QuietMode setting: Quiet, Performance or Standard (default: quiet)\n"); + printf("\t--save, -s save settings to drive (make changes permanent)\n"); + printf("\t--verbose, -v be verbose\n"); + } +diff -Naur qpxtool-0.6.1.orig/qpxtool-gui/qcheck/test_threads.cpp qpxtool-0.6.1/qpxtool-gui/qcheck/test_threads.cpp +--- qpxtool-0.6.1.orig/qpxtool-gui/qcheck/test_threads.cpp 2007-08-19 14:04:14.000000000 +0000 ++++ qpxtool-0.6.1/qpxtool-gui/qcheck/test_threads.cpp 2007-09-02 16:11:15.000000000 +0000 +@@ -247,7 +247,7 @@ + return 1; + } + block.ext = (drive->ven_ID == WR_PLEXTOR) ? 1 : 0; +- printf("Running %s CD scan\n\n",block.ext ? "Extended" : "Standart"); ++ printf("Running %s CD scan\n\n",block.ext ? "Extended" : "Standard"); + gettimeofday(&start, NULL); + + // seconds = drive->media.capacity/75+!!(drive->media.capacity%75); --- qpxtool-0.6.1.orig/debian/patches/00list +++ qpxtool-0.6.1/debian/patches/00list @@ -0,0 +1,4 @@ +01-qtdir.dpatch +02-typos.dpatch +03-0.6.1.1.dpatch +04-libata.dpatch --- qpxtool-0.6.1.orig/debian/patches/04-libata.dpatch +++ qpxtool-0.6.1/debian/patches/04-libata.dpatch @@ -0,0 +1,40 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 04-libata.dpatch by Mirko Parthey +## +## DP: qpxtool does not work with the Linux kernel's new IDE/SATA +## DP: infrastructure (libata). +## DP: Someone else had the same problem and reported it here: +## DP: http://lkml.org/lkml/2008/1/11/297 +## DP: https://bugzilla.redhat.com/show_bug.cgi?id=428281 +## DP: The cause of this problem seems to be the overloaded Scsi_Command [] +## DP: operator in qpx_transport.h - it has a strange implementation which is +## DP: easy to use incorrectly, and qpxtool does get it wrong in various places. +## DP: (Closes: #463886). + +@DPATCH@ + +diff -Naurp qpxtool.orig/lib/qpxtransport/qpx_transport.cpp qpxtool/lib/qpxtransport/qpx_transport.cpp +--- qpxtool.orig/lib/qpxtransport/qpx_transport.cpp 2008-07-02 12:33:53.000000000 +0200 ++++ qpxtool/lib/qpxtransport/qpx_transport.cpp 2008-07-02 12:34:07.000000000 +0200 +@@ -215,6 +215,21 @@ int Scsi_Command::transport(Direction di + #define KERNEL_BROKEN 0 + if (use_sg_io) + { ++ /* see linux-2.6.23/block/scsi_ioctl.c:36 */ ++ static const unsigned char scsi_command_size[8] = ++ { ++ 6, 10, 10, 12, ++ 16, 12, 10, 10 ++ }; ++ char cmdsize, opcode; ++ ++ opcode = cgc.cmd[0]; ++ /* see linux-2.6.23/include/scsi/scsi.h:25 */ ++ cmdsize = scsi_command_size[((opcode) >> 5) & 7]; ++ if ((sg_io.cmd_len > 0) && (sg_io.cmd_len < cmdsize)) { ++ sg_io.cmd_len = cmdsize; ++ } ++ + sg_io.dxferp = buf; + sg_io.dxfer_len = sz; + sg_io.dxfer_direction = use_sg_io[dir]; --- qpxtool-0.6.1.orig/debian/manpage/qpxtool.1 +++ qpxtool-0.6.1/debian/manpage/qpxtool.1 @@ -0,0 +1,27 @@ +.TH QPXTOOL 1 "2007-12-27" "0.6.1" "CD/DVD quality checker" + +.SH NAME +qpxtool \- CD/DVD quality checker + +.SH SYNOPSIS +\fBqpxtool\fR + +.SH DESCRIPTION +qpxtool gives you access to all available Quality Checks (Q-Checks) on written and blank media, that are available for your drive. This will help you to find the right media and the optimized writing speed for your hardware, which will increase the change for a long data lifetime. +.PP +qpxtool depends on the used drive, not all drives are able to read the Q-Checks and not all of them are supported by QPxTool. Currently, most newer drives of LiteOn, NEC, Pioneer and Plextor are supported. +.PP + +.SH OPTIONS +qpxtool has no options. + +.SH SEE ALSO +.PP +\fIpxcontrol\fR(1) +.PP +Homepage: <\fIhttp://qpxtool.sourceforge.net/\fR> + +.SH AUTHOR +qpxtool was written by Gennady "ShultZ" Kozlov . +.PP +This manual page was written by Daniel Baumann , for the Debian project (but may be used by others). --- qpxtool-0.6.1.orig/debian/manpage/deadreader.1 +++ qpxtool-0.6.1/debian/manpage/deadreader.1 @@ -0,0 +1,25 @@ +.TH DEADREADER 1 "2007-12-27" "0.6.1" "reading corrupted CD/DVD media" + +.SH NAME +deadreader \- reading corrupted CD/DVD media + +.SH SYNOPSIS +\fBdvdreader\fR \fIDEVICE\fR \fIIMAGE\fR + +.SH DESCRIPTION +deadreader is part of the QPxTool suite for CD/DVD media. It is a command line tool for reading corrupted CD/DVD media. The data is written into an image file, which can be written to a new media. +.PP + +.SH OPTIONS +deadreader has no options. + +.SH SEE ALSO +.PP +\fIqpxtool\fR(1) +.PP +Homepage: <\fIhttp://qpxtool.sourceforge.net/\fR> + +.SH AUTHOR +deadreader was written by Gennady "ShultZ" Kozlov . +.PP +This manual page was written by Daniel Baumann , for the Debian project (but may be used by others). --- qpxtool-0.6.1.orig/debian/manpage/pioquiet.1 +++ qpxtool-0.6.1/debian/manpage/pioquiet.1 @@ -0,0 +1,40 @@ +.TH PIOQUIET 1 "2007-12-27" "0.6.1" "setting drive parameters" + +.SH NAME +pioquiet \- setting drive parameters + +.SH SYNOPSIS +\fBpioquiet\fR \fIDEVICE\fR [\fIOPTIONS\fR] + +.SH DESCRIPTION +pioquiet can set some drive parameters. +.PP + +.SH OPTIONS +.IP "\-c, \-\-current" 4 +show current drive settings. +.IP "\-h, \-\-help" 4 +show help. +.IP "\-l, \-\-scan" 4 +list drives (scan IDE/SCSI bus). +.IP "\-\-limit" 4 +turn off speed limit. +.IP "\-\-nolimit" 4 +limit read speed by 24x for CD and 8x for DVD. +.IP "\-\-quiet [quiet|perf|std]" 4 +select QuietMode setting: Quiet, Performance or Standard (default: quiet). +.IP "\-s, \-\-save" 4 +save settings to drive (make changes permanent) +.IP "\-v, \-\-verbose" 4 +be verbose. + +.SH SEE ALSO +.PP +\fIqpxtool\fR(1) +.PP +Homepage: <\fIhttp://qpxtool.sourceforge.net/\fR> + +.SH AUTHOR +pioquiet was written by Gennady "ShultZ" Kozlov . +.PP +This manual page was written by Daniel Baumann , for the Debian project (but may be used by others). --- qpxtool-0.6.1.orig/debian/pixmap/qpxtool.xpm +++ qpxtool-0.6.1/debian/pixmap/qpxtool.xpm @@ -0,0 +1,520 @@ +/* XPM */ +static char * qpxtool_xpm[] = { +"32 32 485 2", +" c None", +". c #634F3E", +"+ c #664F39", +"@ c #66503C", +"# c #65513E", +"$ c #604B38", +"% c #56402D", +"& c #483625", +"* c #453A32", +"= c #363535", +"- c #141110", +"; c #49321D", +"> c #886647", +", c #C1AB97", +"' c #DDCFC2", +") c #E9DCD0", +"! c #EFE3D8", +"~ c #EFE2D7", +"{ c #E5D8CC", +"] c #D4C8BB", +"^ c #B49C86", +"/ c #664A30", +"( c #191008", +"_ c #201F1F", +": c #3E3E3E", +"< c #261A11", +"[ c #835F3E", +"} c #E7D4C3", +"| c #FBF8F4", +"1 c #FEFDFB", +"2 c #FFFEFD", +"3 c #FFFEFC", +"4 c #FFFDFA", +"5 c #FFFBF7", +"6 c #FFFCF8", +"7 c #FFFEFA", +"8 c #FEFCF9", +"9 c #FAF4ED", +"0 c #D7BCA3", +"a c #513C2A", +"b c #100B06", +"c c #232323", +"d c #3E2918", +"e c #B09175", +"f c #F5EBE1", +"g c #FFFAF7", +"h c #FFF9F4", +"i c #FFF9F5", +"j c #FFFAF6", +"k c #FFF8F1", +"l c #FFF4E7", +"m c #FFF6EA", +"n c #FFF8EB", +"o c #FFFAEE", +"p c #FFFDF3", +"q c #FFFFF9", +"r c #EEDECE", +"s c #866A51", +"t c #1D130B", +"u c #161616", +"v c #23170E", +"w c #C1A081", +"x c #FBE1CE", +"y c #FFECDF", +"z c #FFF4EC", +"A c #FFF5EE", +"B c #FFF6EF", +"C c #FFF5E9", +"D c #FFF0DA", +"E c #FFF4DF", +"F c #FFF6E3", +"G c #FFFAE7", +"H c #FFFEEB", +"I c #FFFFF2", +"J c #FFFFFC", +"K c #F3EADF", +"L c #94785D", +"M c #110C07", +"N c #141414", +"O c #1D1815", +"P c #AA835F", +"Q c #FDD9BE", +"R c #FFCBAA", +"S c #FFD0B2", +"T c #FFE8D7", +"U c #FFF1E6", +"V c #FFF2E8", +"W c #FFF4E9", +"X c #FFF6EC", +"Y c #FFF2E1", +"Z c #FFEED1", +"` c #FFF4D8", +" . c #FFF8DD", +".. c #FFFDE3", +"+. c #FFFFED", +"@. c #FFFFF8", +"#. c #FFFEF9", +"$. c #FFFCF2", +"%. c #F9EDD8", +"&. c #715339", +"*. c #050303", +"=. c #1C1B1A", +"-. c #573C23", +";. c #F3CAA8", +">. c #FFBE94", +",. c #FFC095", +"'. c #FFC59B", +"). c #FFD2AD", +"!. c #FFE8D4", +"~. c #FFF1E3", +"{. c #FFF3E5", +"]. c #FFF5E8", +"^. c #FFF2DB", +"/. c #FFF0CB", +"(. c #FFF8D4", +"_. c #FFFCDA", +":. c #FFFFE8", +"<. c #FFFFF6", +"[. c #FFFDF8", +"}. c #FFFAEB", +"|. c #FFF7DD", +"1. c #FFF7D9", +"2. c #E2C8A4", +"3. c #2A190C", +"4. c #060606", +"5. c #251C15", +"6. c #AC8867", +"7. c #FDBB8D", +"8. c #FFB380", +"9. c #FFBA88", +"0. c #FFC08F", +"a. c #FFC898", +"b. c #FFD7AF", +"c. c #FFEDD9", +"d. c #FFF4E4", +"e. c #FFF7E7", +"f. c #FFF5D9", +"g. c #FFF6CA", +"h. c #FFFDD5", +"i. c #FFFFE1", +"j. c #FFFFF4", +"k. c #FFFDF6", +"l. c #FFFAE8", +"m. c #FFF5D7", +"n. c #FFF1C7", +"o. c #FFECB8", +"p. c #F9E8B7", +"q. c #836345", +"r. c #080504", +"s. c #412E1B", +"t. c #DCAA7D", +"u. c #FFA86C", +"v. c #FFAF72", +"w. c #FFB57B", +"x. c #FFBD84", +"y. c #FFC78E", +"z. c #FFCF98", +"A. c #FFE0B4", +"B. c #FFF3DE", +"C. c #FFF1D9", +"D. c #FFECC2", +"E. c #FFF1B9", +"F. c #FFFAD7", +"G. c #FFFEF3", +"H. c #FFFDF4", +"I. c #FFF8E2", +"J. c #FFF3D0", +"K. c #FFEDBA", +"L. c #FFE8A8", +"M. c #FFE497", +"N. c #FFE18C", +"O. c #BFA073", +"P. c #1E1207", +"Q. c #4D4C4A", +"R. c #6A4E34", +"S. c #F6AB6F", +"T. c #FFA15C", +"U. c #FFAB68", +"V. c #FFB471", +"W. c #FFBD7C", +"X. c #FFC988", +"Y. c #FFD394", +"Z. c #FFDC9D", +"`. c #FFDEA4", +" + c #FFE5B8", +".+ c #FEEDB8", +"++ c #FEEEBC", +"@+ c #FFE9C6", +"#+ c #FFEFD8", +"$+ c #FFF6DC", +"%+ c #FFF0C5", +"&+ c #FFE9AF", +"*+ c #FFE397", +"=+ c #FFDE82", +"-+ c #FFD96E", +";+ c #FFD355", +">+ c #E0BA6B", +",+ c #46311E", +"'+ c #353535", +")+ c #2B2724", +"!+ c #815D3A", +"~+ c #FE9D50", +"{+ c #FF9946", +"]+ c #FFAA5F", +"^+ c #FFB66C", +"/+ c #FFC078", +"(+ c #FFCD86", +"_+ c #FFD994", +":+ c #FFDB92", +"<+ c #FFDB8B", +"[+ c #EEDEA3", +"}+ c #C0B18E", +"|+ c #CBBEA5", +"1+ c #F8E6C7", +"2+ c #FFDCA9", +"3+ c #FFE9B6", +"4+ c #FFE8A7", +"5+ c #FFE08D", +"6+ c #FFD972", +"7+ c #FFD359", +"8+ c #FFCB3E", +"9+ c #FFC21D", +"0+ c #F1BE4A", +"a+ c #5E452B", +"b+ c #181717", +"c+ c #15110D", +"d+ c #88623D", +"e+ c #FFA14F", +"f+ c #FF9A3F", +"g+ c #FFAA54", +"h+ c #FFB966", +"i+ c #FFC676", +"j+ c #FFD587", +"k+ c #FFE297", +"l+ c #FFDB87", +"m+ c #FFE997", +"n+ c #CBBE91", +"o+ c #D2CBC3", +"p+ c #DFD6CD", +"q+ c #DDCAA2", +"r+ c #FFD78F", +"s+ c #FFD989", +"t+ c #FFDD80", +"u+ c #FFD563", +"v+ c #FFCC43", +"w+ c #FFC323", +"x+ c #FFBD0B", +"y+ c #FFBB04", +"z+ c #F5BE3A", +"A+ c #694C2F", +"B+ c #0A0807", +"C+ c #0B0703", +"D+ c #876139", +"E+ c #FFAB5A", +"F+ c #FFA951", +"G+ c #FFB861", +"H+ c #FFC46F", +"I+ c #FFD27E", +"J+ c #FFE190", +"K+ c #FFF1A1", +"L+ c #FFE793", +"M+ c #FFE6A6", +"N+ c #DBCFB5", +"O+ c #E2D7CC", +"P+ c #E8D8C3", +"Q+ c #E9CB8B", +"R+ c #FFCB6C", +"S+ c #FFD065", +"T+ c #FFD154", +"U+ c #FFC835", +"V+ c #FFC015", +"W+ c #FFBB02", +"X+ c #FFBA00", +"Y+ c #FFBB03", +"Z+ c #F4BC3A", +"`+ c #66492B", +" @ c #0F0C09", +".@ c #7A5632", +"+@ c #FCB365", +"@@ c #FFB760", +"#@ c #FFC671", +"$@ c #FFD27F", +"%@ c #FFE08E", +"&@ c #FFF0A0", +"*@ c #FFFBB5", +"=@ c #FFF6C4", +"-@ c #FFDDAD", +";@ c #FCE2BD", +">@ c #E8D6B5", +",@ c #F2D8AC", +"'@ c #FFC453", +")@ c #FFCF50", +"!@ c #FFC018", +"~@ c #FFBB06", +"{@ c #ECB641", +"]@ c #583C22", +"^@ c #100F0F", +"/@ c #1A1919", +"(@ c #5D4023", +"_@ c #F0B66C", +":@ c #FFC570", +"<@ c #FFD380", +"[@ c #FFE08F", +"}@ c #FFEF9E", +"|@ c #FFFBB3", +"1@ c #FFFFD2", +"2@ c #FFFEF0", +"3@ c #FFEDCF", +"4@ c #FFD99D", +"5@ c #FFDAA0", +"6@ c #FFD9A0", +"7@ c #FFD790", +"8@ c #FFD261", +"9@ c #FFC934", +"0@ c #FFBB05", +"a@ c #FFBB08", +"b@ c #D7A447", +"c@ c #3A2513", +"d@ c #292929", +"e@ c #434343", +"f@ c #2A1808", +"g@ c #C9995C", +"h@ c #FFD684", +"i@ c #FFE493", +"j@ c #FFF2A1", +"k@ c #FFFCB5", +"l@ c #FFFFD8", +"m@ c #FFFEF1", +"n@ c #FFF8E5", +"o@ c #FFF0C6", +"p@ c #FFE9AC", +"q@ c #FFEBBC", +"r@ c #FFEEC4", +"s@ c #FFEFC1", +"t@ c #FFE8AB", +"u@ c #FFC936", +"v@ c #FFBA01", +"w@ c #FEBF1C", +"x@ c #AD7C41", +"y@ c #120801", +"z@ c #4D4D4D", +"A@ c #515151", +"B@ c #070300", +"C@ c #8D6032", +"D@ c #FADB8E", +"E@ c #FFF4A4", +"F@ c #FFFFD4", +"G@ c #FFF8E6", +"H@ c #FFF0C7", +"I@ c #FFE292", +"J@ c #FFEBB4", +"K@ c #FFE9AD", +"L@ c #FFDE85", +"M@ c #F5BA40", +"N@ c #643E1D", +"O@ c #020000", +"P@ c #2D1807", +"Q@ c #E4B46C", +"R@ c #FFFAB9", +"S@ c #FFFFD7", +"T@ c #FFFFF0", +"U@ c #FFF0C8", +"V@ c #FFE8A9", +"W@ c #FFE089", +"X@ c #FFDA77", +"Y@ c #FFE8AA", +"Z@ c #FFEBB5", +"`@ c #FFE6A4", +" # c #FFE5A4", +".# c #FFDB7A", +"+# c #FFC11A", +"@# c #FFC121", +"## c #C78A3D", +"$# c #140902", +"%# c #1C1C1C", +"&# c #343434", +"*# c #010100", +"=# c #623D18", +"-# c #F2CB92", +";# c #FFF9E9", +"># c #FFEFC4", +",# c #FFE8A6", +"'# c #FFDF87", +")# c #FFD667", +"!# c #FFD258", +"~# c #FFE49B", +"{# c #FFE5A3", +"]# c #FFDB7C", +"^# c #FFC017", +"/# c #FEBD19", +"(# c #E09F3D", +"_# c #3E240C", +":# c #040404", +"<# c #111111", +"[# c #0C0602", +"}# c #835628", +"|# c #EDC088", +"1# c #FFE9B9", +"2# c #FFD668", +"3# c #FFCE48", +"4# c #FFE18F", +"5# c #FFE7A8", +"6# c #FED068", +"7# c #DC9A37", +"8# c #603B16", +"9# c #070401", +"0# c #101010", +"a# c #2A2A2A", +"b# c #030303", +"c# c #130A02", +"d# c #663F17", +"e# c #DEA257", +"f# c #FFD77F", +"g# c #FFD86B", +"h# c #FFCF49", +"i# c #FFC629", +"j# c #FFC526", +"k# c #FFDF89", +"l# c #FFE5A1", +"m# c #FFD387", +"n# c #C58943", +"o# c #4A2B0F", +"p# c #0B0601", +"q# c #000000", +"r# c #171717", +"s# c #050200", +"t# c #291606", +"u# c #9F6525", +"v# c #E2A345", +"w# c #F6BB3D", +"x# c #FDBC1A", +"y# c #FFC122", +"z# c #FFDD87", +"A# c #FFE39F", +"B# c #FEE09A", +"C# c #FCDA92", +"D# c #F4C77A", +"E# c #D99B4F", +"F# c #84511C", +"G# c #1B0E04", +"H# c #030101", +"I# c #010101", +"J# c #2C2C2C", +"K# c #060300", +"L# c #341C06", +"M# c #794919", +"N# c #AE742F", +"O# c #C88C3B", +"P# c #D09A51", +"Q# c #CF9A54", +"R# c #C48C4A", +"S# c #A87035", +"T# c #6D4216", +"U# c #030100", +"V# c #303030", +"W# c #19120C", +"X# c #2B1E13", +"Y# c #332211", +"Z# c #312111", +"`# c #281C11", +" $ c #18110D", +".$ c #272727", +"+$ c #5A5A5A", +"@$ c #181818", +"#$ c #020202", +"$$ c #131313", +"%$ c #1D1D1D", +"&$ c #3D3D3D", +"*$ c #666666", +"=$ c #323232", +"-$ c #0C0C0C", +";$ c #050505", +">$ c #565656", +",$ c #0D0D0D", +"'$ c #080808", +")$ c #2B2B2B", +"!$ c #585858", +"~$ c #0A0A0A", +"{$ c #3F3F3F", +"]$ c #808080", +"^$ c #3A3A3A", +"/$ c #0E0E0E", +"($ c #1A1A1A", +"_$ c #191919", +":$ c #0B0B0B", +" ", +" . + @ # $ % & * = ", +" - ; > , ' ) ! ~ { ] ^ / ( _ : ", +" < [ } | 1 2 3 4 5 6 7 8 9 0 a b c ", +" d e f g h h i j k l m n o p q r s t u ", +" v w x y z z A B k C D E F G H I J K L M N ", +" O P Q R S T U V W X Y Z ` ...+.@.#.$.%.&.*. ", +" =.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4. ", +" 5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r. ", +" s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P. ", +" Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+ ", +" )+!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+a+b+ ", +" c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+x+y+z+A+B+ ", +" C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+*. ", +" @.@+@@@#@$@%@&@*@=@-@;@>@,@$@'@)@U+!@Y+X+X+~@{@]@^@ ", +" /@(@_@:@<@[@}@|@1@2@3@4@5@6@7@8@9@!@0@X+X+X+a@b@c@d@ ", +" e@f@g@h@i@j@k@l@m@n@o@p@q@r@s@t@u@v@X+X+X+X+w@x@y@z@ ", +" A@B@C@D@E@k@F@2@G@H@4+I@o.s@J@K@L@w+v@X+X+Y+M@N@O@ ", +" 4.P@Q@R@S@T@G@U@V@W@X@Y@Z@V@`@ #.#+#X+X+@###$#%# ", +" &#*#=#-#;#n@>#,#'#)#!#~#V@`@{#{#M+]#^#/#(#_#:# ", +" <#[#}#|#1#,#'#2#3#8+4# #{#{#{#`@5#6#7#8#9#0# ", +" a#b#c#d#e#f#g#h#i#j#k# #`@`@,#l#m#n#o#p#q# ", +" r#:#s#t#u#v#w#x#y#z#A#B#C#D#E#F#G#H#I# ", +" J#0#q#K#L#M#N#O#P#Q#R#S#T#t#U#:#u ", +" V#b#q#U#W#X#Y#Z#`# $I#b#.$ ", +" +$r#@$#$I#$$%$&$*$ ", +" =$-$;$>$ ", +" ,$I#q#q#q#q#'$)$,$!$ ", +" b#;$b#I#q#b#b#q#q#q##$<#~${$]$ b#b# ", +" b#:#u ^$/$c ~$q#q#q#q#q#b#($_$:#b#b# ", +" r#&#:$q#q#q#I#:$ ", +" "}; --- qpxtool-0.6.1.orig/qpxtool-gui/Makefile.qmake +++ qpxtool-0.6.1/qpxtool-gui/Makefile.qmake @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: qpxtool -# Generated by qmake (1.07a) (Qt 3.3.8) on: Sun Aug 19 18:04:15 2007 +# Generated by qmake (1.07a) (Qt 3.3.8b) on: Thu Aug 27 08:19:15 2009 # Project: qpxtool.pro # Template: app # Command: $(QMAKE) -o Makefile.qmake qpxtool.pro @@ -12,18 +12,18 @@ CXX = g++ LEX = flex YACC = yacc -CFLAGS = -pipe -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -CXXFLAGS = -pipe -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED +CFLAGS = -pipe -g -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT +CXXFLAGS = -pipe -g -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT LEXFLAGS = YACCFLAGS= -d -INCPATH = -I/usr/lib/qt/mkspecs/default -I. -I../lib/include -I. -Iinclude -I$(QTDIR)/include +INCPATH = -I/usr/share/qt3/mkspecs/default -I. -I../lib/include -I. -Iinclude -I/usr/include/qt3 LINK = g++ -LFLAGS = -Wl,-rpath,../lib/lib -Wl,-rpath,$(QTDIR)/lib -LIBS = $(SUBLIBS) -L../lib/lib -L$(QTDIR)/lib -L/usr/X11R6/lib -lqpxtransport -lqpxplextor -lqpxpioneer -lqpxscan -lqt-mt -lXext -lX11 -lm -lpthread +LFLAGS = +LIBS = $(SUBLIBS) -L../lib/lib -L/usr/share/qt3/lib -L/usr/X11R6/lib -lqpxtransport -lqpxplextor -lqpxpioneer -lqpxscan -lqt-mt -lXext -lX11 -lm -lpthread AR = ar cqs RANLIB = -MOC = $(QTDIR)/bin/moc -UIC = $(QTDIR)/bin/uic +MOC = /usr/share/qt3/bin/moc +UIC = /usr/share/qt3/bin/uic QMAKE = qmake TAR = tar -cf GZIP = gzip -9f @@ -160,7 +160,7 @@ $(MOC): ( cd $(QTDIR)/src/moc && $(MAKE) ) -Makefile.qmake: qpxtool.pro /usr/lib/qt/mkspecs/default/qmake.conf /usr/lib/qt/lib/libqt-mt.prl +Makefile.qmake: qpxtool.pro /usr/share/qt3/mkspecs/default/qmake.conf /usr/share/qt3/lib/libqt-mt.prl $(QMAKE) -o Makefile.qmake qpxtool.pro qmake: @$(QMAKE) -o Makefile.qmake qpxtool.pro