[Xfce4-commits] <thunar-shares-plugin:master> Fix BUILD to use GIT, and related stuff

[Daniel Morales]

Updating branch refs/heads/master
         to 1a7bda78db8dd8260230d0afaf6e63fe93d32d36 (commit)
       from 0b9b13ed022d390706a0d828874d56e2def73026 (commit)

commit 1a7bda78db8dd8260230d0afaf6e63fe93d32d36
Author: Daniel Morales <daniel at daniel.com.uy>
Date:   Sat Jan 23 23:00:20 2010 -0200

    Fix BUILD to use GIT, and related stuff

 INSTALL         |   17 ++++++++++++++---
 autogen.sh      |   26 ++++----------------------
 configure.in.in |   12 ++++++------
 module.xml      |    2 +-
 4 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/INSTALL b/INSTALL
index 8b82ade..2550dab 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@ Installation Instructions
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
    This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -159,7 +159,7 @@ Particular systems
 CC is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
-     ./configure CC="cc -Ae"
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
@@ -174,6 +174,16 @@ and if that doesn't work, try
 
      ./configure CC="cc -nodtk"
 
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
@@ -189,7 +199,8 @@ type, such as `sun4', or a canonical name which has the form:
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
diff --git a/autogen.sh b/autogen.sh
index 0d52d37..e07db96 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
-#
-# Copyright (c) 2002-2009
-#         The Thunar development team. All rights reserved.
-#
-# Written for Thunar by Benedikt Meurer <benny at xfce.org>.
+#-
+# Copyright (c) 2009-2010 Jannis Pohlmann <jannis at xfce.org>
 #
 
 (type xdt-autogen) >/dev/null 2>&1 || {
@@ -16,22 +13,7 @@ EOF
   exit 1
 }
 
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
-  cat >&2 <<EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
-            or try to checkout again.
-EOF
-  exit 1
-}
-
-# substitute revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
-sed -e "s/@LINGUAS@/${linguas}/g" \
-    -e "s/@REVISION@/${revision}/g" \
-    < "configure.in.in" > "configure.in"
-
-exec xdt-autogen $@
+XDT_AUTOGEN_REQUIRED_VERSION="4.7.0" exec xdt-autogen $@
 
 # vi:set ts=2 sw=2 et ai:
+
diff --git a/configure.in.in b/configure.in.in
index da45075..4825161 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,5 +1,5 @@
 dnl
-dnl Copyright (c) 2009
+dnl Copyright (c) 2009-2010
 dnl         Daniel Morales <daniel at daniel.com.uy>
 dnl
 
@@ -9,14 +9,14 @@ dnl -------------------------------------------------------
 m4_define([tsp_version_major], [0])
 m4_define([tsp_version_minor], [2])
 m4_define([tsp_version_micro], [1])
-m4_define([tsp_version_build], [r at REVISION@])
-m4_define([tsp_version_tag], [svn])
-m4_define([tsp_version], [tsp_version_major().tsp_version_minor().tsp_version_micro()ifelse(tsp_version_tag(),[],[], [-ifelse(tsp_version_tag(), [svn], [tsp_version_tag()-tsp_version_build()], [tsp_version_tag()])])])
+m4_define([tsp_version_build], [@REVISION@])
+m4_define([tsp_version_tag], [git])
+m4_define([tsp_version], [tsp_version_major().tsp_version_minor().tsp_version_micro()ifelse(tsp_version_tag(),[],[], [-ifelse(tsp_version_tag(), [git], [tsp_version_tag()-tsp_version_build()], [tsp_version_tag()])])])
 
 dnl -------------------------------------------------------
-dnl Debugging support for SVN
+dnl Debugging support for GIT
 dnl -------------------------------------------------------
-m4_define([tsp_debug_default], [ifelse(tsp_version_tag(), [svn], [full], [minimum])])
+m4_define([tsp_debug_default], [ifelse(tsp_version_tag(), [git], [full], [minimum])])
 
 dnl -------------------------------------------------------
 dnl Init autoconf
diff --git a/module.xml b/module.xml
index 463bb17..5d54af3 100644
--- a/module.xml
+++ b/module.xml
@@ -6,7 +6,7 @@
          xmlns="http://usefulinc.com/ns/doap#">
 
   <name xml:lang="en">thunar-shares-plugin</name>
-  <shortdesc xml:lang="en">Share folders using Samba from Thunar</shortdesc>
+  <shortdesc xml:lang="en">Quickly share a folder using Samba from Thunar</shortdesc>
   <homepage rdf:resource="http://goodies.xfce.org/projects/thunar-plugins/thunar-shares-plugin"/>
   <mailing-list rdf:resource="http://foo-projects.org/mailman/listinfo/xfce"/>