From 7f7d2295c3132d72db800ad0a6eab054607b57cd Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 1 Dec 2015 20:25:14 +0100
Subject: [PATCH] Update to 6.2

---
 .gitignore                    |  1 +
 engauge-digitizer.appdata.xml | 60 +++++++++++++++++++++--------------
 engauge-digitizer.spec        | 15 +++++----
 sources                       |  2 +-
 4 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index 97b85bd..1c28ab2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /engauge6-77e64e19a4b81e5c8c28a4c51724b7dc328f14c6.zip
 /engauge6-6.0.tar.gz
 /engauge6-6.1.tar.gz
+/engauge6-6.2.tar.gz
diff --git a/engauge-digitizer.appdata.xml b/engauge-digitizer.appdata.xml
index e80a7b7..f1f5f02 100644
--- a/engauge-digitizer.appdata.xml
+++ b/engauge-digitizer.appdata.xml
@@ -4,36 +4,48 @@
   <id type="desktop">engauge-digitizer.desktop</id>
   <metadata_license>CC0</metadata_license>
   <project_license>GPL-2.0+</project_license>
-  <name>Engauge Digitizer</name>
+  <name>Engauge Digitizer 6</name>
   <summary>Convert an image file showing a graph or map into numbers</summary>
   <description>
     <p>
-      This open source digitizing software converts an image file
-      showing a graph or map into numbers. The image file can come
-      from a scanner, digital camera, or a screen-shot. The numbers
-      can be read on the screen and written or copied to a
-      spreadsheet. The process starts with an image file containing a
-      graph or map. The final result is digitized data that can be
-      used by other tools such as spreadsheet and numerical computation
-      programs.
+    Engauge6 is rewritten with Qt5.
+    This digitizing software converts an image file 
+    showing a graph or map, into numbers. 
+    The image file can come from a scanner, digital camera 
+    or screen-shot. The numbers can be read on the screen, 
+    and written or copied to a spreadsheet.
+    The process starts with an image file containing a graph or map. 
+    The final result is digitized data that can be used by other tools 
+    such as Gnumeric.
     </p>
     <p>
-      Here are some real-life examples:
+    New features already added to Engauge6:
+    </p>
+    <p>
+     - Older Engauge files (before version 6) can be loaded
+     - Undo/redo of all operations means recovering from mistakes and experimenting
+       with options is painless
+     - Wizard provides an interactive tutorial to explain the basic steps
+     - Wizard creates a checklist guide to interactively leads user through steps
+       from file import to file export
+     - Cubic spline interpolation between points gives more accurate curves with
+       fewer points
+     - Axes Checker briefly highlights the axes when they are defined or modified,
+       to reveal entry mistakes
+     - Graph coordinates can be specified as date and time value, or as degrees,
+       minutes and seconds
+     - All settings dialogs are resizable so they can be enlarged as necessary to
+       display more information
+     - Import by drag-and-drop
+     - Replacement of Qt3 (which is at its end of life) by Qt5
+     - Much better zooming, with a fill mode that automatically zooms in on image
+       features, and rezooms when the application window is resized
+     - Color picking straight from the original image
+     - Uploadable error report generated when a programming error is encountered,
+       for identifying problems and improving user support
+     - Test suite for regression testing minimizes code breakage
+       as new features are added
     </p>
-    <ul>
-      <li>
-        You need to recreate graphs in some decades-old documents in
-        a modern format
-      </li>
-      <li>
-        You are a graduate student gathering historical data from
-        charts for your project
-      </li>
-      <li>
-        You are a webmaster with visitor statistics charts and you
-        want to do statistical analyses
-      </li>
-    </ul>
   </description>
   <screenshots>
     <screenshot type="default">https://sagitter.fedorapeople.org/engauge-screenshots/engauge-screenshot-map-points.png</screenshot>
diff --git a/engauge-digitizer.spec b/engauge-digitizer.spec
index d154ee6..3b8d406 100644
--- a/engauge-digitizer.spec
+++ b/engauge-digitizer.spec
@@ -4,12 +4,12 @@
 
 Name:    engauge-digitizer
 Summary: Convert graphs or map files into numbers
-Version: 6.1
-Release: 2%{?dist}
+Version: 6.2
+Release: 1%{?dist}
 Group:   Applications/Engineering
 License: GPLv2+
-URL:     http://digitizer.sourceforge.net/
-Source0: https://github.com/markummitchell/engauge6/archive/v%{version}.tar.gz#/engauge6-6.1.tar.gz
+URL:     https://github.com/markummitchell/engauge6
+Source0: https://github.com/markummitchell/engauge6/archive/v%{version}.tar.gz#/engauge6-6.2.tar.gz
 
 ##Patch the test build script to use qmake-qt5 and default Fedora
 ##optimization flags for compilers
@@ -17,8 +17,8 @@ Patch0:  %{name}_fix_test_script.patch
 
 Epoch: 1
 Provides:  %{name} = 1:%{version}-%{release}
-Obsoletes: %{name} < 5.2.11
-Obsoletes: %{name}-transpose < 5.2.11
+Obsoletes: %{name} <= 0:5.2.11
+Obsoletes: %{name}-transpose <= 0:5.2.11
 
 ##Excluding this arch because of missing BR packages (log4cpp)
 %if 0%{?rhel} < 7
@@ -274,6 +274,9 @@ xvfb-run -s "-screen 0 640x480x24" -a  sh -x ./build_and_run_all_tests
 %license LICENSE
 
 %changelog
+* Tue Dec 01 2015 Antonio Trande <sagitter@fedoraproject.org> - 1:6.2-1
+- Update to 6.2
+
 * Sun Nov 08 2015 Antonio Trande <sagitter@fedoraproject.org> - 1:6.1-2
 - Excluding PPC arch on EPEL6 because of missing BR packages (log4cpp)
 
diff --git a/sources b/sources
index 4bb3f67..01180c4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-981d827aa2a0c977137fa2b6ebb3ff21  engauge6-6.1.tar.gz
+26a5b3031c7d4a74382c6a7d7c6e9516  engauge6-6.2.tar.gz