From 87302f2e645483d04347c36e9b0481693edaf011 Mon Sep 17 00:00:00 2001
From: LtWorf <LtWorf@014f5005-505e-4b48-8d0a-63407b615a7c>
Date: Fri, 4 Mar 2011 12:38:00 +0000
Subject: [PATCH] - Change from 0.12 to version 1.0 - Correct wrong float type
 in ratings.csv - Small correction in manpages - More complete debian
 changelog

git-svn-id: http://galileo.dmi.unict.it/svn/relational/trunk@275 014f5005-505e-4b48-8d0a-63407b615a7c
---
 CHANGELOG           | 2 +-
 debian/changelog    | 6 ++++--
 relational-cli.1    | 2 +-
 relational.1        | 2 +-
 relational_gui.py   | 2 +-
 samples/ratings.csv | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a5ed7b0..84754b1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-0.12
+1.0
 - Removed encoding from .desktop file (was deprecated)
 - Added manpage for relational-cli
 - Internally uses set instead of lists to describe relation's content
diff --git a/debian/changelog b/debian/changelog
index 06a3e74..246ccae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-relational (0.12-1) unstable; urgency=low
+relational (1.0-1) unstable; urgency=low
 
   * New upstream release
+  * Merged relational-cli upstream, dropped debian patch
+  * Using relational_gui.py for both relational and relational-cli packages
 
- -- Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it>  Fri, 04 Mar 2011 13:15:06 +0100
+ -- Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it>  Fri, 04 Mar 2011 13:28:51 +0100
 
 relational (0.11-2) unstable; urgency=low
 
diff --git a/relational-cli.1 b/relational-cli.1
index 0595caf..0c461b4 100644
--- a/relational-cli.1
+++ b/relational-cli.1
@@ -21,7 +21,7 @@ Show version information.
 Shows help.
 
 .IP "\fB-q\fP
-Using the Qt4 GUI.
+Uses the Qt4 GUI.
 
 .IP "\fB-r\fP
 Uses the readline UI (default).
diff --git a/relational.1 b/relational.1
index b10c69e..cd8a1be 100644
--- a/relational.1
+++ b/relational.1
@@ -21,7 +21,7 @@ Show version information.
 Shows help.
 
 .IP "\fB-q\fP
-Using the Qt4 GUI (default).
+Uses the Qt4 GUI (default).
 
 .IP "\fB-r\fP
 Uses the readline UI.
diff --git a/relational_gui.py b/relational_gui.py
index 42484da..6dc126d 100755
--- a/relational_gui.py
+++ b/relational_gui.py
@@ -24,7 +24,7 @@ import os
 import os.path
 import getopt
 from relational import relation, parser
-version="0.12"
+version="1.0"
 
 
 def printver(exit=True):
diff --git a/samples/ratings.csv b/samples/ratings.csv
index 39fd952..adf2169 100644
--- a/samples/ratings.csv
+++ b/samples/ratings.csv
@@ -5,5 +5,5 @@ id,rating
 3,3.3
 4,9.1
 5,4.4
-6,5.1.1
+6,5.1
 7,4.9