[pan2] Move ChangeLog -> NEWS & update docs



commit c3679d106df199996e62272150645357111c8cae
Author: Petr Kovar <pknbe volny cz>
Date:   Sun Mar 13 17:13:43 2016 +0100

    Move ChangeLog -> NEWS & update docs

 .gitignore        |    3 ++-
 AUTHORS           |    2 +-
 Makefile.am       |    4 +---
 ChangeLog => NEWS |    0
 README.windows.in |    7 ++++---
 autogen.sh        |    6 +-----
 configure.ac      |   21 +++++++++------------
 7 files changed, 18 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1d5b5f8..9caf952 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ aclocal.m4
 autom4te.cache
 *.bak
 build/
+ChangeLog
 compile
 config.guess
 config.h
@@ -24,7 +25,7 @@ missing
 mkinstalldirs
 pan.desktop
 pan.iss
-pan_git_rev
+pan-git.version
 pan/data/decode-test-cache/Makefile
 pan/icons/pan-pixbufs.h
 pan/icons/pan-pixbufs-internal.h
diff --git a/AUTHORS b/AUTHORS
index ad0752c..5a95a52 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,4 +17,4 @@ ORIGINAL PAN DEVELOPMENT
     Christophe Lambin  <chris rebelbase com>
     Matt Eagleson      <matt rebelbase com>
 
-For a complete list of contributors, see the ChangeLog file.
+For a complete list of contributors, see the NEWS file.
diff --git a/Makefile.am b/Makefile.am
index 0a37d99..6d23e4f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,14 +38,12 @@ MAINTAINERCLEANFILES = \
 EXTRA_DIST = \
  README \
  README.windows \
- README.mingw \
- ChangeLog \
  Pan.ico \
  pan.png \
  $(appdata_in_files) \
  $(desktop_in_files) \
  intltool-extract.in intltool-merge.in intltool-update.in \
- pan_git_rev
+ pan-git.version
 
 icon_DATA = pan.png
 icondir = $(datadir)/pixmaps
diff --git a/ChangeLog b/NEWS
similarity index 100%
rename from ChangeLog
rename to NEWS
diff --git a/README.windows.in b/README.windows.in
index 27fab89..58d2f3a 100644
--- a/README.windows.in
+++ b/README.windows.in
@@ -3,12 +3,13 @@
    has a full list of changes since the previous release.
 
    On Windows, Pan requires GTK @GTK_REQUIRED@ or higher, which can be found at
-   <http://sourceforge.net/userapps/mediawiki/alex-sh/index.php?title=Downloads>.
+   <http://gtk-win.sourceforge.net/>.
 
-   Found a bug?  Have a suggestion?
+   Found a bug? Have a suggestion?
    Send feedback to the pan-users nongnu org mailing list.
 
-   Information on building Pan on Windows can be found in README.mingw.
+   Information on building Pan on Windows can be found at
+   <https://git.gnome.org/browse/pan2/plain/README.mingw>.
 
    See the following page for more information on Pan builds for Windows:
    <http://pan.rebelbase.com/download/>.
diff --git a/autogen.sh b/autogen.sh
index 825e748..9b5bbf6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,11 +4,9 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="Pan"
-
 (test -f $srcdir/Makefile.am && test -d $srcdir/pan) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
+    echo " top-level Pan directory"
     exit 1
 }
 
@@ -18,6 +16,4 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-USE_GNOME2_MACROS=1
-
 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 699588c..e42fdbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_DEFINE(VERSION_REVISION,0,[Revision part of version number])
 AC_DEFINE(VERSION_TITLE,["Chocolate Salty Balls"],[Release Name])
 AC_PREREQ([2.64])
 
-dnl Get git info for pan_git_rev
+dnl Get git info for pan-git.version
 GIT_HASH='$Format:%h$'
 if test '0' \< $GIT_HASH ; then
   GIT_REMOTE=`echo '$Format:%d$' | awk -F , '{print gensub("[[\(\)]]","","g",$NF)}' 2> /dev/null`
@@ -35,19 +35,19 @@ if test ! -z $GIT_HASH; then
   else
     GIT_REV="GIT $GIT_HASH $GIT_REMOTE"
   fi
-    echo $GIT_REV > pan_git_rev
-  elif test -f pan_git_rev; then
-    GIT_REV=`cat pan_git_rev`
+    echo $GIT_REV > pan-git.version
+  elif test -f pan-git.version ; then
+    GIT_REV=`cat pan-git.version`
   else
     GIT_REV="Unknown"
 fi
 
-AC_DEFINE_UNQUOTED([GIT_REV],["$GIT_REV"],[Git branch and hash])
+AC_DEFINE_UNQUOTED([GIT_REV],["$GIT_REV"],[Git hash and remote])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR(pan/general/quark.cc)
 
-AM_INIT_AUTOMAKE([1.11.1 tar-ustar dist-bzip2])
+AM_INIT_AUTOMAKE([1.11.1 check-news tar-ustar dist-bzip2 foreign])
 AM_MAINTAINER_MODE([enable])
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
@@ -127,12 +127,10 @@ if test "x$have_gmime26" = "xyes" ; then
   fi
 fi
 
-
 dnl GtkSpell support
 gtkspell_msg=no
 AC_ARG_WITH(gtkspell, AS_HELP_STRING([--with-gtkspell],[enable GtkSpell support (normally: yes)]), 
[want_gtkspell=$withval], [want_gtkspell=yes])
 
-
 dnl GTK+ 3, GtkSpell 3, and Enchant support
 gtk_msg=no
 AC_ARG_WITH(gtk3, AS_HELP_STRING([--with-gtk3],[enable GTK+ 3 support (normally: no)]), 
[want_gtk3=$withval], [want_gtk3=no])
@@ -172,6 +170,9 @@ else
 
 fi
 
+AC_SUBST(ENCHANT_CFLAGS)
+AC_SUBST(ENCHANT_LIBS)
+
 dnl WebKitGTK+ support
 AC_ARG_WITH(webkit, AS_HELP_STRING([--with-webkit],[enable WebKitGTK+ support (normally: no)]), 
[want_webkit=$withval], [want_webkit=no])
 
@@ -197,9 +198,6 @@ else
   fi
 fi
 
-AC_SUBST(ENCHANT_CFLAGS)
-AC_SUBST(ENCHANT_LIBS)
-
 dnl GnuTLS support
 gnutls_msg=no
 AC_ARG_WITH(gnutls, AS_HELP_STRING([--with-gnutls],[enable GnuTLS support (normally: no)]), 
[want_gnutls=$withval], [want_gnutls=no])
@@ -305,7 +303,6 @@ AC_CONFIG_FILES([Makefile
                  pan/icons/Makefile
                  pan/data-impl/Makefile
                  pan/gui/Makefile])
-dnl              pan/data/decode-test-cache/Makefile
 
 AC_OUTPUT
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]