From a3ee7c653daf8da0956964d642d358a7e29d24f7 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Tue, 9 Jul 2019 19:28:33 +0200 Subject: [PATCH] TestDisk & PhotoRec 7.2-WIP --- compile.sh | 1 + configure.ac | 2 +- copr/cygwin-testdisk.spec | 4 ++-- copr/mingw-testdisk.spec | 4 ++-- linux/testdisk.spec.in | 2 +- sonar-project.properties | 2 +- src/icon_ph.rc | 8 ++++---- src/icon_qph.rc | 8 ++++---- src/icon_tst.rc | 8 ++++---- 9 files changed, 20 insertions(+), 19 deletions(-) diff --git a/compile.sh b/compile.sh index 6249448c..b3c8cf5c 100755 --- a/compile.sh +++ b/compile.sh @@ -36,6 +36,7 @@ else fi case "$crosscompile_target" in "") + VER_LIBEWF= ;; *-msdosdjgpp) VER_LIBNTFS3G="2014.2.15" diff --git a/configure.ac b/configure.ac index f06e7def..388e9529 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.59]) -AC_INIT([testdisk],[7.1],[grenier@cgsecurity.org]) +AC_INIT([testdisk],[7.2-WIP],[grenier@cgsecurity.org]) AC_LANG(C) sinclude(acx_pthread.m4) sinclude(mkdir.m4) diff --git a/copr/cygwin-testdisk.spec b/copr/cygwin-testdisk.spec index ec2dcc09..9e9aa069 100644 --- a/copr/cygwin-testdisk.spec +++ b/copr/cygwin-testdisk.spec @@ -1,10 +1,10 @@ %{?cygwin_package_header} -#% define is_wip 1 +%define is_wip 1 %{?is_wip:%define ver_wip -WIP} Name: cygwin-testdisk -Version: 7.1 +Version: 7.2 Release: 0%{?dist} Summary: TestDisk checks and undeletes partitions, PhotoRec recovers lost files Summary(pl.UTF8): Narzędzie sprawdzające i odzyskujące partycje diff --git a/copr/mingw-testdisk.spec b/copr/mingw-testdisk.spec index b5422e53..2efbacab 100644 --- a/copr/mingw-testdisk.spec +++ b/copr/mingw-testdisk.spec @@ -1,10 +1,10 @@ %{?mingw_package_header} -#% define is_wip 1 +%define is_wip 1 %{?is_wip:%define ver_wip -WIP} Name: mingw-testdisk -Version: 7.1 +Version: 7.2 Release: 0%{?dist} Summary: TestDisk checks and undeletes partitions, PhotoRec recovers lost files Summary(pl.UTF8): Narzędzie sprawdzające i odzyskujące partycje diff --git a/linux/testdisk.spec.in b/linux/testdisk.spec.in index 2424a15f..88825f25 100644 --- a/linux/testdisk.spec.in +++ b/linux/testdisk.spec.in @@ -1,5 +1,5 @@ %define ver_progsreiserfs 0.3.1-rc8 -#% define is_wip 1 +%define is_wip 1 %{?is_wip:%define ver_wip -WIP} Summary: Tool to check and undelete partition, PhotoRec recovers lost files diff --git a/sonar-project.properties b/sonar-project.properties index 1cd2e65e..e5f70a70 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=testdisk # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=testdisk -sonar.projectVersion=7.1 +sonar.projectVersion=7.2 # ===================================================== # Meta-data for the project diff --git a/src/icon_ph.rc b/src/icon_ph.rc index 3f951df6..d65fe736 100644 --- a/src/icon_ph.rc +++ b/src/icon_ph.rc @@ -4,8 +4,8 @@ app ICON DISCARDABLE "../icons/photorec.ico" 1 24 "../win/photorec_win.exe.manifest" 1 VERSIONINFO -FILEVERSION 7, 1, 0, 0 -PRODUCTVERSION 7, 1, 0, 0 +FILEVERSION 7, 2, 0, 0 +PRODUCTVERSION 7, 2, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 FILETYPE 0x1 @@ -20,8 +20,8 @@ BEGIN VALUE "InternalName", "PhotoRec" VALUE "OriginalFilename", "photorec_win.exe" VALUE "Comments", "Signature based file recovery utility" - VALUE "FileVersion", "7.1" - VALUE "ProductVersion", "7.1" + VALUE "FileVersion", "7.2" + VALUE "ProductVersion", "7.2" VALUE "LegalCopyright", "Copyright (C) 1998-2019 Christophe GRENIER, et al." END END diff --git a/src/icon_qph.rc b/src/icon_qph.rc index 35619271..057ff522 100644 --- a/src/icon_qph.rc +++ b/src/icon_qph.rc @@ -4,8 +4,8 @@ app ICON DISCARDABLE "../icons/photorec.ico" 1 24 "../win/qphotorec_win.exe.manifest" 1 VERSIONINFO -FILEVERSION 7, 1, 0, 0 -PRODUCTVERSION 7, 1, 0, 0 +FILEVERSION 7, 2, 0, 0 +PRODUCTVERSION 7, 2, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 FILETYPE 0x1 @@ -20,8 +20,8 @@ BEGIN VALUE "InternalName", "PhotoRec" VALUE "OriginalFilename", "qphotorec_win.exe" VALUE "Comments", "Signature based file recovery utility" - VALUE "FileVersion", "7.1" - VALUE "ProductVersion", "7.1" + VALUE "FileVersion", "7.2" + VALUE "ProductVersion", "7.2" VALUE "LegalCopyright", "Copyright (C) 1998-2019 Christophe GRENIER, et al." END END diff --git a/src/icon_tst.rc b/src/icon_tst.rc index 41482da9..63d5da33 100644 --- a/src/icon_tst.rc +++ b/src/icon_tst.rc @@ -4,8 +4,8 @@ app ICON DISCARDABLE "../icons/testdisk.ico" 1 24 MOVEABLE PURE "../win/testdisk_win.exe.manifest" 1 VERSIONINFO -FILEVERSION 7, 1, 0, 0 -PRODUCTVERSION 7, 1, 0, 0 +FILEVERSION 7, 2, 0, 0 +PRODUCTVERSION 7, 2, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 FILETYPE 0x1 @@ -20,8 +20,8 @@ BEGIN VALUE "InternalName", "TestDisk" VALUE "OriginalFilename", "testdisk_win.exe" VALUE "Comments", "Partition and file recovery utility" - VALUE "FileVersion", "7.1" - VALUE "ProductVersion", "7.1" + VALUE "FileVersion", "7.2" + VALUE "ProductVersion", "7.2" VALUE "LegalCopyright", "Copyright (C) 1998-2019 Christophe GRENIER, et al." END END