Sync with trunk.

git-svn-id: file:///svnroot/renrot/branches/andy@580 fe2816f4-e837-0410-b10a-f608c9d244a1

3 files changed, 20 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index ab81c3a..15805c4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+* 1.1 *
+
+The dying is less informative now, when verbosity level set to zero. All
+messages which are not related to the 'info' or 'process' category will be put
+to the standard error stream.
+
+
+* 1.1rc3 *
+
+The option --aggr-virtual-directory was removed, you should use
+--aggr-directory instead. Now the '#' (hash) symbol could be used at the begin
+of given color value in a command line. The tree for an aggregation is created
+automatically. Documentation has been updated accordingly.
+
+
 * 1.1rc2 *
 
 Serveral bugs were fixed in the aggregation framework. The hardcoded path
diff --git a/renrot b/renrot
index a45d47c..f8647a0 100755
--- a/renrot
+++ b/renrot
@@ -29,7 +29,7 @@ my $mem_trouble_stub = " "x4_000_000; undef $mem_trouble_stub;
 
 # Versioning
 my @svnrevision = split(/ /, '$Revision$');
-our $VERSION = '1.1rc2';          # the version of this script
+our $VERSION = '1.1';             # the version of this script
 our $REVISION = $svnrevision[1];  # revision
 
 my $maxVerbosity = 4;                                         # our max verbosity level (internal)
@@ -2583,7 +2583,7 @@ Do not do anything, only print would have been done.
 
 =item B<-g> or B<--generate-thumb>
 
-Generation and writing ThumbnailImage tag. The original value of the ThumbnailImage 
+Generation and writing ThumbnailImage tag. The original value of the ThumbnailImage
 tag remains intact. To rewrite it you need to delete it first (look exiftool examples).
 
 =item B<--use-ipc>, B<--no-use-ipc>
diff --git a/renrot.spec b/renrot.spec
index 4debf4b..35f0dda 100644
--- a/renrot.spec
+++ b/renrot.spec
@@ -1,9 +1,9 @@
-%define rcver	rc2
-%define dotrc	.rc2
+%define rcver	%{nil}
+%define dotrc	%{nil}
 
 Name:		renrot
 Version:	1.1
-Release:	0.2%{?dotrc}%{?dist}
+Release:	1%{?dotrc}%{?dist}
 License:	Artistic 2.0
 Group:		Applications/Multimedia
 Summary:	A program to rename and rotate files according to EXIF tags