Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt-fsarchiver for openSUSE:Factory checked in at 2021-05-23 23:30:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt-fsarchiver (Old) and /work/SRC/openSUSE:Factory/.qt-fsarchiver.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt-fsarchiver" Sun May 23 23:30:52 2021 rev:5 rq:895079 version:0.8.5_22 Changes: -------- --- /work/SRC/openSUSE:Factory/qt-fsarchiver/qt-fsarchiver.changes 2021-05-19 17:49:52.361410704 +0200 +++ /work/SRC/openSUSE:Factory/.qt-fsarchiver.new.2988/qt-fsarchiver.changes 2021-05-23 23:31:04.496620228 +0200 @@ -1,0 +2,8 @@ +Sun May 23 18:01:31 UTC 2021 - [email protected] + +- Updated TAR balls without version change to final upstream ones. +- Drop 0001-Allow-setting-custom-DOCDIR.patch and + 0001-Use-standard-paths-and-allow-setting-custom-DOCDIR.patch + as they are now in upstream TAR balls. + +------------------------------------------------------------------- Old: ---- 0001-Allow-setting-custom-DOCDIR.patch 0001-Use-standard-paths-and-allow-setting-custom-DOCDIR.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt-fsarchiver.spec ++++++ --- /var/tmp/diff_new_pack.2rJ8Og/_old 2021-05-23 23:31:04.972618253 +0200 +++ /var/tmp/diff_new_pack.2rJ8Og/_new 2021-05-23 23:31:04.972618253 +0200 @@ -27,10 +27,6 @@ URL: https://sourceforge.net/projects/qt-fsarchiver Source0: %{URL}/files/source/%{name}/%{name}-%{hyphen_version}.tar.gz Source1: %{URL}/files/source/%{name}-terminal/%{name}-terminal-%{terminal_version}.tar.gz -# PATCH-FEATURE-UPSTREAM 0001-Use-standard-paths-and-allow-setting-custom-DOCDIR.patch -- https://github.com/DieterBaum/qt-fsarchiver/pull/12 -Patch0: 0001-Use-standard-paths-and-allow-setting-custom-DOCDIR.patch -# PATCH-FEATURE-UPSTREAM 0001-Allow-setting-custom-DOCDIR.patch -- https://github.com/DieterBaum/qt-fsarchiver-terminal/pull/2 -Patch1: 0001-Allow-setting-custom-DOCDIR.patch BuildRequires: e2fsprogs-devel BuildRequires: libattr-devel BuildRequires: libgcrypt-devel @@ -70,17 +66,11 @@ %prep %setup -q -n %{name} %setup -T -D -a 1 -n %{name} -# Part of %%patch0 but binary diffs are not supported -ln src/images/harddrive2.png src/images/qt-fsarchiver.png -%patch0 -p2 -%patch1 -p1 rm -vf .qmake.stash rm -vf translations/*.qm # Fix file permissions find doc -type f -exec chmod -x \{\} + -# Remove prebuilt binaries -rm -vf src/sbin/{ccguess,de} %build export CFLAGS="%{optflags} -fcommon" ++++++ qt-fsarchiver-0.8.5-22.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-fsarchiver/.qmake.stash new/qt-fsarchiver/.qmake.stash --- old/qt-fsarchiver/.qmake.stash 1970-01-01 01:00:00.000000000 +0100 +++ new/qt-fsarchiver/.qmake.stash 2021-05-22 19:11:32.000000000 +0200 @@ -0,0 +1,24 @@ +QMAKE_CXX.INCDIRS = \ + /usr/include/c++/7 \ + /usr/include/x86_64-linux-gnu/c++/7 \ + /usr/include/c++/7/backward \ + /usr/lib/gcc/x86_64-linux-gnu/7/include \ + /usr/local/include \ + /usr/lib/gcc/x86_64-linux-gnu/7/include-fixed \ + /usr/include/x86_64-linux-gnu \ + /usr/include +QMAKE_CXX.LIBDIRS = \ + /usr/lib/gcc/x86_64-linux-gnu/7 \ + /usr/lib/x86_64-linux-gnu \ + /usr/lib \ + /lib/x86_64-linux-gnu \ + /lib +QMAKE_CXX.QT_COMPILER_STDCXX = 201402L +QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 +QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 5 +QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0 +QMAKE_CXX.COMPILER_MACROS = \ + QT_COMPILER_STDCXX \ + QMAKE_GCC_MAJOR_VERSION \ + QMAKE_GCC_MINOR_VERSION \ + QMAKE_GCC_PATCH_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-fsarchiver/doc/Aenderungen new/qt-fsarchiver/doc/Aenderungen --- old/qt-fsarchiver/doc/Aenderungen 2021-05-06 14:34:14.000000000 +0200 +++ new/qt-fsarchiver/doc/Aenderungen 2021-05-22 10:33:17.000000000 +0200 @@ -2,7 +2,9 @@ * qt-fsarchiver: Grafische Oberfl??che f??r fsarchiver [http://wiki.ubuntuusers.de/qt-fsarchiver] ================================================================================================== * qt-fsarchiver-0.8.5-22 8. Mai 2021. - - kleien Korrekturen. + - Dateien findsmb-qt, ccguess und de wurden aus dem Tarball entfernt. + - findsmb ersetzt findsmb-qt. + - Der Pfad von ccrypt ist ge??ndert zu /usr/bin. * qt-fsarchiver-0.8.5-21 8. Dezember 2020. - Sicherung der gpt-Partitionstabelle wird gepr??ft. * qt-fsarchiver-0.8.5-20 27. November 2020. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-fsarchiver/doc/Change new/qt-fsarchiver/doc/Change --- old/qt-fsarchiver/doc/Change 2021-05-06 14:35:14.000000000 +0200 +++ new/qt-fsarchiver/doc/Change 2021-05-22 10:32:47.000000000 +0200 @@ -2,7 +2,10 @@ * qt-fsarchiver: Graphical interface for fsarchiver fsarchiver [http://wiki.ubuntuusers.de/qt-fsarchiver] =========================================================================================================== * qt-fsarchiver-0.8.5-22 May 8, 2021. - - Small corrections. + - drop /usr/sbin/{findsmb-qt,ccguess,de} from tarball + - use standard findsmb directly instead of findsmb-qt + - drop use-system-ccrypt.patch (now upstream use /usr/bin/ccrypt) + - update translations * qt-fsarchiver-0.8.5-21 December 8, 2020. - Backup of the gpt partition table is checked. * qt-fsarchiver-0.8.5-20 November 27, 2020. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-fsarchiver/doc/Liesmich new/qt-fsarchiver/doc/Liesmich --- old/qt-fsarchiver/doc/Liesmich 2021-05-07 10:57:15.000000000 +0200 +++ new/qt-fsarchiver/doc/Liesmich 2021-05-22 10:24:48.000000000 +0200 @@ -2,7 +2,7 @@ qt-fsarchiver: Sichern und Wiederherstellen von Partitionen Debian, Ubuntu, Linux-Mint, Suse und Fedora. [http://wiki.ubuntuusers.de/qt-fsarchiver] ===================================================================================================================================================== -Copyright (C) 2008-2020 Francois Dupoux und Dieter Baum. All rights reserved. +Copyright (C) 2008-2021 Francois Dupoux und Dieter Baum. All rights reserved. Kopieren der Dateien, mit und ohne ??nderung ist erlaubt. Der Code ist ohne jegliche Garantie. Die Benutzung erfolgt auf eigene Gefahr. Francois Dupoux entwickelte das Basisprogramm fsarchiver, Hihin Ruslan hat das Programm verbessert und nach Englisch und Russisch ??bersetzt. Michael R. Lawrence und sein Team ??bersetzte nach Spanisch und Italienisch, Zhenneng Li ??bersetzte nach Chinesisch, Dieter Baum erstellte die GUI. @@ -20,7 +20,7 @@ Installation des Programms aus den Quelldateien: F??r die Installation von den Programmen qt-fsarchiver und qt-fsarchiver-terminal m??ssen die f??r fsarchiver notwendigen Abh??ngigkeiten und die qt5-Entwicklungsumgebung installiert werden. Dies erreichen Sie, bei auf Debian aufbauenden Distributionen, mit folgendem Befehl: -sudo apt install libzip-dev libbz2-dev liblzma-dev liblzo2-2 liblzo2-dev libgcrypt20-dev e2fslibs-dev libblkid-dev libattr1-dev build-essential qt5-default qtbase5-dev qttools5-dev-tools btrfs-tools gdisk sshfs sshpass nmap samba nfs-kernel-server nfs-common smbclient liblz4-dev libzstd-dev jfsutils xfsprogs sudo +sudo apt install libzip-dev libbz2-dev liblzma-dev liblzo2-2 liblzo2-dev libgcrypt20-dev e2fslibs-dev libblkid-dev libattr1-dev build-essential qt5-default qtbase5-dev qttools5-dev-tools btrfs-tools gdisk sshfs sshpass nmap samba nfs-kernel-server nfs-common smbclient liblz4-dev libzstd-dev jfsutils xfsprogs sudo ccrypt Bei einigen Distributionen muss die Datei /etc/sudoers mit diesen Zeilen erg??mzt werden: username ALL=(ALL) ALL @@ -29,11 +29,11 @@ Anstatt libzst1-dev wird in einigen Systemen libzst-dev installiert. btrfs-tools wird neuerdings durch btrfs-progs ersetzt. Der obige Befehl ist entsprechend anzupassen. -In Suse werden die Abh??ngigkeiten mit Root-Rechten (su -l) mit diesem Befehl installiert: zypper in libQt5Core5 libqt5-qttools libqt5-qtbase-devel make libzip-devel libbz2-devel xz-devel lzo-devel libgcrypt-devel e2fsprogs-devel libblkid-devel libattr-devel btrfsprogs gdisk sshfs nmap samba nfs-kernel-server xfsprogs liblz4-1 liblz4-devel libzstd1 libzstd-devel zlib-devel jfsutils net-tools-deprecated +In Suse werden die Abh??ngigkeiten mit Root-Rechten (su -l) mit diesem Befehl installiert: zypper in libQt5Core5 libqt5-qttools libqt5-qtbase-devel make libzip-devel libbz2-devel xz-devel lzo-devel libgcrypt-devel e2fsprogs-devel libblkid-devel libattr-devel btrfsprogs gdisk sshfs nmap samba nfs-kernel-server xfsprogs liblz4-1 liblz4-devel libzstd1 libzstd-devel zlib-devel jfsutils net-tools-deprecated ccrypt Wenn Sie ssh (secureshell) f??r den Zugriff auf weitere Rechner im Netzwerk nutzen wollen, m??ssen Sie noch sshpass individuell installieren. F??r das Speichern ??ber das Netzwerk m??ssen Sie noch installieren: net-tools-deprecated -In Fedora werden die Abh??ngigkeiten mit Root-Rechten (su -l) mit diesem Befehl installiert: dnf install gcc gcc-c++ zlib-devel bzip2-devel xz-devel lzo-devel libgcrypt-devel e2fsprogs-devel libblkid-devel libattr-devel qt5-qtbase qt5-qtbase-devel gdisk sshfs sshpass nmap samba samba-client nfs-utils lz4-devel libzstd-devel jfsutils xfsprogs +In Fedora werden die Abh??ngigkeiten mit Root-Rechten (su -l) mit diesem Befehl installiert: dnf install gcc gcc-c++ zlib-devel bzip2-devel xz-devel lzo-devel libgcrypt-devel e2fsprogs-devel libblkid-devel libattr-devel qt5-qtbase qt5-qtbase-devel gdisk sshfs sshpass nmap samba samba-client nfs-utils lz4-devel libzstd-devel jfsutils xfsprogs ccrypt Bei einem 64-bit System m??ssen Sie zus??tzlich lrelease installieren: dnf install qt5-linguist. Bei Fedora 30 muss noch make nachinstalliert werden. 32-bit Systeme werden nicht mehr unterst??tzt. @@ -44,7 +44,6 @@ Genauso installieren Sie das Programm qt-fsarchiver-terminal. Wechseln Sie in einem Terminal in den Ordner, indem der Quellcode von qt-fsarchiver-terminal vorhanden ist. Wiederholen Sie die obigen Terminalbefehle. - Qt-fsarchiver funktioniert nur, wenn qt-fsarchiver-terminal installiert wurde. Die Version von qt-fsarchiver-terminal wird ??berpr??ft. Bei falscher Version wird das Programm abgebrochen. Installation des Programms aus den DEB-Paketen: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-fsarchiver/doc/Readme new/qt-fsarchiver/doc/Readme --- old/qt-fsarchiver/doc/Readme 2020-01-26 22:06:11.000000000 +0100 +++ new/qt-fsarchiver/doc/Readme 2021-05-22 10:25:16.000000000 +0200 @@ -2,7 +2,7 @@ qt-fsarchiver: Back up and restore partitions for Debian,Ubuntu, Linux-Mint, Suse and Fedora [http://wiki.ubuntuusers.de/qt-fsarchiver] ========================================================================================================================================= -Copyright (C) 2008-2020 Francois Dupoux and Dieter Baum. All rights reserved. +Copyright (C) 2008-2021 Francois Dupoux and Dieter Baum. All rights reserved. Copying the files is permitted with or without modifications. The code is without warranty of any kind. Use at your own risk. Fran??ois Dupoux has developed the basic program fsarchiver, Hihin Ruslan has improved the program and tranlate to englisch und russian. Michael R. Lawrence and his team translated to Spanish and Italian, Zhenneng Li translated to Chinese, Dieter Baum created the GUI and the code to use the GUI. @@ -21,7 +21,7 @@ Installing the program from the source files: To install qt-fsarchiver and qt-fsarchiver-terminal the necessary dependencies for fsarchiver and the qt5 development environment must be installed. Of Debian based distributions: This is the command: -sudo apt install libzip-dev libbz2-dev liblzma-dev liblzo2-2 liblzo2-dev libgcrypt20-dev e2fslibs-dev libblkid-dev libattr1-dev build-essential qtbase5-dev qttools5-dev-tools qt5-default btrfs-tools gdisk sshfs sshpass nmap samba nfs-kernel-server nfs-common smbclient liblz4-dev libzstd1-dev jfsutils xfsprogs sudo +sudo apt install libzip-dev libbz2-dev liblzma-dev liblzo2-2 liblzo2-dev libgcrypt20-dev e2fslibs-dev libblkid-dev libattr1-dev build-essential qtbase5-dev qttools5-dev-tools qt5-default btrfs-tools gdisk sshfs sshpass nmap samba nfs-kernel-server nfs-common smbclient liblz4-dev libzstd1-dev jfsutils xfsprogs sudo ccrypt For some distributions, the /etc/sudoers file must be completed with these lines: username ALL=(ALL) ALL @@ -30,10 +30,10 @@ Instead of libzst1-dev, libzst-dev is installed in some systems. btrfs-tools has recently been replaced by btrfs-progs. The above command has to be adapted accordingly. -The command for Suse: (you must be an administrator su -l) zypper in zypper in qt5-default libQt5Core5 libqt5-qttools libqt5-qtbase-devel make libzip-devel libbz2-devel xz-devel lzo-devel libgcrypt-devel e2fsprogs-devel libblkid-devel libattr-devel btrfsprogs gdisk sshfs nmap samba nfs-kernel-server xfsprogs liblz4-1 liblz4-devel libzstd1 libzstd-devel zlib-devel jfsutils +The command for Suse: (you must be an administrator su -l) zypper in zypper in qt5-default libQt5Core5 libqt5-qttools libqt5-qtbase-devel make libzip-devel libbz2-devel xz-devel lzo-devel libgcrypt-devel e2fsprogs-devel libblkid-devel libattr-devel btrfsprogs gdisk sshfs nmap samba nfs-kernel-server xfsprogs liblz4-1 liblz4-devel libzstd1 libzstd-devel zlib-devel jfsutils ccrypt If you use ssh (secure shell) want to access other computers in the network, you still need to install individually sshpass. -The command for Fedora: (you must be an administrator su -l) dnf install gcc gcc-c++ zlib-devel bzip2-devel xz-devel lzo-devel libgcrypt-devel e2fsprogs-devel libblkid-devel libattr-devel qt5-default qt5-qtbase qt5-qtbase-devel gdisk sshfs sshpass nmap samba samba-client nfs-utils lz4-devel libzstd-devel jfsutils xfsprogs +The command for Fedora: (you must be an administrator su -l) dnf install gcc gcc-c++ zlib-devel bzip2-devel xz-devel lzo-devel libgcrypt-devel e2fsprogs-devel libblkid-devel libattr-devel qt5-default qt5-qtbase qt5-qtbase-devel gdisk sshfs sshpass nmap samba samba-client nfs-utils lz4-devel libzstd-devel jfsutils xfsprogs ccrypt For a 64-bit system, you must also install lrelease: dnf install qt5-linguist.x86-64. With Fediora30 you still have to install make. 32-bit systems are no longer supported. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-fsarchiver/qt-fsarchiver.pro new/qt-fsarchiver/qt-fsarchiver.pro --- old/qt-fsarchiver/qt-fsarchiver.pro 2020-01-26 22:06:11.000000000 +0100 +++ new/qt-fsarchiver/qt-fsarchiver.pro 2021-05-22 11:15:51.000000000 +0200 @@ -11,8 +11,8 @@ QT += widgets gui core DEFINES += HAVE_CONFIG_H _REENTRANT _FILE_OFFSET_BITS=64 _LARGEFILE64_SOURCE _GNU_SOURCE -INCLUDEPATH += . src /usr/include/ext2fs /usr/include/et /usr/include/e2p /usr/include/blkid /usr/include/uuid -LIBS += -L/usr/lib -lQt5Gui -lQt5Core -lpthread -lrt -llzma -lext2fs -lcom_err -le2p -lblkid -luuid -lz -llz4 -lbz2 -llzo2 -lgcrypt -lgpg-error -lzstd +INCLUDEPATH += . src /usr/include/ext2fs /usr/include/et /usr/include/e2p /usr/include/blkid /usr/include/uuid /usr/include/ccrypt +LIBS += -L/usr/lib -lQt5Gui -lQt5Core -lpthread -lrt -llzma -lext2fs -lcom_err -le2p -lblkid -luuid -lz -llz4 -lbz2 -llzo2 -lgcrypt -lgpg-error -lzstd OBJECTS_DIR = build MOC_DIR = build UI_DIR = build @@ -53,17 +53,20 @@ src/thread.cpp \ src/treeview.cpp RESOURCES += src/icon.qrc +isEmpty(DOC_DIR) { + DOC_DIR = /usr/share/doc/qt-fsarchiver +} # install target.path = /usr/sbin - icon.files = src/images/harddrive2.png - icon.path = /usr/share/app-install/icons + icon.files = src/images/qt-fsarchiver.png + icon.path = /usr/share/pixmaps autostart.files = starter/qt-fsarchiver.desktop autostart.path = /usr/share/applications - doc.files = doc - doc.path = /usr/share/doc/qt-fsarchiver/doc - smbfind.files = src/sbin - smbfind.path = /usr -TRANSLATIONS += translations/qt-fsarchiver_ar.ts \ + doc.files = doc/* + doc.path = $$DOC_DIR + findsmb.files = src/sbin + findsmb.path = /usr + TRANSLATIONS += translations/qt-fsarchiver_ar.ts \ translations/qt-fsarchiver_ca.ts \ translations/qt-fsarchiver_ch.ts \ translations/qt-fsarchiver_cs.ts \ @@ -141,4 +144,4 @@ translations/qt-fsarchiver_ur.qm \ translations/qt-fsarchiver_uk.qm translations.path = /usr/share/qt5/translations -INSTALLS = target icon autostart translations doc smbfind +INSTALLS = target icon autostart translations doc findsmb Binary files old/qt-fsarchiver/src/images/harddrive2.png and new/qt-fsarchiver/src/images/harddrive2.png differ Binary files old/qt-fsarchiver/src/images/qt-fsarchiver.png and new/qt-fsarchiver/src/images/qt-fsarchiver.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-fsarchiver/src/mainWindow.cpp new/qt-fsarchiver/src/mainWindow.cpp --- old/qt-fsarchiver/src/mainWindow.cpp 2021-05-09 23:33:50.000000000 +0200 +++ new/qt-fsarchiver/src/mainWindow.cpp 2021-05-23 09:36:37.000000000 +0200 @@ -284,9 +284,8 @@ found = version.indexOf("-"); version.replace(found, 1, ""); int version_ = version.toInt(); - if (version1 == "") - version1 ="0.8.5-10"; - if (!file1.exists() or 8510 > version_) + version1 ="0.8.5-22"; + if (!file1.exists() or 8522 > version_) { QMessageBox::about(this,tr("Note", "Hinweis"),tr("qt-fsarchiver-terminal must be updated to version: ", "qt-fsarchiver-terminal muss auf die Version aktualisiert werden: ") + version1 + tr(" The program is terminated.", " Das Programm wird beendet")); return; @@ -294,10 +293,8 @@ // Pr??fen ob qt-fsarchiver ge??ndert wurde. Eventuell wurde eine echo Befehl zum Auslesen des Passwortes eingef??gt. // Bei Ubuntu, Debian, Mint und Suse ist die erste Zeile #!/bin/bash. // Bei Fedora ist die erste Zeile #!/usr/bin/bash. Daher die verschiedenen Ergebnisse. - // Bei Suse src.rpm wurde /usr/sbin/ccrypt in /usr/bin/ccrypt ge??ndert. QString vergleich = md5sum("/usr/sbin/qt-fsarchiver.sh"); - if(vergleich == "774d122e34bc59324de343a0e3d34737" or vergleich == "8806d1e963de5c8d0735b0449c333aca" or vergleich == "b36c2e4bea020b822ff7bb6bf807a2ff") - ; + if(vergleich == "b36c2e4bea020b822ff7bb6bf807a2ff" or vergleich == "21187f7deeddb004c0f59a2a6da9068b"); else { QMessageBox::about(this,tr("Note", "Hinweis"),tr("Security warning: A file has been modified. The program is terminated. Please reinstall qt-fsarchiver.", "Sicherheitswarnung: Eine Datei wurde ge??ndert. Das Programm wird beendet. Bitte installieren Sie qt-fsarchiver neu")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-fsarchiver/starter/qt-fsarchiver.desktop new/qt-fsarchiver/starter/qt-fsarchiver.desktop --- old/qt-fsarchiver/starter/qt-fsarchiver.desktop 2020-01-31 21:17:01.000000000 +0100 +++ new/qt-fsarchiver/starter/qt-fsarchiver.desktop 2021-05-21 17:43:38.000000000 +0200 @@ -1,10 +1,11 @@ [Desktop Entry] Name=qt-fsarchiver Name[de_DE]=qt-fsarchiver -Comment=Qt GUI for fsarchiver +GenericName=Qt GUI for fsarchiver +GenericName[lt]=Qt fsarchiver Exec=/usr/sbin/qt-fsarchiver -Icon=/usr/share/app-install/icons/harddrive2.png +Icon=qt-fsarchiver Terminal=false Type=Application StartupNotify=true - +Categories=System;Filesystem; ++++++ qt-fsarchiver-terminal-0.8.5-22.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-fsarchiver-terminal/.qmake.stash new/qt-fsarchiver-terminal/.qmake.stash --- old/qt-fsarchiver-terminal/.qmake.stash 1970-01-01 01:00:00.000000000 +0100 +++ new/qt-fsarchiver-terminal/.qmake.stash 2021-05-22 19:13:04.000000000 +0200 @@ -0,0 +1,24 @@ +QMAKE_CXX.INCDIRS = \ + /usr/include/c++/7 \ + /usr/include/x86_64-linux-gnu/c++/7 \ + /usr/include/c++/7/backward \ + /usr/lib/gcc/x86_64-linux-gnu/7/include \ + /usr/local/include \ + /usr/lib/gcc/x86_64-linux-gnu/7/include-fixed \ + /usr/include/x86_64-linux-gnu \ + /usr/include +QMAKE_CXX.LIBDIRS = \ + /usr/lib/gcc/x86_64-linux-gnu/7 \ + /usr/lib/x86_64-linux-gnu \ + /usr/lib \ + /lib/x86_64-linux-gnu \ + /lib +QMAKE_CXX.QT_COMPILER_STDCXX = 201402L +QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 +QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 5 +QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0 +QMAKE_CXX.COMPILER_MACROS = \ + QT_COMPILER_STDCXX \ + QMAKE_GCC_MAJOR_VERSION \ + QMAKE_GCC_MINOR_VERSION \ + QMAKE_GCC_PATCH_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-fsarchiver-terminal/doc/Aenderungen new/qt-fsarchiver-terminal/doc/Aenderungen --- old/qt-fsarchiver-terminal/doc/Aenderungen 2020-10-24 17:14:34.000000000 +0200 +++ new/qt-fsarchiver-terminal/doc/Aenderungen 2021-05-22 10:20:16.000000000 +0200 @@ -1,6 +1,8 @@ ========================================================================================================= * qt-fsarchiver-terminal: Terminal Programm f??r qt-fsarchiver [http://wiki.ubuntuusers.de/qt-fsarchiver] ========================================================================================================= +* qt-fsarchiverterminal-0.8.5-22 22. Mai 2021. + - Pfad der doc-Dateien ge??ndert. * qt-fsarchiverterminal-0.8.5-12 3. November 2019. - kleine Fehlerkorrektur * qt-fsarchiverterminal-0.8.5-11 1. November 2019. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-fsarchiver-terminal/doc/Change new/qt-fsarchiver-terminal/doc/Change --- old/qt-fsarchiver-terminal/doc/Change 2020-10-24 17:14:34.000000000 +0200 +++ new/qt-fsarchiver-terminal/doc/Change 2021-05-22 10:22:01.000000000 +0200 @@ -1,6 +1,8 @@ =========================================================================================================== * qt-fsarchiver: Terminalprogram for qt-fsarchiver fsarchiver [http://wiki.ubuntuusers.de/qt-fsarchiver] =========================================================================================================== +* qt-fsarchiverterminal-0.8.5-22 May 22, 2021 + - Path of doc files changed. * qt-fsarchiverterminal-0.8.5-12 3. November 2019. - little error correction. * qt-fsarchiverterminal-0.8.5-11 1. November 2019. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-fsarchiver-terminal/doc/Liesmich new/qt-fsarchiver-terminal/doc/Liesmich --- old/qt-fsarchiver-terminal/doc/Liesmich 2019-12-28 17:30:04.000000000 +0100 +++ new/qt-fsarchiver-terminal/doc/Liesmich 2021-05-22 10:23:41.000000000 +0200 @@ -2,7 +2,7 @@ qt-fsarchiverterminal: Sichern und Wiederherstellen von Partitionen Debian, Ubuntu, Linux-Mint, Suse und Fedora. [http://wiki.ubuntuusers.de/qt-fsarchiver] ===================================================================================================================================================== -Copyright (C) 2008-2020 Francois Dupoux und Dieter Baum. All rights reserved. +Copyright (C) 2008-2021 Francois Dupoux und Dieter Baum. All rights reserved. Kopieren der Dateien, mit und ohne ??nderung ist erlaubt. Der Code ist ohne jegliche Garantie. Die Benutzung erfolgt auf eigene Gefahr. Francois Dupoux entwickelte das Basisprogramm fsarchiver, Hihin Ruslan hat das Programm verbessert und nach Englisch und Russisch ??bersetzt. Michael R. Lawrence und sein Team ??bersetzte nach Spanisch und Italienisch, Zhenneng Li ??bersetzte nach Chinesisch, Dieter Baum erstellte die GUI. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-fsarchiver-terminal/doc/Readme new/qt-fsarchiver-terminal/doc/Readme --- old/qt-fsarchiver-terminal/doc/Readme 2019-12-28 17:30:17.000000000 +0100 +++ new/qt-fsarchiver-terminal/doc/Readme 2021-05-22 10:24:06.000000000 +0200 @@ -2,7 +2,7 @@ qt-fsarchiver-terminal: Back up and restore partitions for Debian,Ubuntu, Linux-Mint, Suse and Fedora [http://wiki.ubuntuusers.de/qt-fsarchiver] ========================================================================================================================================= -Copyright (C) 2008-2020 Francois Dupoux and Dieter Baum. All rights reserved. +Copyright (C) 2008-2021 Francois Dupoux and Dieter Baum. All rights reserved. Copying the files is permitted with or without modifications. The code is without warranty of any kind. Use at your own risk. Fran??ois Dupoux has developed the basic program fsarchiver, Hihin Ruslan has improved the program and tranlate to englisch und russian. Michael R. Lawrence and his team translated to Spanish and Italian, Zhenneng Li translated to Chinese, Dieter Baum created the GUI and the code to use the GUI. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-fsarchiver-terminal/qt-fsarchiver-terminal.pro new/qt-fsarchiver-terminal/qt-fsarchiver-terminal.pro --- old/qt-fsarchiver-terminal/qt-fsarchiver-terminal.pro 2018-09-21 22:41:41.000000000 +0200 +++ new/qt-fsarchiver-terminal/qt-fsarchiver-terminal.pro 2021-05-21 18:54:05.000000000 +0200 @@ -102,7 +102,11 @@ src/thread_comp.c \ src/writebuf.c # install + isEmpty(DOC_DIR) { + DOC_DIR = /usr/share/doc/qt-fsarchiver-terminal + } + target.path = /usr/sbin - doc.files = doc - doc.path = /usr/share/doc/qt-fsarchiver-terminal/doc -INSTALLS = target doc + doc.files = doc/* + doc.path = $$DOC_DIR + INSTALLS = target doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-fsarchiver-terminal/src/main.cc new/qt-fsarchiver-terminal/src/main.cc --- old/qt-fsarchiver-terminal/src/main.cc 2020-10-24 16:38:21.000000000 +0200 +++ new/qt-fsarchiver-terminal/src/main.cc 2021-05-22 10:17:19.000000000 +0200 @@ -43,7 +43,7 @@ aufruf = argv[2]; if (homepath == "version") { - qDebug() << "Version: 0.8.5-18"; + qDebug() << "Version: 0.8.5-22"; return 1; } if (aufruf == "version") @@ -52,7 +52,7 @@ QFile file(filename); file.open(QIODevice::WriteOnly); QDataStream out(&file); - out << QString("0.8.5-18"); + out << QString("0.8.5-22"); file.close(); return 1; }
