Bug#464759: qgfe: diff for NMU version 1.0-1.1

[Moritz Muehlenhoff]

tags 464759 + patch
thanks

Hi,

Attached is the diff for my qgfe 1.0-1.1 NMU.

Cheers,
        Moritz

diff -u qgfe-1.0/debian/control qgfe-1.0/debian/control
--- qgfe-1.0/debian/control
+++ qgfe-1.0/debian/control
@@ -2,7 +2,7 @@
 Section: math
 Priority: optional
 Maintainer: Giorgio Pioda <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), qt3-dev-tools (>= 3.3.7-4), libqt3-mt-dev (>= 3.3.7-4), libqt3-compat-headers (>= 3.3.7-4)
+Build-Depends: debhelper (>= 5), qt3-dev-tools (>= 3.3.7-4), libqt3-mt-dev (>= 3.3.7-4)
 Standards-Version: 3.7.2
 
 Package: qgfe
diff -u qgfe-1.0/debian/changelog qgfe-1.0/debian/changelog
--- qgfe-1.0/debian/changelog
+++ qgfe-1.0/debian/changelog
@@ -1,3 +1,11 @@
+qgfe (1.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Stop using deprecated QT compat headers, patch by Barry deFreese
+    (Closes: #464759)
+
+ -- Moritz Muehlenhoff <[EMAIL PROTECTED]>  Thu, 27 Mar 2008 19:57:21 +0100
+
 qgfe (1.0-1) unstable; urgency=low
 
   * Initial release (Closes: #421908)
only in patch2:
unchanged:
--- qgfe-1.0.orig/funcLegendTitleData.cpp
+++ qgfe-1.0/funcLegendTitleData.cpp
@@ -28,8 +28,8 @@
 #include "funcLegendTitleData.h"
 
 #include <qlabel.h>
-#include <qbttngrp.h>
-#include <qpushbt.h>
+#include <qbuttongroup.h>
+#include <qpushbutton.h>
 #include <qlayout.h>
 
 funcLegendTitleData::funcLegendTitleData
only in patch2:
unchanged:
--- qgfe-1.0.orig/boxWidthOpData.cpp
+++ qgfe-1.0/boxWidthOpData.cpp
@@ -27,7 +27,7 @@
 
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qpushbt.h>
+#include <qpushbutton.h>
 
 boxWidthOpData::boxWidthOpData
 (
only in patch2:
unchanged:
--- qgfe-1.0.orig/multiFuncData.h
+++ qgfe-1.0/multiFuncData.h
@@ -26,9 +26,9 @@
 #define multiFuncData_included
 
 #include <qdialog.h>
-#include <qlined.h>
-#include <qcombo.h>
-#include <qchkbox.h>
+#include <qlineedit.h>
+#include <qcombobox.h>
+#include <qcheckbox.h>
 
 class multiFuncData : public QDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/sizeOpData.cpp
+++ qgfe-1.0/sizeOpData.cpp
@@ -26,7 +26,7 @@
 #include "sizeOpData.h"
 
 #include <qlabel.h>
-#include <qpushbt.h>
+#include <qpushbutton.h>
 #include <qlayout.h>
 
 sizeOpData::sizeOpData
only in patch2:
unchanged:
--- qgfe-1.0.orig/ticsLevelData.h
+++ qgfe-1.0/ticsLevelData.h
@@ -27,7 +27,7 @@
 #define ticsLevelData_included
 
 #include <qdialog.h>
-#include <qlined.h>
+#include <qlineedit.h>
 
 class ticsLevelData : public QDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/logScaleOpData.h
+++ qgfe-1.0/logScaleOpData.h
@@ -27,8 +27,8 @@
 #define logScaleOpData_included
 
 #include <qdialog.h>
-#include <qchkbox.h>
-#include <qlined.h>
+#include <qcheckbox.h>
+#include <qlineedit.h>
 
 class logScaleOpData : public QDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/isoLinesOpData.h
+++ qgfe-1.0/isoLinesOpData.h
@@ -27,7 +27,7 @@
 #define isoLinesOpData_included
 
 #include <qdialog.h>
-#include <qlined.h>
+#include <qlineedit.h>
 
 class isoLinesOpData : public QDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/funcLegendTitleData.h
+++ qgfe-1.0/funcLegendTitleData.h
@@ -27,8 +27,8 @@
 #define funcLegendTitleData_included
 
 #include <qdialog.h>
-#include <qchkbox.h>
-#include <qlined.h>
+#include <qcheckbox.h>
+#include <qlineedit.h>
 
 class funcLegendTitleData : public QDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/fileOptionsData.h
+++ qgfe-1.0/fileOptionsData.h
@@ -27,8 +27,8 @@
 #define fileOptionsData_included
 
 #include <qdialog.h>
-#include <qlined.h>
-#include <qcombo.h>
+#include <qlineedit.h>
+#include <qcombobox.h>
 
 class fileOptionsData : public QDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/multiFileData.h
+++ qgfe-1.0/multiFileData.h
@@ -26,11 +26,11 @@
 #define multiFileData_included
 
 #include <qdialog.h>
-#include <qlined.h>
-#include <qcombo.h>
-#include <qchkbox.h>
-#include <qradiobt.h>
-#include <qtabdlg.h>
+#include <qlineedit.h>
+#include <qcombobox.h>
+#include <qcheckbox.h>
+#include <qradiobutton.h>
+#include <qtabdialog.h>
 
 class multiFileData : public QTabDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/legendOpData.cpp
+++ qgfe-1.0/legendOpData.cpp
@@ -30,7 +30,7 @@
 #include <qhbuttongroup.h>
 #include <qlayout.h>
 #include <qgroupbox.h>
-#include <qpushbt.h>
+#include <qpushbutton.h>
 
 legendOpData::legendOpData
 (
only in patch2:
unchanged:
--- qgfe-1.0.orig/ticsLevelData.cpp
+++ qgfe-1.0/ticsLevelData.cpp
@@ -26,7 +26,7 @@
 #include "ticsLevelData.h"
 
 #include <qlabel.h>
-#include <qpushbt.h>
+#include <qpushbutton.h>
 #include <qlayout.h>
 
 ticsLevelData::ticsLevelData
only in patch2:
unchanged:
--- qgfe-1.0.orig/barOpData.h
+++ qgfe-1.0/barOpData.h
@@ -27,8 +27,8 @@
 #define barOpData_included
 
 #include <qdialog.h>
-#include <qlined.h>
-#include <qcombo.h>
+#include <qlineedit.h>
+#include <qcombobox.h>
 
 class barOpData : public QDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/fileOptionsData.cpp
+++ qgfe-1.0/fileOptionsData.cpp
@@ -26,8 +26,8 @@
 #include "fileOptionsData.h"
 
 #include <qlabel.h>
-#include <qbttngrp.h>
-#include <qpushbt.h>
+#include <qbuttongroup.h>
+#include <qpushbutton.h>
 #include <qlayout.h>
 
 fileOptionsData::fileOptionsData
only in patch2:
unchanged:
--- qgfe-1.0.orig/multiFile.h
+++ qgfe-1.0/multiFile.h
@@ -27,7 +27,7 @@
 
 #include "multiFileData.h"
 #include "gnuInterface.h"
-#include <qfiledlg.h>
+#include <qfiledialog.h>
 #include <qstring.h>
 
 class multiFile : public multiFileData
only in patch2:
unchanged:
--- qgfe-1.0.orig/logScaleOpData.cpp
+++ qgfe-1.0/logScaleOpData.cpp
@@ -28,7 +28,7 @@
 #include <qlabel.h>
 #include <qvbuttongroup.h>
 #include <qlayout.h>
-#include <qpushbt.h>
+#include <qpushbutton.h>
 
 logScaleOpData::logScaleOpData
 (
only in patch2:
unchanged:
--- qgfe-1.0.orig/latexEmtexOpData.cpp
+++ qgfe-1.0/latexEmtexOpData.cpp
@@ -28,7 +28,7 @@
 
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qpushbt.h>
+#include <qpushbutton.h>
 
 latexEmtexOpData::latexEmtexOpData
 (
only in patch2:
unchanged:
--- qgfe-1.0.orig/psOptData.h
+++ qgfe-1.0/psOptData.h
@@ -27,8 +27,8 @@
 #define psOptData_included
 
 #include <qdialog.h>
-#include <qlined.h>
-#include <qcombo.h>
+#include <qlineedit.h>
+#include <qcombobox.h>
 
 class psOptData : public QDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/sizeOpData.h
+++ qgfe-1.0/sizeOpData.h
@@ -27,7 +27,7 @@
 #define sizeOpData_included
 
 #include <qdialog.h>
-#include <qlined.h>
+#include <qlineedit.h>
 
 class sizeOpData : public QDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/pbmOpData.cpp
+++ qgfe-1.0/pbmOpData.cpp
@@ -27,7 +27,7 @@
 
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qpushbt.h>
+#include <qpushbutton.h>
 
 pbmOpData::pbmOpData
 (
only in patch2:
unchanged:
--- qgfe-1.0.orig/legendOpData.h
+++ qgfe-1.0/legendOpData.h
@@ -14,10 +14,10 @@
 #define legendOpData_included
 
 #include <qdialog.h>
-#include <qchkbox.h>
-#include <qlined.h>
-#include <qradiobt.h>
-#include <qcombo.h>
+#include <qcheckbox.h>
+#include <qlineedit.h>
+#include <qradiobutton.h>
+#include <qcombobox.h>
 
 class legendOpData : public QDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/barOpData.cpp
+++ qgfe-1.0/barOpData.cpp
@@ -27,7 +27,7 @@
 
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qpushbt.h>
+#include <qpushbutton.h>
 
 barOpData::barOpData
 (
only in patch2:
unchanged:
--- qgfe-1.0.orig/legendOp.cpp
+++ qgfe-1.0/legendOp.cpp
@@ -8,7 +8,7 @@
  *********************************************************************/
 
 #include "legendOp.h"
-#include <qmsgbox.h>
+#include <qmessagebox.h>
 
 legendOp::legendOp
 (
only in patch2:
unchanged:
--- qgfe-1.0.orig/boxWidthOpData.h
+++ qgfe-1.0/boxWidthOpData.h
@@ -27,7 +27,7 @@
 #define boxWidthOpData_included
 
 #include <qdialog.h>
-#include <qlined.h>
+#include <qlineedit.h>
 
 class boxWidthOpData : public QDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/curveFitData.h
+++ qgfe-1.0/curveFitData.h
@@ -27,11 +27,11 @@
 #define curveFitData_included
 
 #include <qdialog.h>
-#include <qlined.h>
-#include <qradiobt.h>
-#include <qtabdlg.h>
-#include <qcombo.h>
-#include <qchkbox.h>
+#include <qlineedit.h>
+#include <qradiobutton.h>
+#include <qtabdialog.h>
+#include <qcombobox.h>
+#include <qcheckbox.h>
 
 class curveFitData : public QTabDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/rotationData.h
+++ qgfe-1.0/rotationData.h
@@ -28,8 +28,8 @@
 
 #include <qdialog.h>
 #include <qslider.h>
-#include <qlined.h>
-#include <qlcdnum.h>
+#include <qlineedit.h>
+#include <qlcdnumber.h>
 
 class rotationData : public QDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/fileFilterData.h
+++ qgfe-1.0/fileFilterData.h
@@ -27,8 +27,8 @@
 #define fileFilterData_included
 
 #include <qdialog.h>
-#include <qlined.h>
-#include <qradiobt.h>
+#include <qlineedit.h>
+#include <qradiobutton.h>
 
 class fileFilterData : public QDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/qplotdialog.h
+++ qgfe-1.0/qplotdialog.h
@@ -23,12 +23,12 @@
 
 #include <qmainwindow.h>
 #include <qlabel.h>
-#include <qchkbox.h>
-#include <qlined.h>
-#include <qpopmenu.h>
-#include <qapp.h>
+#include <qcheckbox.h>
+#include <qlineedit.h>
+#include <qpopupmenu.h>
+#include <qapplication.h>
 #include <qframe.h>
-#include <qmsgbox.h>
+#include <qmessagebox.h>
 #include <qstring.h>
 #include <iostream>
 #include "gnuInterface.h"
only in patch2:
unchanged:
--- qgfe-1.0.orig/isoLinesOpData.cpp
+++ qgfe-1.0/isoLinesOpData.cpp
@@ -26,7 +26,7 @@
 #include "isoLinesOpData.h"
 
 #include <qlabel.h>
-#include <qpushbt.h>
+#include <qpushbutton.h>
 #include <qlayout.h>
 
 isoLinesOpData::isoLinesOpData
only in patch2:
unchanged:
--- qgfe-1.0.orig/multiFileData.cpp
+++ qgfe-1.0/multiFileData.cpp
@@ -28,8 +28,8 @@
 #include "multiFileData.h"
 
 #include <qlabel.h>
-#include <qpushbt.h>
-#include <qbttngrp.h>
+#include <qpushbutton.h>
+#include <qbuttongroup.h>
 #include <qlayout.h>
 
 multiFileData::multiFileData
only in patch2:
unchanged:
--- qgfe-1.0.orig/fileLegendTitleData.cpp
+++ qgfe-1.0/fileLegendTitleData.cpp
@@ -28,8 +28,8 @@
 #include "fileLegendTitleData.h"
 
 #include <qlabel.h>
-#include <qbttngrp.h>
-#include <qpushbt.h>
+#include <qbuttongroup.h>
+#include <qpushbutton.h>
 #include <qlayout.h>
 
 fileLegendTitleData::fileLegendTitleData
only in patch2:
unchanged:
--- qgfe-1.0.orig/qplotmaker.h
+++ qgfe-1.0/qplotmaker.h
@@ -43,9 +43,9 @@
 #include "rotation.h"
 #include "ticsLevel.h"
 #include "isoLinesOp.h"
-#include <qapp.h>
+#include <qapplication.h>
 #include <qstring.h>
-#include <qmsgbox.h>
+#include <qmessagebox.h>
 #include <iostream>
 
 
only in patch2:
unchanged:
--- qgfe-1.0.orig/psOptData.cpp
+++ qgfe-1.0/psOptData.cpp
@@ -27,7 +27,7 @@
 
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qpushbt.h>
+#include <qpushbutton.h>
 
 psOptData::psOptData
 (
only in patch2:
unchanged:
--- qgfe-1.0.orig/multiFuncData.cpp
+++ qgfe-1.0/multiFuncData.cpp
@@ -27,8 +27,8 @@
 #include "multiFuncData.h"
 
 #include <qlabel.h>
-#include <qbttngrp.h>
-#include <qpushbt.h>
+#include <qbuttongroup.h>
+#include <qpushbutton.h>
 #include <qlayout.h>
 
 multiFuncData::multiFuncData
only in patch2:
unchanged:
--- qgfe-1.0.orig/rawGnuData.cpp
+++ qgfe-1.0/rawGnuData.cpp
@@ -27,7 +27,7 @@
 
 #include "rawGnuData.h"
 
-#include <qpushbt.h>
+#include <qpushbutton.h>
 #include <qlayout.h>
 
 rawGnuData::rawGnuData
only in patch2:
unchanged:
--- qgfe-1.0.orig/curveFitData.cpp
+++ qgfe-1.0/curveFitData.cpp
@@ -28,9 +28,9 @@
 #include "curveFitData.h"
 
 #include <qlabel.h>
-#include <qbttngrp.h>
-#include <qpushbt.h>
-#include <qradiobt.h>
+#include <qbuttongroup.h>
+#include <qpushbutton.h>
+#include <qradiobutton.h>
 #include <qlayout.h>
 
 curveFitData::curveFitData
only in patch2:
unchanged:
--- qgfe-1.0.orig/rotationData.cpp
+++ qgfe-1.0/rotationData.cpp
@@ -26,7 +26,7 @@
 #include "rotationData.h"
 
 #include <qlabel.h>
-#include <qpushbt.h>
+#include <qpushbutton.h>
 #include <qlayout.h>
 
 rotationData::rotationData
only in patch2:
unchanged:
--- qgfe-1.0.orig/pbmOpData.h
+++ qgfe-1.0/pbmOpData.h
@@ -27,8 +27,8 @@
 #define pbmOpData_included
 
 #include <qdialog.h>
-#include <qlined.h>
-#include <qcombo.h>
+#include <qlineedit.h>
+#include <qcombobox.h>
 
 class pbmOpData : public QDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/ticsOpData.h
+++ qgfe-1.0/ticsOpData.h
@@ -26,10 +26,10 @@
 #ifndef ticsOpData_included
 #define ticsOpData_included
 
-#include <qtabdlg.h>
-#include <qlined.h>
-#include <qradiobt.h>
-#include <qcombo.h>
+#include <qtabdialog.h>
+#include <qlineedit.h>
+#include <qradiobutton.h>
+#include <qcombobox.h>
 
 class ticsOpData : public QTabDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/fileLegendTitleData.h
+++ qgfe-1.0/fileLegendTitleData.h
@@ -27,8 +27,8 @@
 #define fileLegendTitleData_included
 
 #include <qdialog.h>
-#include <qlined.h>
-#include <qchkbox.h>
+#include <qlineedit.h>
+#include <qcheckbox.h>
 
 class fileLegendTitleData : public QDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/latexEmtexOpData.h
+++ qgfe-1.0/latexEmtexOpData.h
@@ -27,8 +27,8 @@
 #define latexEmtexOpData_included
 
 #include <qdialog.h>
-#include <qlined.h>
-#include <qcombo.h>
+#include <qlineedit.h>
+#include <qcombobox.h>
 
 class latexEmtexOpData : public QDialog
 {
only in patch2:
unchanged:
--- qgfe-1.0.orig/ticsOpData.cpp
+++ qgfe-1.0/ticsOpData.cpp
@@ -26,8 +26,8 @@
 #include "ticsOpData.h"
 
 #include <qlabel.h>
-#include <qbttngrp.h>
-#include <qradiobt.h>
+#include <qbuttongroup.h>
+#include <qradiobutton.h>
 #include <qlayout.h>
 
 ticsOpData::ticsOpData
only in patch2:
unchanged:
--- qgfe-1.0.orig/fileFilter.cpp
+++ qgfe-1.0/fileFilter.cpp
@@ -10,7 +10,7 @@
 
 #include "fileFilter.h"
 #include <qstring.h>
-#include <qfiledlg.h>
+#include <qfiledialog.h>
 #include <qfiledialog.h>