[Xfce4-commits] <xfce4-notes-plugin:master> Update README and bump notes version

[Mike Massonnet]

Updating branch refs/heads/master
         to 00e6df9fcdb4ef3b23dd4eca33d0d94d9a2a18a4 (commit)
       from 60d7702c2802533f80ef2fb5c9b4248c50d8e1f7 (commit)

commit 00e6df9fcdb4ef3b23dd4eca33d0d94d9a2a18a4
Author: Mike Massonnet <mmassonnet at gmail.com>
Date:   Sat Nov 10 22:15:04 2012 +0100

    Update README and bump notes version

 README          |   58 +++++++++++++++++++++++-------------------------------
 autogen.sh      |   21 +-------------------
 configure.ac.in |    8 +++---
 3 files changed, 30 insertions(+), 57 deletions(-)

diff --git a/README b/README
index 00161d8..2fc2e7c 100644
--- a/README
+++ b/README
@@ -5,34 +5,27 @@ The notes plugin provides you a quick way to write down a todo list,
 to paste a piece of code, to leave a note to your friend, or whatever
 else you had like to do with a post'it.
 
-	“ I like to write down a todo list and mark what I did,
-	and once I'm done with the whole job I destroy the note.
+		___Todo_list___
 	
-			___Todo_list___
-		
-		☑ Show an example
-		☑ Show some UTF8 codes
-		☐ Release a new version
-		
-			___Random_thoughts___
-		
-		☐ Add bold/italic/… style
-		☐ Hope this gives you some ideas
-		
-			___UTF8_codes___
-		
-		Type Ctrl+Shift+u in GTK+ applications
-		
-		— 2014		“ 201C
-		” 201D		‣ 2023
-		… 2026		⁂ 2042
-		☐ 2610		☑ 2611
+	☑ Show an example
+	☑ Show some UTF8 codes
+	☐ Release a new version
 	
-	Update 2009-06-06: actually I switched to the application
-	Tasks from the Pimlico project in regard to todo lists.
-	”, Mike
+		___Random_thoughts___
+	
+	☐ Add bold/italic/… style
+	☐ Hope this gives you some ideas
+	
+		___UTF8_codes___
+	
+	Type Ctrl+Shift+u in GTK+ applications
+	
+	— 2014		“ 201C
+	” 201D		‣ 2023
+	… 2026		⁂ 2042
+	☐ 2610		☑ 2611
 
-The notes are saved under $XDG_DATA_HOME/notes/[0].  This way you can
+The notes are saved under $XDG_DATA_HOME/notes/[0]. This way you can
 continue to access your notes remotely, if you have a SSH account for
 example, and fire up your favorite editor ^_~
 
@@ -43,7 +36,7 @@ directory specification[1] and defaults to $HOME/.local/share.
 
 You most probably want to tweak Xfwm4 by disabling the “Skip windows
 that have skip pager or skip taskbar properties set” (cf. Settings >
-Window Manager Tweaks > Cycling).  The reason is that the notes plugin
+Window Manager Tweaks > Cycling). The reason is that the notes plugin
 sets the skip pager hint so it doesn't clutter your pager, but you still
 want to access your notes by cycling to them (Alt+Tab by default).
 
@@ -57,13 +50,12 @@ http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin
  Dependencies
 --------------
 
-* glib 2.14
-* gtk+ 2.14
-* libxfcegui4 4.4.0
-* libxfce4util 4.4.0
-* libxfce4panel 4.4.0
-* xfconf 4.6.0
-* unique 1.0.0
+* glib 2.24
+* gtk+ 2.28 (or 3.2)
+* libxfce4util 4.10
+* libxfce4panel 4.10
+* xfconf 4.10
+* unique 1.0 (with gtk+ 2.28 only)
 
 
  Install
diff --git a/autogen.sh b/autogen.sh
index 5d74889..d568f0d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,12 +1,4 @@
 #!/bin/sh
-# 
-# $Id$
-#
-# Copyright (c) 2002-2006
-#         The Thunar development team. All rights reserved.
-#
-# Written for Thunar by Benedikt Meurer <benny at xfce.org>.
-#
 
 (type xdt-autogen) >/dev/null 2>&1 || {
   cat >&2 <<EOF
@@ -18,17 +10,6 @@ EOF
   exit 1
 }
 
-# substitute revision and linguas
-linguas=`ls po/*.po 2>/dev/null | awk 'BEGIN {FS="[./]"; ORS=" "} {print $2}'`
-if [ -d .git ]; then
-    revision=$(git log --pretty=format:%h -n 1)
-else
-    revision=UNKNOWN
-fi
-sed -e "s/@LINGUAS@/${linguas}/g" \
-    -e "s/@REVISION@/${revision}/g" \
-    < "configure.ac.in" > "configure.ac"
-
+XDT_AUTOGEN_REQUIRED_VERSION="4.7.3" \
 exec xdt-autogen $@
 
-# vi:set ts=2 sw=2 et ai:
diff --git a/configure.ac.in b/configure.ac.in
index b3c74b6..fae6f31 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -2,12 +2,12 @@ dnl
 dnl xfce4-notes-plugin - Notes plugin for the Xfce4 panel
 dnl
 dnl 2003 Jakob Henriksson <b0kaj+dev at lysator.liu.se>
-dnl 2006-2010 Mike Massonnet <mmassonnet at gmail.com>
+dnl 2006-2012 Mike Massonnet <mmassonnet at gmail.com>
 dnl
 
 m4_define([xfce4_notes_plugin_version_major], [1])
-m4_define([xfce4_notes_plugin_version_minor], [7])
-m4_define([xfce4_notes_plugin_version_micro], [8])
+m4_define([xfce4_notes_plugin_version_minor], [8])
+m4_define([xfce4_notes_plugin_version_micro], [0])
 m4_define([xfce4_notes_plugin_version_nano], [])
 m4_define([xfce4_notes_plugin_version_build], [@REVISION@])
 m4_define([xfce4_notes_plugin_version_tag], [git]) # Leave empty for releases
@@ -22,7 +22,7 @@ AC_CANONICAL_TARGET()
 LT_PREREQ([2.2.6])
 LT_INIT([disable-static])
 
-AM_INIT_AUTOMAKE([1.11 dist-bzip2])
+AM_INIT_AUTOMAKE([1.11 dist-bzip2 no-dist-gzip])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE()
 AM_SILENT_RULES([yes])