[med-svn] [libgtextutils] 48/83: Prepare 0.7-rc1 for a proper release.

[Charles Plessy]

This is an automated email from the git hooks/post-receive script.

plessy pushed a commit to branch debian/unstable
in repository libgtextutils.

commit 4f566ba605384dd805e08913dd5d871bf89eb8de
Author: Assaf Gordon <assafgordon at gmail.com>
Date:   Sun Nov 3 22:58:23 2013 +0200

    Prepare 0.7-rc1 for a proper release.
    
    Import long-due fixes from 0.6.1 and others.
---
 .gitignore                   | 30 ++++++++++++++++++++++++++++++
 INSTALL                      |  1 -
 Makefile.am                  |  2 ++
 README                       |  5 +++++
 configure.ac                 |  5 ++---
 gtextutils-0.3.pc.in         | 10 ----------
 gtextutils-0.4.pc.in         | 10 ----------
 reconf                       |  3 +++
 src/gtextutils/pipe_fitter.c |  2 +-
 tests/Makefile.am            |  2 +-
 10 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5d84460
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,30 @@
+*~
+.*.swp
+INSTALL
+Makefile
+Makefile.in
+*/Makefile
+*/Makefile.in
+*/.deps/*
+src/gtextutils/.deps/
+src/gtextutils/.libs/
+src/gtextutils/*.o
+src/gtextutils/*.la
+src/gtextutils/*.lo
+
+aclocal.m4
+autom4te.cache/*
+config.h
+config.h.in
+config.log
+config.status
+config/*
+configure
+gtextutils.pc
+libtool
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+stamp-h1
diff --git a/INSTALL b/INSTALL
deleted file mode 120000
index 5bb6e7b..0000000
--- a/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/automake-1.10/INSTALL
\ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index ef61465..e9fc73a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,5 +11,7 @@
 EXTRA_DIST = reconf configure
 SUBDIRS = m4 src doc tests
 
+ACLOCAL_AMFLAGS = -I m4
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gtextutils.pc
diff --git a/README b/README
new file mode 100644
index 0000000..0626bb5
--- /dev/null
+++ b/README
@@ -0,0 +1,5 @@
+Welcome to Gordon-Text_utils-Library.
+
+Gordon-Text_utils-Library is free software. Please see the file COPYING for details.
+For documentation, please see the files in the doc subdirectory.
+For building and installation instructions please see the INSTALL file.
diff --git a/configure.ac b/configure.ac
index feb787b..f85325c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,8 +9,8 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 AC_INIT([Gordon-Text_utils-Library],
-        [0.6],
-        [A. Gordon gordon at cshl.edu],
+        [0.7-rc1],
+        [A. Gordon assafgordon at gmail.com],
         [libgtextutils])
 
 AC_CONFIG_AUX_DIR(config)
@@ -78,7 +78,6 @@ AC_SUBST(LIBGTU_AGE)
 
 AC_CONFIG_FILES([
    Makefile
-   README
    doc/Makefile
    m4/Makefile
    src/Makefile
diff --git a/gtextutils-0.3.pc.in b/gtextutils-0.3.pc.in
deleted file mode 100644
index 53b2ce6..0000000
--- a/gtextutils-0.3.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: gtextutils
-Description: Gordon's text-utility classes
-Version: @VERSION@
-Libs: -L${libdir} -lgtextutils-0.3
-Cflags: -I${includedir}/gtextutils-0.3
diff --git a/gtextutils-0.4.pc.in b/gtextutils-0.4.pc.in
deleted file mode 100644
index 73d81e6..0000000
--- a/gtextutils-0.4.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: gtextutils
-Description: Gordon's text-utility classes
-Version: @VERSION@
-Libs: -L${libdir} -lgtextutils- at VERSION@
-Cflags: -I${includedir}/gtextutils- at VERSION@
diff --git a/reconf b/reconf
index cc5968f..f14504e 100755
--- a/reconf
+++ b/reconf
@@ -10,6 +10,9 @@
 
 #!/bin/sh
 rm -f config.cache
+mkdir -p config
+echo "- libtoolize."
+libtoolize -i
 echo "- aclocal."
 aclocal -I m4
 echo "- autoconf."
diff --git a/src/gtextutils/pipe_fitter.c b/src/gtextutils/pipe_fitter.c
index ddc379f..de701fc 100644
--- a/src/gtextutils/pipe_fitter.c
+++ b/src/gtextutils/pipe_fitter.c
@@ -32,7 +32,7 @@ int pipe_close ( int fd, pid_t pid )
 	int exit_code;
 
 	i = close(fd);
-	if ( fd == -1 ) 
+	if ( i == -1 ) 
 		err(1,"close(in pipe_close) failed");
 
 	p = waitpid(pid, &status, 0);
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 263019f..9b783c9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -34,7 +34,7 @@ check_PROGRAMS = test_container_join \
 TESTS = $(check_PROGRAMS)
 
 LDADD = $(top_srcdir)/src/gtextutils/libgtextutils.la
-INCLUDES = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 test_container_join_SOURCES = test_container_join.cpp tests_assertion.h
 test_natural_sort_SOURCES = test_natural_sort.cpp tests_assertion.h

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/libgtextutils.git