Version 0.5.1

Trying to simplify distribution a bit

10 files changed, 75 insertions, 58 deletions

diff --git a/ChangeLog b/ChangeLog
index 937d198..d58da24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-12-10  Juan Cespedes <cespedes@debian.org>
 
+	* Release version 0.5.1
+
+2008-12-10  Juan Cespedes <cespedes@debian.org>
+
 	* Patches from Anderson Lizardo and Riku Voipio:
 	  + Add generic support for arm targets
 	  + Save funtion arguments on arm
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..81e0a2d
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,27 @@
+How to build ltrace from source
+-------------------------------
+
+To get the latest version from GIT:
+
+	git clone git://git.debian.org/git/collab-maint/ltrace.git
+
+To create a distribution (ltrace-<version>.tar.gz):
+
+	./mkdist
+
+To compile from repository:
+
+	aclocal
+	autoheader
+	autoconf
+	./configure
+	make
+
+To compile from distribution:
+
+	./configure
+	make
+
+To build debian/control (to create Debian package):
+
+	debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
diff --git a/Makefile.in b/Makefile.in
index b29b066..4f96fee 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,10 +5,6 @@
 #OS		:= $(shell uname -s)
 OS		:= @HOST_OS@
 
-ifeq ($(OS),linux-gnueabi)
-OS = linux-gnu
-endif
-
 TOPDIR		= $(shell pwd)
 
 prefix		= @prefix@
@@ -54,28 +50,13 @@ clean:		clean-deja
 		rm -f *~ *.bak a.out core KK
 
 distclean:	clean
-		rm -f autogen.sh config.cache config.status config.log config.h Makefile configure.scan
+		rm -f config.cache config.status config.log config.h Makefile configure.scan
 		rm -rf autom4te.cache
 		cd testsuite; make distclean
 
 realclean:	distclean
 		rm configure config.h.in
 
-dist:		clean
-		(if [ ! -d .svn ]; then echo "Sorry, can't make dist if not  a SVN checkout"; exit 1; fi ; \
-		rm -rf dist ; mkdir dist ; cd dist ; \
-		svn export ../ ltrace-$(VERSION); \
-		cd ltrace-$(VERSION); \
-                ./autogen.sh; \
-                rm autogen.sh; \
-		rm -rf autom4te.cache; \
-                cd ..; \
-                tar cfz ltrace-$(VERSION).tar.gz ./ltrace-$(VERSION); \
-                mv ltrace-$(VERSION).tar.gz ../; \
-                cd ..; \
-                rm -rf dist; \
-                echo "complete: ltrace-$(VERSION).tar.gz" )
-
 install:	ltrace
 		$(INSTALL_DIR) $(DESTDIR)$(bindir) $(DESTDIR)$(docdir) $(DESTDIR)$(mandir)/man1
 		$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)
diff --git a/TODO b/TODO
index 78f9ac1..c6fe014 100644
--- a/TODO
+++ b/TODO
@@ -9,11 +9,9 @@
 * Improve -e/-x options (regexp?)
 * Improve -l option
 * Improve C++ name demangling
-* Display different argument types:
-  + how to display execl...?
-  + format+: for scanf()...: display args as pointers, and imply `+' for args
+* Display different argument types
 * Update /etc/ltrace.conf
-* More architectures: sparc64...
+* More architectures, cleaner way to port
 * More operating systems (solaris?)
 * Option -I (inter-library calls)
 * Modify ARGTYPE_STRING[0-5] types so that they not stop displaying chars when '\0' is encountered
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index a2d33c8..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#copied by ianw from ipbench (originally from oprofile 18-11-2003)
-
-# run to generate needed files not in CVS
-
-# NB: if you run this file with AUTOMAKE, AUTOCONF, etc. environment
-# variables set, you *must* run "configure" with the same variables
-# set. this is because "configure" will embed the values of these variables
-# into the generated Makefiles, as @AUTOMAKE@, @AUTOCONF@ etc. and it will
-# trigger regeneration of configuration state using those programs when any
-# of Makefile.am etc. change.
-
-run() {
-	echo "Running $1 ..."
-	$1
-}
-
-set -e
-
-ACLOCAL=${ACLOCAL:-aclocal}
-AUTOHEADER=${AUTOHEADER:-autoheader}
-AUTOCONF=${AUTOCONF:-autoconf}
-
-if test -n "$1"; then
-	echo "autogen.sh doesn't take any options" >&2
-	exit 1
-fi
-
-run "$ACLOCAL"
-run "$AUTOHEADER"
-run "$AUTOCONF"
diff --git a/configure.ac b/configure.ac
index 38e0243..71e5b80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,14 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.57)
-AC_INIT(ltrace,0.5,[ltrace-devel <ltrace-devel@alioth.debian.org>])
+AC_INIT(ltrace,0.5.1,[ltrace-devel <ltrace-devel@alioth.debian.org>])
 AC_CONFIG_SRCDIR(ltrace.c)
 AC_CONFIG_HEADER(config.h)
 
 dnl Check host system type
 AC_CANONICAL_HOST
+case "$host_os" in
+  linux-gnu*) host_os=linux-gnu
+esac
 HOST_OS="$host_os"
 AC_SUBST(HOST_OS)
 
@@ -49,7 +52,7 @@ for path in /usr/include/elfutils /usr/local/include/elfutils \
 done
 
 AC_CHECK_HEADER(gelf.h,,AC_MSG_ERROR([***** gelf.h not found *****]))
-		 
+
 AC_CHECK_LIB(elf,gelf_getdyn)
 
 ac_cv_have_iquote=no
diff --git a/debian/changelog b/debian/changelog
index 8441019..d11033b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ltrace (0.5.1-1) unstable; urgency=low
+
+  * New upstream release, fixing many bugs
+    (thanks to Petr Machata, Luis Machado...)
+  * Acknowledged NMU (Closes: Bug#463023)
+  * Update Standards-Version (3.8.0), no changes
+
+ -- Juan Cespedes <cespedes@debian.org>  Wed, 10 Dec 2008 18:41:20 +0100
+
 ltrace (0.5-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control.in b/debian/control.in
index f23fb59..2c3b2ff 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Juan Cespedes <cespedes@debian.org>
 Uploaders: Ian Wienand <ianw@debian.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
 Build-Depends: @cdbs@, binutils-dev, libelfg0-dev
 
 Package: ltrace
diff --git a/debian/copyright b/debian/copyright
index 234a80d..61766a2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,8 @@
 This is the Debian GNU/Linux's prepackaged version of the
 Dynamic Library Tracer ``ltrace''.
 
+It was downloaded from http://www.ltrace.org/
+
 
 Copyrights
 ----------
diff --git a/mkdist b/mkdist
new file mode 100755
index 0000000..b8be850
--- /dev/null
+++ b/mkdist
@@ -0,0 +1,24 @@
+#!/bin/sh -e
+
+# Create ltrace-${version}.tar.gz from a GIT repository
+
+if [ ! -d .git -o ! -f ltrace.c ]
+then
+  echo "This must be called inside a ltrace GIT repository" 1>&2
+  exit 1
+fi
+
+VERSION=$( grep ^AC_INIT configure.ac | awk -F, '{print $2}' )
+
+echo Building ltrace-$VERSION.tar.gz ...
+rm -rf ltrace-$VERSION
+git clone ./ ltrace-$VERSION >/dev/null
+cd ltrace-$VERSION
+aclocal
+autoheader
+autoconf
+cd ..
+GZIP=-9 tar --exclude .git -zcf ltrace-$VERSION.tar.gz ltrace-$VERSION
+rm -rf ltrace-$VERSION
+echo Done.
+