diff -Nru tla-1.3.5+dfsg/debian/changelog tla-1.3.5+dfsg/debian/changelog --- tla-1.3.5+dfsg/debian/changelog 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/changelog 2011-11-14 15:30:09.000000000 +0000 @@ -1,9 +1,25 @@ -tla (1.3.5+dfsg-16ubuntu1) oneiric; urgency=low +tla (1.3.5+dfsg-18) unstable; urgency=low - * Add missing includes to avoid warnings about implicitly converted - return values. LP: #832877. + * QA upload + * change to "3.0 (quilt)" format + * add copyright holders and license for embedded copy of + libneon (0.24.7) to debian/copyright + * support build-arch and build-indep + * debhelper compatibility up to 7 + * use dpkg-buildflags - -- Matthias Klose Tue, 13 Sep 2011 01:27:39 +0200 + -- Bernhard R. Link Mon, 14 Nov 2011 15:48:43 +0100 + +tla (1.3.5+dfsg-17) unstable; urgency=low + + * QA upload. + * Although `tla add' is valid, updated the help to indicate that + `tla add-id' is the preferred command (Closes: #317128) + * Fix malformed comment in tla-doc/handbook/index.html + (Closes: #321887) + * Add missing #include to tmp-files.c, closes Ubuntu bug #832877 + + -- Tim Gokcen Thu, 08 Sep 2011 15:10:09 -0400 tla (1.3.5+dfsg-16) unstable; urgency=low diff -Nru tla-1.3.5+dfsg/debian/compat tla-1.3.5+dfsg/debian/compat --- tla-1.3.5+dfsg/debian/compat 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/compat 2011-11-14 15:30:09.000000000 +0000 @@ -1 +1 @@ -5 +7 diff -Nru tla-1.3.5+dfsg/debian/configupdate tla-1.3.5+dfsg/debian/configupdate --- tla-1.3.5+dfsg/debian/configupdate 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/configupdate 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -#!/bin/bash - -# Original written and copyright by Adam Majer -# -# This file is 100% public domain. Use it for whatever you wish. -# - -function update_configs() -{ - [ -x /usr/share/misc/config.${1} ] || return 0 - LATEST_VERSION=`/usr/share/misc/config.${1} -t` - UPDATE_FILES=`find -type f | grep "/config\.${1}\$"` - - echo "Latest version of config.${1} file is ${LATEST_VERSION}" - for i in $UPDATE_FILES; do - head -1 "$i" | grep -q '#!.*\/bin\/sh' - EXE=$? - if [ -x "$i" ] || [ $EXE -eq 0 ]; then - V=`sh -e "${i}" -t` - echo "Updating ${V} version file at ${i}" - if [[ "$LATEST_VERSION" > "$V" ]]; then - mv "${i}" "${i}.orig_update" - ln -s /usr/share/misc/config.$1 "${i}" - else - echo "WARNING: Debian version of config.${1} is older than this package's upstream." - fi - fi - done - return 0 -} - - -function reset_configs() -{ - UPDATED_FILES=`find -type l | grep "/config\.${1}\$"` - for i in ${UPDATED_FILES}; do - if [ -e "${i}.orig_update" ]; then - mv "${i}.orig_update" "${i}" - fi - done - return 0 -} - - -# Check if we are updating, reseting or whatever -case "$1" in - update) - update_configs sub - update_configs guess - ;; - reset) - reset_configs sub - reset_configs guess - ;; - *) - echo "The only allowed parameters are 'update' or 'reset'" - exit 2; - ;; -esac - -exit 0 diff -Nru tla-1.3.5+dfsg/debian/control tla-1.3.5+dfsg/debian/control --- tla-1.3.5+dfsg/debian/control 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/control 2011-11-14 15:30:09.000000000 +0000 @@ -2,8 +2,8 @@ Section: vcs Priority: optional Maintainer: Debian QA Group -Build-Depends: debhelper (>= 5), dpatch, autotools-dev, time, libexpat1-dev -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 7), autotools-dev, time, libexpat1-dev +Standards-Version: 3.9.2 Package: tla Architecture: any diff -Nru tla-1.3.5+dfsg/debian/copyright tla-1.3.5+dfsg/debian/copyright --- tla-1.3.5+dfsg/debian/copyright 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/copyright 2011-11-14 15:30:09.000000000 +0000 @@ -41,6 +41,28 @@ The file Unihan.txt contains older and inconsistent Terms of Use. That language is overridden by these terms. +License (embedded copy of libneon 0.24.7): + + Copyright (C) 1999-2003 Joe Orton + Portions are: + Copyright (C) 1999-2000 Tommi Komulainen + Copyright (C) 1999-2000 Peter Boos + Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc. + License (everything else): Copyright (C) 2001-2006 Tom Lord @@ -60,4 +82,4 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU General Public License -can be found in /usr/share/common-licenses/GPL file. +can be found in /usr/share/common-licenses/GPL-2 file. diff -Nru tla-1.3.5+dfsg/debian/patches/0001-Fixes-segmentation-fault-on-ia64.patch tla-1.3.5+dfsg/debian/patches/0001-Fixes-segmentation-fault-on-ia64.patch --- tla-1.3.5+dfsg/debian/patches/0001-Fixes-segmentation-fault-on-ia64.patch 1970-01-01 00:00:00.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/0001-Fixes-segmentation-fault-on-ia64.patch 2011-11-14 15:30:55.000000000 +0000 @@ -0,0 +1,21 @@ +From: Martín Ferrari +Date: Mon, 28 Aug 2006 07:02:15 +0200 +Subject: Fixes segmentation fault on ia64. + +Bug-Debian: http://bugs.debian.org/382465 +--- + src/tla/libarch/invent.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/tla/libarch/invent.c b/src/tla/libarch/invent.c +index 077d776..168e04c 100644 +--- a/src/tla/libarch/invent.c ++++ b/src/tla/libarch/invent.c +@@ -16,6 +16,7 @@ + #include "hackerlab/arrays/ar.h" + #include "hackerlab/fs/file-names.h" + #include "hackerlab/vu/safe.h" ++#include "tla/libarch/cmdutils.h" + #include "tla/libarch/inode-sig.h" + #include "tla/libarch/inv-ids.h" + #include "tla/libarch/invent.h" diff -Nru tla-1.3.5+dfsg/debian/patches/0002-Fixes-alignment-errors-on-hppa-and-sparc.patch tla-1.3.5+dfsg/debian/patches/0002-Fixes-alignment-errors-on-hppa-and-sparc.patch --- tla-1.3.5+dfsg/debian/patches/0002-Fixes-alignment-errors-on-hppa-and-sparc.patch 1970-01-01 00:00:00.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/0002-Fixes-alignment-errors-on-hppa-and-sparc.patch 2011-11-14 15:30:59.000000000 +0000 @@ -0,0 +1,98 @@ +From: Martín Ferrari +Date: Mon, 28 Aug 2006 07:06:06 +0200 +Subject: Fixes alignment errors on hppa and sparc. + +Bug-Debian: http://bugs.debian.org/382465 +--- + src/hackerlab/hash/sha1.c | 25 ++++++++++++++++--------- + 1 files changed, 16 insertions(+), 9 deletions(-) + +diff --git a/src/hackerlab/hash/sha1.c b/src/hackerlab/hash/sha1.c +index 47a7352..00556d4 100644 +--- a/src/hackerlab/hash/sha1.c ++++ b/src/hackerlab/hash/sha1.c +@@ -39,11 +39,11 @@ struct sha1_context + + t_uint32 total[2]; + t_uint32 buflen; +- t_uchar buffer[128]; ++ t_uchar buffer[128] __attribute__((aligned(4))); + }; + + static void +-sha1_process_blocks (const void *buffer, size_t len, sha1_context_t ctx); ++sha1_process_blocks (const t_uchar *buffer, size_t len, sha1_context_t ctx); + + #if MACHINE_IS_BIGENDIAN + # define NOTSWAP(n) (n) +@@ -124,7 +124,7 @@ sha1_scan (sha1_context_t ctx, const t_uchar *buffer, size_t len) + { + /* When we already have some bits in our internal buffer concatenate + both inputs first. */ +- if (ctx->buflen != 0) ++ while (len > 0) + { + size_t left_over = ctx->buflen; + size_t add = 128 - left_over > len ? len : 128 - left_over; +@@ -147,14 +147,17 @@ sha1_scan (sha1_context_t ctx, const t_uchar *buffer, size_t len) + } + + /* Process available complete blocks. */ ++ /* + if (len >= 64) + { + sha1_process_blocks (buffer, len & ~63, ctx); + buffer = (const t_uchar *) buffer + (len & ~63); + len &= 63; + } ++ */ + + /* Move remaining bytes in internal buffer. */ ++ /* + if (len > 0) + { + size_t left_over = ctx->buflen; +@@ -169,6 +172,7 @@ sha1_scan (sha1_context_t ctx, const t_uchar *buffer, size_t len) + } + ctx->buflen = left_over; + } ++ */ + } + + +@@ -191,6 +195,8 @@ sha1_final (t_uchar *result, sha1_context_t ctx) + /* Take yet unprocessed bytes into account. */ + t_uint32 bytes = ctx->buflen; + size_t pad; ++ /* Temporary array for solving alignment issues */ ++ t_uint32 tmp[5]; + + /* Now count remaining bytes. */ + ctx->total[0] += bytes; +@@ -208,11 +214,12 @@ sha1_final (t_uchar *result, sha1_context_t ctx) + /* Process last bytes. */ + sha1_process_blocks (ctx->buffer, bytes + pad + 8, ctx); + +- ((t_uint32 *) result)[0] = NOTSWAP (ctx->current_sha1.A); +- ((t_uint32 *) result)[1] = NOTSWAP (ctx->current_sha1.B); +- ((t_uint32 *) result)[2] = NOTSWAP (ctx->current_sha1.C); +- ((t_uint32 *) result)[3] = NOTSWAP (ctx->current_sha1.D); +- ((t_uint32 *) result)[4] = NOTSWAP (ctx->current_sha1.E); ++ tmp[0] = NOTSWAP (ctx->current_sha1.A); ++ tmp[1] = NOTSWAP (ctx->current_sha1.B); ++ tmp[2] = NOTSWAP (ctx->current_sha1.C); ++ tmp[3] = NOTSWAP (ctx->current_sha1.D); ++ tmp[4] = NOTSWAP (ctx->current_sha1.E); ++ mem_cpy (result, tmp, 20); + + sha1_context_reset (ctx); + } +@@ -329,7 +336,7 @@ sha1_from_ascii (sha1_t * out, t_uchar const * ascii) + It is assumed that LEN % 64 == 0. + Most of this code comes from GnuPG's cipher/sha1.c. */ + static void +-sha1_process_blocks (const void *buffer, size_t len, sha1_context_t ctx) ++sha1_process_blocks (const t_uchar *buffer, size_t len, sha1_context_t ctx) + { + const t_uint32 *words = buffer; + size_t nwords = len / sizeof (t_uint32); diff -Nru tla-1.3.5+dfsg/debian/patches/0003-fix-bashisms.patch tla-1.3.5+dfsg/debian/patches/0003-fix-bashisms.patch --- tla-1.3.5+dfsg/debian/patches/0003-fix-bashisms.patch 1970-01-01 00:00:00.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/0003-fix-bashisms.patch 2011-11-14 15:31:02.000000000 +0000 @@ -0,0 +1,22 @@ +From: Barry deFreese +Date: Fri, 7 Mar 2008 10:40:50 -0500 +Subject: fix bashisms + +use printf instead of echo -e. +--- + src/tla/tests/test-import.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/tla/tests/test-import.sh b/src/tla/tests/test-import.sh +index 8682fb1..0847c00 100644 +--- a/src/tla/tests/test-import.sh ++++ b/src/tla/tests/test-import.sh +@@ -24,7 +24,7 @@ tla init-tree --nested jane@example.com--2003/hello-world--mainline--1.0 + tla id-tagging-method explicit + tla add-id hello-world.c README + tla import -L 'initial import' +-test "$(tla categories -A jane@example.com--2003)" = "$(echo -e cat\\ncow\\nhello-world)" ++test "$(tla categories -A jane@example.com--2003)" = "$(printf cat\\ncow\\nhello-world\\n)" + test "$(tla branches jane@example.com--2003/hello-world)" = "hello-world--mainline" + test "$(tla versions jane@example.com--2003/hello-world--mainline)" = "hello-world--mainline--1.0" + test -d $(tla whereis-archive jane@example.com--2003)/hello-world/hello-world--mainline/hello-world--mainline--1.0/base-0 diff -Nru tla-1.3.5+dfsg/debian/patches/0004-fix-machine-alignment.patch tla-1.3.5+dfsg/debian/patches/0004-fix-machine-alignment.patch --- tla-1.3.5+dfsg/debian/patches/0004-fix-machine-alignment.patch 1970-01-01 00:00:00.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/0004-fix-machine-alignment.patch 2011-11-14 15:31:04.000000000 +0000 @@ -0,0 +1,26 @@ +From: Adam Majer +Date: Wed, 23 Jul 2008 11:26:32 -0500 +Subject: fix machine alignment + +As per upstream comments in https://bugzilla.redhat.com/show_bug.cgi?id=182742 +the invariant test should be removed. + +Bug-Debian: http://bugs.debian.org/491373 +Bug: https://bugzilla.redhat.com/show_bug.cgi?id=182742 +--- + src/hackerlab/tests/arrays-tests/unit-ar.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/hackerlab/tests/arrays-tests/unit-ar.c b/src/hackerlab/tests/arrays-tests/unit-ar.c +index f08ed99..982e052 100644 +--- a/src/hackerlab/tests/arrays-tests/unit-ar.c ++++ b/src/hackerlab/tests/arrays-tests/unit-ar.c +@@ -50,7 +50,7 @@ static void + check_array (size_t size, unsigned long * ar) + { + int x; +- invariant (0 == ((unsigned long)ar & (MACHINE_ALIGNMENT - 1))); ++ /* invariant (0 == ((unsigned long)ar & (MACHINE_ALIGNMENT - 1))); */ + invariant (size == ar_size ((void *)ar, lim_use_must_malloc, sizeof (*ar))); + for (x = 0; x < size; ++x) + invariant (ar[x] == HASH_INDEX (x)); diff -Nru tla-1.3.5+dfsg/debian/patches/0005-disable-builtin-expat.patch tla-1.3.5+dfsg/debian/patches/0005-disable-builtin-expat.patch --- tla-1.3.5+dfsg/debian/patches/0005-disable-builtin-expat.patch 1970-01-01 00:00:00.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/0005-disable-builtin-expat.patch 2011-11-14 15:31:05.000000000 +0000 @@ -0,0 +1,61 @@ +From: Sylvain Beucler +Date: Mon, 14 Dec 2009 17:27:55 +0100 +Subject: disable builtin expat + +Fixes CVE-2009-3560 and CVE-2009-3720 denial-of-services + +Bug-Debian: http://bugs.debian.org/560940 +--- + src/libneon/Makefile.in | 2 +- + src/libneon/src/Makefile.in | 6 +++--- + src/tla/tla/Makefile.in | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/libneon/Makefile.in b/src/libneon/Makefile.in +index f05110d..da89ddb 100644 +--- a/src/libneon/Makefile.in ++++ b/src/libneon/Makefile.in +@@ -33,7 +33,7 @@ VPATH = @srcdir@ + + @SET_MAKE@ + +-LDFLAGS = -L. -L$(top_builddir)/../expat @LDFLAGS@ ++LDFLAGS = -L. @LDFLAGS@ + LIBS = @LIBS@ + CC = @CC@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/src/libneon/src/Makefile.in b/src/libneon/src/Makefile.in +index e3c61e5..aff1fca 100644 +--- a/src/libneon/src/Makefile.in ++++ b/src/libneon/src/Makefile.in +@@ -25,14 +25,14 @@ LIBTOOL = @LIBTOOL@ + + # Flags + CPPFLAGS = @DEFS@ @CPPFLAGS@ +-CFLAGS = @CFLAGS@ -I$(top_builddir) -I$(top_srcdir)/../expat/lib @NEON_CFLAGS@ +-LDFLAGS = -L$(top_builddir)/../expat @LDFLAGS@ ++CFLAGS = @CFLAGS@ -I$(top_builddir) @NEON_CFLAGS@ ++LDFLAGS = @LDFLAGS@ + NEON_LINK_FLAGS = @NEON_LINK_FLAGS@ + # Note: don't substitute @LIBS@ in here; during a bundled + # build of this directory, @LIBS@ may include -lneon. + LIBS = @NEON_LIBS@ @NEON_LTLIBS@ + +-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -I$(top_builddir) -I$(top_srcdir)/../expat/lib @NEON_CFLAGS@ ++COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -I$(top_builddir) @NEON_CFLAGS@ + LINK = $(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) + + NEON_BASEOBJS = ne_request.@NEON_OBJEXT@ ne_session.@NEON_OBJEXT@ \ +diff --git a/src/tla/tla/Makefile.in b/src/tla/tla/Makefile.in +index 13a761a..8c66e2e 100644 +--- a/src/tla/tla/Makefile.in ++++ b/src/tla/tla/Makefile.in +@@ -21,7 +21,7 @@ Programs: $(programs) + endif + + $(programs):%$(cfg__exec_suffix):%.o $(thelib) $(filter-out -L%, $(filter-out -l%, $(libs))) +- $(SHELL) $(objroot)/libneon/libtool --mode=link $(CC) $(CFLAGS) -L../../expat -o $@ $< $(thelib) $(libs) ++ $(SHELL) $(objroot)/libneon/libtool --mode=link $(CC) $(CFLAGS) -o $@ $< $(thelib) $(libs) + + clean: clean-prog + diff -Nru tla-1.3.5+dfsg/debian/patches/0006-tar-preserve.patch tla-1.3.5+dfsg/debian/patches/0006-tar-preserve.patch --- tla-1.3.5+dfsg/debian/patches/0006-tar-preserve.patch 1970-01-01 00:00:00.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/0006-tar-preserve.patch 2011-11-14 15:31:06.000000000 +0000 @@ -0,0 +1,26 @@ +From: Tim Gokcen +Date: Sat, 12 Nov 2011 10:34:41 +0100 +Subject: tar preserve + +Don't use deprecated tar --preserve option +Instead, use --preserve-permissions & --preserve-order + +Bug-Debian: http://bugs.debian.org/605048 +--- + src/tla/libarch/archive.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/src/tla/libarch/archive.c b/src/tla/libarch/archive.c +index ac3d580..7e699f7 100644 +--- a/src/tla/libarch/archive.c ++++ b/src/tla/libarch/archive.c +@@ -1114,7 +1114,8 @@ invoke_tar_extract (int * pid_ret) + + *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = cfg__gnu_tar; + *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "-m"; +- *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "--preserve"; ++ *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "--preserve-permissions"; ++ *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "--preserve-order"; + *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "-zxf"; + *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "-"; + *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = 0; diff -Nru tla-1.3.5+dfsg/debian/patches/0007-fix-some-includes.patch tla-1.3.5+dfsg/debian/patches/0007-fix-some-includes.patch --- tla-1.3.5+dfsg/debian/patches/0007-fix-some-includes.patch 1970-01-01 00:00:00.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/0007-fix-some-includes.patch 2011-11-14 15:31:36.000000000 +0000 @@ -0,0 +1,45 @@ +From: unknown, added by Tim Gokcen +Subject: fix some includes + +--- + src/tla/libarch/cmd-apply-delta.c | 1 + + src/tla/libarch/cmdutils.c | 1 + + src/tla/libfsutils/tmp-files.c | 1 + + 3 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/src/tla/libarch/cmd-apply-delta.c b/src/tla/libarch/cmd-apply-delta.c +index 8aebd8b..1b9111a 100644 +--- a/src/tla/libarch/cmd-apply-delta.c ++++ b/src/tla/libarch/cmd-apply-delta.c +@@ -31,6 +31,7 @@ + #include "tla/libarch/cmd-get.h" + #include "tla/libarch/cmd-delta.h" + #include "tla/libarch/cmd-apply-delta.h" ++#include "tla/libarch/cmdutils.h" + + + /* __STDC__ prototypes for static functions */ +diff --git a/src/tla/libarch/cmdutils.c b/src/tla/libarch/cmdutils.c +index 3aafd13..bb88bb4 100644 +--- a/src/tla/libarch/cmdutils.c ++++ b/src/tla/libarch/cmdutils.c +@@ -16,6 +16,7 @@ + #include "hackerlab/char/str.h" + #include "tla/libarch/cmdutils.h" + #include "tla/libarch/libraries.h" ++#include "tla/libarch/local-cache.h" + #include "tla/libarch/project-tree.h" + #include "tla/libarch/patch-logs.h" + #include "tla/libarch/pfs.h" +diff --git a/src/tla/libfsutils/tmp-files.c b/src/tla/libfsutils/tmp-files.c +index 164acdb..13d7b02 100644 +--- a/src/tla/libfsutils/tmp-files.c ++++ b/src/tla/libfsutils/tmp-files.c +@@ -16,6 +16,7 @@ + #include "hackerlab/char/str-many.h" + #include "hackerlab/vu/safe.h" + #include "hackerlab/fs/file-names.h" ++#include "hackerlab/fs/tmp-files.h" + #include "hackerlab/vu/safe.h" + #include "tla/libfsutils/tmp-files.h" + diff -Nru tla-1.3.5+dfsg/debian/patches/0008-fix-spelling.patch tla-1.3.5+dfsg/debian/patches/0008-fix-spelling.patch --- tla-1.3.5+dfsg/debian/patches/0008-fix-spelling.patch 1970-01-01 00:00:00.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/0008-fix-spelling.patch 2011-11-14 15:31:10.000000000 +0000 @@ -0,0 +1,35 @@ +From: Tim Gokcen +Date: Sat, 12 Nov 2011 10:34:43 +0100 +Subject: fix spelling + +--- + src/tla/libarch/cmd-archives.c | 2 +- + src/tla/libarch/cmd-lock-revision.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tla/libarch/cmd-archives.c b/src/tla/libarch/cmd-archives.c +index 026ca5d..bacb1eb 100644 +--- a/src/tla/libarch/cmd-archives.c ++++ b/src/tla/libarch/cmd-archives.c +@@ -152,7 +152,7 @@ arch_cmd_archives (t_uchar * program_name, int argc, char * argv[]) + re_error = regcomp(&source_needle, "-SOURCE", REG_EXTENDED); + + if (re_error) +- panic("Unable to compile regular expresion."); ++ panic("Unable to compile regular expression."); + + + for (x = 0; x < rel_n_records (list); ++x) +diff --git a/src/tla/libarch/cmd-lock-revision.c b/src/tla/libarch/cmd-lock-revision.c +index 99bb3ed..39762c8 100644 +--- a/src/tla/libarch/cmd-lock-revision.c ++++ b/src/tla/libarch/cmd-lock-revision.c +@@ -227,7 +227,7 @@ arch_cmd_lock_revision (t_uchar * program_name, int argc, char * argv[]) + } + case arch_revision_unknown_lock_state: + { +- safe_printfmt (2, "%s: unkown lock state for %s/%s\n", ++ safe_printfmt (2, "%s: unknown lock state for %s/%s\n", + argv[0], archive, revision); + safe_printfmt (2, " (lock was in transition -- consider retrying)\n"); + exit (1); diff -Nru tla-1.3.5+dfsg/debian/patches/0009-Remove-rpath-from-libneon.patch tla-1.3.5+dfsg/debian/patches/0009-Remove-rpath-from-libneon.patch --- tla-1.3.5+dfsg/debian/patches/0009-Remove-rpath-from-libneon.patch 1970-01-01 00:00:00.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/0009-Remove-rpath-from-libneon.patch 2011-11-14 15:31:11.000000000 +0000 @@ -0,0 +1,80 @@ +From: Tim Gokcen +Date: Sat, 12 Nov 2011 10:34:44 +0100 +Subject: Remove -rpath from libneon + +--- + src/libneon/configure | 15 ++++++++++++++- + src/libneon/configure.in | 14 +++++++++++++- + src/libneon/src/Makefile.in | 2 +- + 3 files changed, 28 insertions(+), 3 deletions(-) + +diff --git a/src/libneon/configure b/src/libneon/configure +index 45ab19d..a48af77 100755 +--- a/src/libneon/configure ++++ b/src/libneon/configure +@@ -8155,10 +8155,23 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + ++top_builddir=`pwd` ++# by Marcelo Magallon ++# Turn around -rpath problem with libtool 1.0c ++# This define should be improbable enough to not conflict with anything ++case ${host} in ++ *-linux-gnu) ++ echo "$as_me:$LINENO: result: Fixing libtool for -rpath problems." >&5 ++echo "${ECHO_T}Fixing libtool for -rpath problems." >&6 ++ sed <${ofile} >${ofile}-2 \ ++ 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' ++ mv ${ofile}-2 ${ofile} ++ chmod 755 ${ofile} ++ ;; ++esac + + + +-top_builddir=`pwd` + + + # Check whether --enable-webdav or --disable-webdav was given. +diff --git a/src/libneon/configure.in b/src/libneon/configure.in +index 6ba8603..acad847 100644 +--- a/src/libneon/configure.in ++++ b/src/libneon/configure.in +@@ -40,10 +40,22 @@ m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])]) + + AC_DISABLE_SHARED + AC_PROG_LIBTOOL ++top_builddir=`pwd` ++# by Marcelo Magallon ++# Turn around -rpath problem with libtool 1.0c ++# This define should be improbable enough to not conflict with anything ++case ${host} in ++ *-linux-gnu) ++ AC_MSG_RESULT([Fixing libtool for -rpath problems.]) ++ sed <${ofile} >${ofile}-2 \ ++ 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' ++ mv ${ofile}-2 ${ofile} ++ chmod 755 ${ofile} ++ ;; ++esac + + AC_EXEEXT + +-top_builddir=`pwd` + AC_SUBST(top_builddir) + + AC_ARG_ENABLE(webdav, +diff --git a/src/libneon/src/Makefile.in b/src/libneon/src/Makefile.in +index aff1fca..b5d9c74 100644 +--- a/src/libneon/src/Makefile.in ++++ b/src/libneon/src/Makefile.in +@@ -67,7 +67,7 @@ all-no: + $(COMPILE) -c $< -o $@ + + libneon.la: $(OBJECTS) +- $(LINK) -rpath $(libdir) $(NEON_LINK_FLAGS) -o $@ $(OBJECTS) $(LIBS) ++ $(LINK) $(NEON_LINK_FLAGS) -o $@ $(OBJECTS) $(LIBS) + + libneon.a: $(OBJECTS) + $(AR) cru $@ $(addsuffix .o, $(basename $(OBJECTS))) diff -Nru tla-1.3.5+dfsg/debian/patches/0010-add-missing-include.patch tla-1.3.5+dfsg/debian/patches/0010-add-missing-include.patch --- tla-1.3.5+dfsg/debian/patches/0010-add-missing-include.patch 1970-01-01 00:00:00.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/0010-add-missing-include.patch 2011-11-14 15:31:13.000000000 +0000 @@ -0,0 +1,23 @@ +From: Tim Gokcen +Date: Thu, 8 Sep 2011 14:43:36 -0400 +Subject: add missing include + +Fix Ubuntu Oneiric build which complains about function return value implicitly converted to pointer due to function header not being #included + +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/tla/+bug/832877 +--- + src/tla/libfsutils/tmp-files.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/tla/libfsutils/tmp-files.c b/src/tla/libfsutils/tmp-files.c +index 13d7b02..fc39d6d 100644 +--- a/src/tla/libfsutils/tmp-files.c ++++ b/src/tla/libfsutils/tmp-files.c +@@ -19,6 +19,7 @@ + #include "hackerlab/fs/tmp-files.h" + #include "hackerlab/vu/safe.h" + #include "tla/libfsutils/tmp-files.h" ++#include "tla/libarch/cmdutils.h" + + + diff -Nru tla-1.3.5+dfsg/debian/patches/0011-Fix-malformed-comment-in-tla-doc-handbook-index.html.patch tla-1.3.5+dfsg/debian/patches/0011-Fix-malformed-comment-in-tla-doc-handbook-index.html.patch --- tla-1.3.5+dfsg/debian/patches/0011-Fix-malformed-comment-in-tla-doc-handbook-index.html.patch 1970-01-01 00:00:00.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/0011-Fix-malformed-comment-in-tla-doc-handbook-index.html.patch 2011-11-14 15:31:14.000000000 +0000 @@ -0,0 +1,22 @@ +From: Kevin Ryde +Date: Mon, 8 Aug 2005 10:23:19 +1000 +Subject: Fix malformed comment in tla-doc/handbook/index.html + +Bug-Debian: http://bugs.debian.org/321887 +--- + src/docs-tla/index.html | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/docs-tla/index.html b/src/docs-tla/index.html +index bd0342b..a9ddbd3 100644 +--- a/src/docs-tla/index.html ++++ b/src/docs-tla/index.html +@@ -9,7 +9,7 @@ + + +
+- + +

+ A GNU Arch Handbook
diff -Nru tla-1.3.5+dfsg/debian/patches/0012-update-tla-tree-list-to-point-to-tla-add-id.patch tla-1.3.5+dfsg/debian/patches/0012-update-tla-tree-list-to-point-to-tla-add-id.patch --- tla-1.3.5+dfsg/debian/patches/0012-update-tla-tree-list-to-point-to-tla-add-id.patch 1970-01-01 00:00:00.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/0012-update-tla-tree-list-to-point-to-tla-add-id.patch 2011-11-14 15:31:16.000000000 +0000 @@ -0,0 +1,25 @@ +From: Julien PUYDT +Date: Wed, 6 Jul 2005 15:48:48 +0200 +Subject: update tla tree-list to point to tla add-id + +the recent change broke "tla add", replacing it by "tla add-id". The +problem is that "tla tree-lint" still points to the former command. + +Bug-Debian: http://bugs.debian.org/317128 +--- + src/tla/libarch/proj-tree-lint.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/tla/libarch/proj-tree-lint.c b/src/tla/libarch/proj-tree-lint.c +index 3f213f3..3154ab9 100644 +--- a/src/tla/libarch/proj-tree-lint.c ++++ b/src/tla/libarch/proj-tree-lint.c +@@ -66,7 +66,7 @@ arch_print_tree_lint_report (int fd, struct arch_tree_lint_result * lint, int es + + if (rel_n_records (lint->warning_files)) + { +- safe_printfmt (fd, "These files would be source but lack inventory ids (`tla add' or a tagline perhaps?):\n\n"); ++ safe_printfmt (fd, "These files would be source but lack inventory ids (`tla add-id' or a tagline perhaps?):\n\n"); + rel_print_pika_escape_iso8859_1_table (fd, escape_classes, lint->warning_files); + safe_printfmt (fd, "\n\n"); + if (!status) diff -Nru tla-1.3.5+dfsg/debian/patches/0013-fix-libneon-configure-options.patch tla-1.3.5+dfsg/debian/patches/0013-fix-libneon-configure-options.patch --- tla-1.3.5+dfsg/debian/patches/0013-fix-libneon-configure-options.patch 1970-01-01 00:00:00.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/0013-fix-libneon-configure-options.patch 2011-11-14 15:31:17.000000000 +0000 @@ -0,0 +1,38 @@ +From: Bernhard R. Link +Date: Mon, 14 Nov 2011 16:29:16 +0100 +Subject: fix libneon configure options + +As tla's configure calls configure without any of the needed options and +gets confused by CFLAGS containing -Werror=format-security, just give it +the proper options... +--- + src/libneon/PLUGIN/AUTOCONF | 20 +++----------------- + 1 files changed, 3 insertions(+), 17 deletions(-) + +diff --git a/src/libneon/PLUGIN/AUTOCONF b/src/libneon/PLUGIN/AUTOCONF +index 95a28bb..63d8945 100644 +--- a/src/libneon/PLUGIN/AUTOCONF ++++ b/src/libneon/PLUGIN/AUTOCONF +@@ -1,19 +1,5 @@ + #!/bin/sh + +-if test ! -z "$CFLAGS" ; then +- printf '\n' +- printf '================================\n' +- printf 'WARNING:\n' +- printf '\n' +- printf ' Discarding "-Werror" from $CFLAGS\n' +- printf ' while configuring "src/libneon"\n' +- printf '\n' +- printf '================================\n' +- printf '\n' +- if printf '%s' "$CFLAGS" | grep -q -e -Werror ; then +- CFLAGS="$(printf '%s' "$CFLAGS" | sed -e 's/-Werror//g')" +- fi +-fi +- +- +-"$1" --with-ssl=no --with-included-expat --with-expat --disable-shared --enable-static ++"$1" --with-ssl=no --with-included-expat --with-expat --disable-shared --enable-static \ ++ ${AUTOCONF_CROSS} CFLAGS="${AUTOCONF_CFLAGS}" CPPFLAGS="${AUTOCONF_CPPFLAGS}" \ ++ LDFLAGS="${AUTOCONFLDFLAGS}" diff -Nru tla-1.3.5+dfsg/debian/patches/00list tla-1.3.5+dfsg/debian/patches/00list --- tla-1.3.5+dfsg/debian/patches/00list 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/00list 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -01-segfault-ia64.dpatch -02-alignment-hppa-sparc.dpatch -04_bashisms.dpatch -05-machine_alignment.dpatch -06-disable_builtin_expat.dpatch -07-tar_preserve.dpatch -08-unknown_includes.dpatch -09-spelling.dpatch -10-libtool_rpath.dpatch diff -Nru tla-1.3.5+dfsg/debian/patches/01-segfault-ia64.dpatch tla-1.3.5+dfsg/debian/patches/01-segfault-ia64.dpatch --- tla-1.3.5+dfsg/debian/patches/01-segfault-ia64.dpatch 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/01-segfault-ia64.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 01-segfault-ia64.dpatch by Martín Ferrar -## -## DP: Fixes segmentation fault on ia64. - -@DPATCH@ - -diff -Naur tla-1.3.5+dfsg.orig/src/tla/libarch/invent.c tla-1.3.5+dfsg/src/tla/libarch/invent.c ---- tla-1.3.5+dfsg.orig/src/tla/libarch/invent.c 2006-07-20 06:34:40.000000000 +0000 -+++ tla-1.3.5+dfsg/src/tla/libarch/invent.c 2006-08-28 07:02:15.000000000 +0000 -@@ -16,6 +16,7 @@ - #include "hackerlab/arrays/ar.h" - #include "hackerlab/fs/file-names.h" - #include "hackerlab/vu/safe.h" -+#include "tla/libarch/cmdutils.h" - #include "tla/libarch/inode-sig.h" - #include "tla/libarch/inv-ids.h" - #include "tla/libarch/invent.h" diff -Nru tla-1.3.5+dfsg/debian/patches/02-alignment-hppa-sparc.dpatch tla-1.3.5+dfsg/debian/patches/02-alignment-hppa-sparc.dpatch --- tla-1.3.5+dfsg/debian/patches/02-alignment-hppa-sparc.dpatch 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/02-alignment-hppa-sparc.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,95 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 02-alignment-hppa-sparc.dpatch by Martín Ferrar -## -## DP: Fixes alignment errors on hppa and sparc. - -@DPATCH@ - -diff -Naur tla-1.3.5+dfsg.orig/src/hackerlab/hash/sha1.c tla-1.3.5+dfsg/src/hackerlab/hash/sha1.c ---- tla-1.3.5+dfsg.orig/src/hackerlab/hash/sha1.c 2006-07-20 06:34:36.000000000 +0000 -+++ tla-1.3.5+dfsg/src/hackerlab/hash/sha1.c 2006-08-28 07:06:06.000000000 +0000 -@@ -39,11 +39,11 @@ - - t_uint32 total[2]; - t_uint32 buflen; -- t_uchar buffer[128]; -+ t_uchar buffer[128] __attribute__((aligned(4))); - }; - - static void --sha1_process_blocks (const void *buffer, size_t len, sha1_context_t ctx); -+sha1_process_blocks (const t_uchar *buffer, size_t len, sha1_context_t ctx); - - #if MACHINE_IS_BIGENDIAN - # define NOTSWAP(n) (n) -@@ -124,7 +124,7 @@ - { - /* When we already have some bits in our internal buffer concatenate - both inputs first. */ -- if (ctx->buflen != 0) -+ while (len > 0) - { - size_t left_over = ctx->buflen; - size_t add = 128 - left_over > len ? len : 128 - left_over; -@@ -147,14 +147,17 @@ - } - - /* Process available complete blocks. */ -+ /* - if (len >= 64) - { - sha1_process_blocks (buffer, len & ~63, ctx); - buffer = (const t_uchar *) buffer + (len & ~63); - len &= 63; - } -+ */ - - /* Move remaining bytes in internal buffer. */ -+ /* - if (len > 0) - { - size_t left_over = ctx->buflen; -@@ -169,6 +172,7 @@ - } - ctx->buflen = left_over; - } -+ */ - } - - -@@ -191,6 +195,8 @@ - /* Take yet unprocessed bytes into account. */ - t_uint32 bytes = ctx->buflen; - size_t pad; -+ /* Temporary array for solving alignment issues */ -+ t_uint32 tmp[5]; - - /* Now count remaining bytes. */ - ctx->total[0] += bytes; -@@ -208,11 +214,12 @@ - /* Process last bytes. */ - sha1_process_blocks (ctx->buffer, bytes + pad + 8, ctx); - -- ((t_uint32 *) result)[0] = NOTSWAP (ctx->current_sha1.A); -- ((t_uint32 *) result)[1] = NOTSWAP (ctx->current_sha1.B); -- ((t_uint32 *) result)[2] = NOTSWAP (ctx->current_sha1.C); -- ((t_uint32 *) result)[3] = NOTSWAP (ctx->current_sha1.D); -- ((t_uint32 *) result)[4] = NOTSWAP (ctx->current_sha1.E); -+ tmp[0] = NOTSWAP (ctx->current_sha1.A); -+ tmp[1] = NOTSWAP (ctx->current_sha1.B); -+ tmp[2] = NOTSWAP (ctx->current_sha1.C); -+ tmp[3] = NOTSWAP (ctx->current_sha1.D); -+ tmp[4] = NOTSWAP (ctx->current_sha1.E); -+ mem_cpy (result, tmp, 20); - - sha1_context_reset (ctx); - } -@@ -329,7 +336,7 @@ - It is assumed that LEN % 64 == 0. - Most of this code comes from GnuPG's cipher/sha1.c. */ - static void --sha1_process_blocks (const void *buffer, size_t len, sha1_context_t ctx) -+sha1_process_blocks (const t_uchar *buffer, size_t len, sha1_context_t ctx) - { - const t_uint32 *words = buffer; - size_t nwords = len / sizeof (t_uint32); diff -Nru tla-1.3.5+dfsg/debian/patches/03-neon26.dpatch tla-1.3.5+dfsg/debian/patches/03-neon26.dpatch --- tla-1.3.5+dfsg/debian/patches/03-neon26.dpatch 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/03-neon26.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03-neon26.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Use Debian libneon instead of the bundled one - -@DPATCH@ -diff -urNad tla-1.3.5+dfsg~/src/tla/libarch/pfs-dav.c tla-1.3.5+dfsg/src/tla/libarch/pfs-dav.c ---- tla-1.3.5+dfsg~/src/tla/libarch/pfs-dav.c 2006-07-20 02:34:40.000000000 -0400 -+++ tla-1.3.5+dfsg/src/tla/libarch/pfs-dav.c 2006-12-02 17:09:27.132871563 -0500 -@@ -856,6 +856,74 @@ - return 0; - } - -+/* neon24 path escape */ -+/* RFC2396 spake: -+ * "Data must be escaped if it does not have a representation -+ * using an unreserved character". -+ */ -+ -+/* Lookup table: character classes from 2396. (This is overkill) */ -+ -+#define SP 0 /* space = */ -+#define CO 0 /* control = */ -+#define DE 0 /* delims = "<" | ">" | "#" | "%" | <"> */ -+#define UW 0 /* unwise = "{" | "}" | "|" | "\" | "^" | "[" | "]" | "`" */ -+#define MA 1 /* mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")" */ -+#define AN 2 /* alphanum = alpha | digit */ -+#define RE 2 /* reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | "," */ -+ -+static const char uri_chars[128] = { -+/* +2 +4 +6 +8 +10 +12 +14 */ -+/* 0 */ CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, -+/* 16 */ CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, -+/* 32 */ SP, MA, DE, DE, RE, DE, RE, MA, MA, MA, MA, RE, RE, MA, MA, RE, -+/* 48 */ AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, RE, RE, DE, RE, DE, RE, -+/* 64 */ RE, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, -+/* 80 */ AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, UW, UW, UW, UW, MA, -+/* 96 */ UW, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, -+/* 112 */ AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, UW, UW, UW, MA, CO -+}; -+ -+#define ESCAPE(ch) (((const signed char)(ch) < 0 || \ -+ uri_chars[(unsigned int)(ch)] == 0)) -+ -+#undef SP -+#undef CO -+#undef DE -+#undef UW -+#undef MA -+#undef AN -+#undef RE -+ -+static char *ne24_path_escape(const char *abs_path) -+{ -+ const char *pnt; -+ char *ret, *retpos; -+ int count = 0; -+ for (pnt = abs_path; *pnt != '\0'; pnt++) { -+ if (ESCAPE(*pnt)) { -+ count++; -+ } -+ } -+ if (count == 0) { -+ return strdup(abs_path); -+ } -+ /* An escaped character is "%xx", i.e., two MORE -+ * characters than the original string */ -+ retpos = ret = malloc(strlen(abs_path) + 2*count + 1); -+ for (pnt = abs_path; *pnt != '\0'; pnt++) { -+ if (ESCAPE(*pnt)) { -+ /* Escape it - % */ -+ sprintf(retpos, "%%%02x", (unsigned char) *pnt); -+ retpos += 3; -+ } else { -+ /* It's cool */ -+ *retpos++ = *pnt; -+ } -+ } -+ *retpos = '\0'; -+ return ret; -+} - - static t_uchar * - abs_path (const t_uchar * cwd, -@@ -874,7 +942,7 @@ - - dirfold (file); - -- tmp = ne_path_escape (file); -+ tmp = ne24_path_escape (file); - lim_free (0, file); - file = str_save (0, tmp); - free (tmp); -diff -urNad tla-1.3.5+dfsg~/src/tla/tla/Makefile.in tla-1.3.5+dfsg/src/tla/tla/Makefile.in ---- tla-1.3.5+dfsg~/src/tla/tla/Makefile.in 2006-07-20 02:34:40.000000000 -0400 -+++ tla-1.3.5+dfsg/src/tla/tla/Makefile.in 2006-12-02 17:03:55.418796863 -0500 -@@ -3,7 +3,7 @@ - ../libawk/libawk.a \ - ../libdate/libdate.a \ - $(objroot)/hackerlab/libhackerlab/libhackerlab.a \ -- ../../libneon/src/libneon.la \ -+ -lneon \ - -lm - - mains := tla.c diff -Nru tla-1.3.5+dfsg/debian/patches/04_bashisms.dpatch tla-1.3.5+dfsg/debian/patches/04_bashisms.dpatch --- tla-1.3.5+dfsg/debian/patches/04_bashisms.dpatch 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/04_bashisms.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04_bashisms.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad tla-1.3.5+dfsg~/src/tla/tests/test-import.sh tla-1.3.5+dfsg/src/tla/tests/test-import.sh ---- tla-1.3.5+dfsg~/src/tla/tests/test-import.sh 2006-07-20 02:34:40.000000000 -0400 -+++ tla-1.3.5+dfsg/src/tla/tests/test-import.sh 2008-03-07 12:54:55.000000000 -0500 -@@ -24,7 +24,7 @@ - tla id-tagging-method explicit - tla add-id hello-world.c README - tla import -L 'initial import' --test "$(tla categories -A jane@example.com--2003)" = "$(echo -e cat\\ncow\\nhello-world)" -+test "$(tla categories -A jane@example.com--2003)" = "$(printf cat\\ncow\\nhello-world\\n)" - test "$(tla branches jane@example.com--2003/hello-world)" = "hello-world--mainline" - test "$(tla versions jane@example.com--2003/hello-world--mainline)" = "hello-world--mainline--1.0" - test -d $(tla whereis-archive jane@example.com--2003)/hello-world/hello-world--mainline/hello-world--mainline--1.0/base-0 diff -Nru tla-1.3.5+dfsg/debian/patches/05-machine_alignment.dpatch tla-1.3.5+dfsg/debian/patches/05-machine_alignment.dpatch --- tla-1.3.5+dfsg/debian/patches/05-machine_alignment.dpatch 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/05-machine_alignment.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 05-machine_alignment.dpatch by Adam Majer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: As per upstream comments in https://bugzilla.redhat.com/show_bug.cgi?id=182742 -## DP: the invariant test should be removed. - -@DPATCH@ -diff -ur tla-1.3.5+dfsg.old/src/hackerlab/tests/arrays-tests/unit-ar.c tla-1.3.5+dfsg/src/hackerlab/tests/arrays-tests/unit-ar.c ---- tla-1.3.5+dfsg.old/src/hackerlab/tests/arrays-tests/unit-ar.c 2006-07-20 01:34:36.000000000 -0500 -+++ tla-1.3.5+dfsg/src/hackerlab/tests/arrays-tests/unit-ar.c 2008-07-22 13:08:57.000000000 -0500 -@@ -50,7 +50,7 @@ - check_array (size_t size, unsigned long * ar) - { - int x; -- invariant (0 == ((unsigned long)ar & (MACHINE_ALIGNMENT - 1))); -+ /* invariant (0 == ((unsigned long)ar & (MACHINE_ALIGNMENT - 1))); */ - invariant (size == ar_size ((void *)ar, lim_use_must_malloc, sizeof (*ar))); - for (x = 0; x < size; ++x) - invariant (ar[x] == HASH_INDEX (x)); diff -Nru tla-1.3.5+dfsg/debian/patches/06-disable_builtin_expat.dpatch tla-1.3.5+dfsg/debian/patches/06-disable_builtin_expat.dpatch --- tla-1.3.5+dfsg/debian/patches/06-disable_builtin_expat.dpatch 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/06-disable_builtin_expat.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 06-disable_builtin_expat.dpatch by Sylvain Beucler -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad tla-1.3.5+dfsg~/src/libneon/Makefile.in tla-1.3.5+dfsg/src/libneon/Makefile.in ---- tla-1.3.5+dfsg~/src/libneon/Makefile.in 2009-12-24 12:30:27.000000000 +0100 -+++ tla-1.3.5+dfsg/src/libneon/Makefile.in 2009-12-24 12:30:41.000000000 +0100 -@@ -33,7 +33,7 @@ - - @SET_MAKE@ - --LDFLAGS = -L. -L$(top_builddir)/../expat @LDFLAGS@ -+LDFLAGS = -L. @LDFLAGS@ - LIBS = @LIBS@ - CC = @CC@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -diff -urNad tla-1.3.5+dfsg~/src/libneon/src/Makefile.in tla-1.3.5+dfsg/src/libneon/src/Makefile.in ---- tla-1.3.5+dfsg~/src/libneon/src/Makefile.in 2009-12-24 12:30:27.000000000 +0100 -+++ tla-1.3.5+dfsg/src/libneon/src/Makefile.in 2009-12-24 12:31:28.000000000 +0100 -@@ -25,14 +25,14 @@ - - # Flags - CPPFLAGS = @DEFS@ @CPPFLAGS@ --CFLAGS = @CFLAGS@ -I$(top_builddir) -I$(top_srcdir)/../expat/lib @NEON_CFLAGS@ --LDFLAGS = -L$(top_builddir)/../expat @LDFLAGS@ -+CFLAGS = @CFLAGS@ -I$(top_builddir) @NEON_CFLAGS@ -+LDFLAGS = @LDFLAGS@ - NEON_LINK_FLAGS = @NEON_LINK_FLAGS@ - # Note: don't substitute @LIBS@ in here; during a bundled - # build of this directory, @LIBS@ may include -lneon. - LIBS = @NEON_LIBS@ @NEON_LTLIBS@ - --COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -I$(top_builddir) -I$(top_srcdir)/../expat/lib @NEON_CFLAGS@ -+COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -I$(top_builddir) @NEON_CFLAGS@ - LINK = $(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) - - NEON_BASEOBJS = ne_request.@NEON_OBJEXT@ ne_session.@NEON_OBJEXT@ \ -diff -urNad tla-1.3.5+dfsg~/src/tla/tla/Makefile.in tla-1.3.5+dfsg/src/tla/tla/Makefile.in ---- tla-1.3.5+dfsg~/src/tla/tla/Makefile.in 2009-12-24 12:30:27.000000000 +0100 -+++ tla-1.3.5+dfsg/src/tla/tla/Makefile.in 2009-12-24 12:30:41.000000000 +0100 -@@ -21,7 +21,7 @@ - endif - - $(programs):%$(cfg__exec_suffix):%.o $(thelib) $(filter-out -L%, $(filter-out -l%, $(libs))) -- $(SHELL) $(objroot)/libneon/libtool --mode=link $(CC) $(CFLAGS) -L../../expat -o $@ $< $(thelib) $(libs) -+ $(SHELL) $(objroot)/libneon/libtool --mode=link $(CC) $(CFLAGS) -o $@ $< $(thelib) $(libs) - - clean: clean-prog - diff -Nru tla-1.3.5+dfsg/debian/patches/07-tar_preserve.dpatch tla-1.3.5+dfsg/debian/patches/07-tar_preserve.dpatch --- tla-1.3.5+dfsg/debian/patches/07-tar_preserve.dpatch 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/07-tar_preserve.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 99-tar_preserve.dpatch by Tim Gokcen -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Don't use deprecated tar --preserve option -## DP: Instead, use --preserve-permissions & --preserve-order - -@DPATCH@ - -diff -Naur tla-1.3.5+dfsg.orig/src/tla/libarch/archive.c tla-1.3.5+dfsg/src/tla/librarch/archive.c ---- tla-1.3.5+dfsg.orig/src/tla/libarch/archive.c 2006-07-20 02:34:40.000000000 -0400 -+++ tla-1.3.5+dfsg/src/tla/libarch/archive.c 2010-11-26 14:58:32.000000000 -0500 -@@ -1114,7 +1114,8 @@ - - *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = cfg__gnu_tar; - *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "-m"; -- *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "--preserve"; -+ *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "--preserve-permissions"; -+ *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "--preserve-order"; - *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "-zxf"; - *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "-"; - *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = 0; diff -Nru tla-1.3.5+dfsg/debian/patches/08-unknown_includes.dpatch tla-1.3.5+dfsg/debian/patches/08-unknown_includes.dpatch --- tla-1.3.5+dfsg/debian/patches/08-unknown_includes.dpatch 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/08-unknown_includes.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 08-unknown_includes.dpatch by unknown, added by Tim Gokcen -## These lines were part of the diff.gz, which is not correct according to -## lintian. They should have been here in the dpath directory instead. -## I'm not entirely sure if or why they are needed, but they were here before me -## so they shall remain. -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Use Debian libneon instead of the bundled one - -@DPATCH@ -diff -urNad tla-1.3.5+dfsg.orig/src/tla/libfsutils/tmp-files.c tla-1.3.5+dfsg/src/tla/libfsutils/tmp-files.c ---- tla-1.3.5+dfsg.orig/src/tla/libfsutils/tmp-files.c 2006-07-20 02:34:40.000000000 -0400 -+++ tla-1.3.5+dfsg/src/tla/libfsutils/tmp-files.c 2010-11-30 13:43:04.000000000 -0500 -@@ -16,6 +16,7 @@ - #include "hackerlab/char/str-many.h" - #include "hackerlab/vu/safe.h" - #include "hackerlab/fs/file-names.h" -+#include "hackerlab/fs/tmp-files.h" - #include "hackerlab/vu/safe.h" - #include "tla/libfsutils/tmp-files.h" - -diff -urNad tla-1.3.5+dfsg.orig/src/tla/libarch/cmd-apply-delta.c tla-1.3.5+dfsg/src/tla/libarch/cmd-apply-delta.c ---- tla-1.3.5+dfsg.orig/src/tla/libarch/cmd-apply-delta.c 2006-07-20 02:34:40.000000000 -0400 -+++ tla-1.3.5+dfsg/src/tla/libarch/cmd-apply-delta.c 2010-11-30 13:43:04.000000000 -0500 -@@ -31,6 +31,7 @@ - #include "tla/libarch/cmd-get.h" - #include "tla/libarch/cmd-delta.h" - #include "tla/libarch/cmd-apply-delta.h" -+#include "tla/libarch/cmdutils.h" - - ^L - /* __STDC__ prototypes for static functions */ -diff -urNad tla-1.3.5+dfsg.orig/src/tla/libarch/cmdutils.c tla-1.3.5+dfsg/src/tla/libarch/cmdutils.c ---- tla-1.3.5+dfsg.orig/src/tla/libarch/cmdutils.c 2006-07-20 02:34:40.000000000 -0400 -+++ tla-1.3.5+dfsg/src/tla/libarch/cmdutils.c 2010-11-30 13:43:04.000000000 -0500 -@@ -16,6 +16,7 @@ - #include "hackerlab/char/str.h" - #include "tla/libarch/cmdutils.h" - #include "tla/libarch/libraries.h" -+#include "tla/libarch/local-cache.h" - #include "tla/libarch/project-tree.h" - #include "tla/libarch/patch-logs.h" - #include "tla/libarch/pfs.h" - diff -Nru tla-1.3.5+dfsg/debian/patches/09-spelling.dpatch tla-1.3.5+dfsg/debian/patches/09-spelling.dpatch --- tla-1.3.5+dfsg/debian/patches/09-spelling.dpatch 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/09-spelling.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 09-spelling.dpatch by Tim Gokcen -## Fixes spelling errors in the source code. -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Use Debian libneon instead of the bundled one - -@DPATCH@ - -diff -urNad tla-1.3.5+dfsg.orig/src/tla/libarch/cmd-lock-revision.c tla-1.3.5+dfsg/src/tla/libarch/cmd-lock-revision.c ---- tla-1.3.5+dfsg.orig/src/tla/libarch/cmd-lock-revision.c 2010-11-30 11:49:05.000000000 -0500 -+++ tla-1.3.5+dfsg/src/tla/libarch/cmd-lock-revision.c 2010-11-30 11:44:53.000000000 -0500 -@@ -227,7 +227,7 @@ - } - case arch_revision_unknown_lock_state: - { -- safe_printfmt (2, "%s: unkown lock state for %s/%s\n", -+ safe_printfmt (2, "%s: unknown lock state for %s/%s\n", - argv[0], archive, revision); - safe_printfmt (2, " (lock was in transition -- consider retrying)\n"); - exit (1); -diff -urNad tla-1.3.5+dfsg.orig/src/tla/libarch/cmd-archives.c tla-1.3.5+dfsg/src/tla/libarch/cmd-archives.c ---- tla-1.3.5+dfsg.orig/src/tla/libarch/cmd-archives.c 2010-11-30 11:46:33.000000000 -0500 -+++ tla-1.3.5+dfsg/src/tla/libarch/cmd-archives.c 2010-11-30 11:46:39.000000000 -0500 -@@ -152,7 +152,7 @@ - re_error = regcomp(&source_needle, "-SOURCE", REG_EXTENDED); - - if (re_error) -- panic("Unable to compile regular expresion."); -+ panic("Unable to compile regular expression."); - - - for (x = 0; x < rel_n_records (list); ++x) diff -Nru tla-1.3.5+dfsg/debian/patches/10-libtool_rpath.dpatch tla-1.3.5+dfsg/debian/patches/10-libtool_rpath.dpatch --- tla-1.3.5+dfsg/debian/patches/10-libtool_rpath.dpatch 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/10-libtool_rpath.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10-libtool_rpath.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Remove -rpath from libneon - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' tla-1.3.5+dfsg~/src/libneon/configure tla-1.3.5+dfsg/src/libneon/configure ---- tla-1.3.5+dfsg~/src/libneon/configure 2010-11-30 14:49:54.000000000 -0500 -+++ tla-1.3.5+dfsg/src/libneon/configure 2010-11-30 14:49:56.000000000 -0500 -@@ -8155,10 +8155,23 @@ - - - -+top_builddir=`pwd` -+# by Marcelo Magallon -+# Turn around -rpath problem with libtool 1.0c -+# This define should be improbable enough to not conflict with anything -+case ${host} in -+ *-linux-gnu) -+ echo "$as_me:$LINENO: result: Fixing libtool for -rpath problems." >&5 -+echo "${ECHO_T}Fixing libtool for -rpath problems." >&6 -+ sed <${ofile} >${ofile}-2 \ -+ 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' -+ mv ${ofile}-2 ${ofile} -+ chmod 755 ${ofile} -+ ;; -+esac - - - --top_builddir=`pwd` - - - # Check whether --enable-webdav or --disable-webdav was given. -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' tla-1.3.5+dfsg~/src/libneon/configure.in tla-1.3.5+dfsg/src/libneon/configure.in ---- tla-1.3.5+dfsg~/src/libneon/configure.in 2010-11-30 14:49:54.000000000 -0500 -+++ tla-1.3.5+dfsg/src/libneon/configure.in 2010-11-30 14:49:56.000000000 -0500 -@@ -40,10 +40,22 @@ - - AC_DISABLE_SHARED - AC_PROG_LIBTOOL -+top_builddir=`pwd` -+# by Marcelo Magallon -+# Turn around -rpath problem with libtool 1.0c -+# This define should be improbable enough to not conflict with anything -+case ${host} in -+ *-linux-gnu) -+ AC_MSG_RESULT([Fixing libtool for -rpath problems.]) -+ sed <${ofile} >${ofile}-2 \ -+ 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' -+ mv ${ofile}-2 ${ofile} -+ chmod 755 ${ofile} -+ ;; -+esac - - AC_EXEEXT - --top_builddir=`pwd` - AC_SUBST(top_builddir) - - AC_ARG_ENABLE(webdav, -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' tla-1.3.5+dfsg~/src/libneon/src/Makefile.in tla-1.3.5+dfsg/src/libneon/src/Makefile.in ---- tla-1.3.5+dfsg~/src/libneon/src/Makefile.in 2010-11-30 14:49:56.000000000 -0500 -+++ tla-1.3.5+dfsg/src/libneon/src/Makefile.in 2010-11-30 14:50:07.000000000 -0500 -@@ -67,7 +67,7 @@ - $(COMPILE) -c $< -o $@ - - libneon.la: $(OBJECTS) -- $(LINK) -rpath $(libdir) $(NEON_LINK_FLAGS) -o $@ $(OBJECTS) $(LIBS) -+ $(LINK) $(NEON_LINK_FLAGS) -o $@ $(OBJECTS) $(LIBS) - - libneon.a: $(OBJECTS) - $(AR) cru $@ $(addsuffix .o, $(basename $(OBJECTS))) diff -Nru tla-1.3.5+dfsg/debian/patches/series tla-1.3.5+dfsg/debian/patches/series --- tla-1.3.5+dfsg/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ tla-1.3.5+dfsg/debian/patches/series 2011-11-14 15:30:10.000000000 +0000 @@ -0,0 +1,13 @@ +0001-Fixes-segmentation-fault-on-ia64.patch +0002-Fixes-alignment-errors-on-hppa-and-sparc.patch +0003-fix-bashisms.patch +0004-fix-machine-alignment.patch +0005-disable-builtin-expat.patch +0006-tar-preserve.patch +0007-fix-some-includes.patch +0008-fix-spelling.patch +0009-Remove-rpath-from-libneon.patch +0010-add-missing-include.patch +0011-Fix-malformed-comment-in-tla-doc-handbook-index.html.patch +0012-update-tla-tree-list-to-point-to-tla-add-id.patch +0013-fix-libneon-configure-options.patch diff -Nru tla-1.3.5+dfsg/debian/rules tla-1.3.5+dfsg/debian/rules --- tla-1.3.5+dfsg/debian/rules 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/rules 2011-11-14 16:05:23.000000000 +0000 @@ -3,81 +3,83 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 +DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + CROSS = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) else - CFLAGS += -O2 + CROSS = --build $(DEB_BUILD_GNU_TYPE) endif -DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) - -upstream: +CFLAGS := $(shell dpkg-buildflags --get CFLAGS) +CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) +LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) +CFLAGS += -Wall - # Removing non-free documentation - rm -rf src/docs-hackerlab # GFDL with invariants +autoconfdirs = src/libneon src/build-tools/gnu -configure: configure-stamp -configure-stamp: patch-stamp +configure-stamp: dh_testdir - # update config files - chmod +x debian/configupdate - debian/configupdate update - - # Configuring package + for d in $(autoconfdirs) ; do \ + rm -f $$d/config.guess $$d/config.sub ; \ + cp /usr/share/misc/config.guess /usr/share/misc/config.sub $$d/ ; \ + done + rm -rf debian/build + rm -rf src/expat/ # Let's play safe + rm -f src/libneon/PLUGIN/REQ mkdir debian/build - cd debian/build && CFLAGS="$(CFLAGS)" ../../src/configure --prefix=/usr - + cd debian/build && \ + CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' \ + AUTOCONF_CROSS='$(CROSS)' AUTOCONF_CFLAGS='$(CFLAGS)' \ + AUTOCONF_CPPFLAGS='$(CPPFLAGS)' AUTOCONF_LDFLAGS='$(LDFLAGS)' \ + ../../src/configure --prefix=/usr --with cc gcc touch configure-stamp +build-indep: +build-arch: build-stamp build: build-stamp -build-stamp: configure-stamp +build-stamp: configure-stamp dh_testdir - # Building package - $(MAKE) -C debian/build + $(MAKE) -j1 -C debian/build CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' # Temporary skipping arm where the testsuite is know to be broken + # There is a bug somewhere that this causes recompilation of almost everything. + # Someone might take a look to find it... if [ "$(DEB_BUILD_ARCH)" != "arm" ]; \ then \ - $(MAKE) -C debian/build test || exit 1; \ + $(MAKE) -j1 CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' -C debian/build test || exit 1; \ fi touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp # Disable builtin expat - # See also patches/06-disable_builtin_expat.dpatch - #rm -f src/expat/PLUGIN/AUTOCONF - #rm -f src/expat/PLUGIN/REQ rm -rf src/expat/ # Let's play safe rm -f src/libneon/PLUGIN/REQ - # Cleaning package rm -rf debian/build - # reset changes to config files - chmod +x debian/configupdate - debian/configupdate reset - + for d in $(autoconfdirs) ; do \ + rm -f $$d/config.guess $$d/config.sub ; \ + done dh_clean -install: build +install: build-stamp dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs # Installing package - $(MAKE) -C debian/build install destdir=$(CURDIR)/debian/tla + $(MAKE) -j1 -C debian/build install destdir=$(CURDIR)/debian/tla \ + CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' install -m 0755 src/tla/=gpg-check.awk debian/tla/usr/bin/tla-gpg-check # Installing documentation @@ -97,7 +99,7 @@ install -D -m 644 $$LINTIAN debian/`basename $$LINTIAN`/usr/share/lintian/overrides/`basename $$LINTIAN` || exit 1; \ done -binary-indep: build install +binary-indep: install dh_testdir -i dh_testroot -i dh_installchangelogs -ptla-doc src/docs-tla/ChangeLog @@ -112,7 +114,7 @@ dh_md5sums -i dh_builddeb -i -binary-arch: build install +binary-arch: install dh_testdir -a dh_testroot -a dh_installchangelogs -ptla src/tla/ChangeLog @@ -130,4 +132,4 @@ dh_builddeb -a binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: build-arch build-indep build clean binary-indep binary-arch binary install diff -Nru tla-1.3.5+dfsg/debian/source/format tla-1.3.5+dfsg/debian/source/format --- tla-1.3.5+dfsg/debian/source/format 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/debian/source/format 2011-11-26 18:13:57.000000000 +0000 @@ -1 +1 @@ -1.0 +3.0 (quilt) diff -Nru tla-1.3.5+dfsg/src/tla/libarch/invent.c tla-1.3.5+dfsg/src/tla/libarch/invent.c --- tla-1.3.5+dfsg/src/tla/libarch/invent.c 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/src/tla/libarch/invent.c 2006-07-20 06:34:40.000000000 +0000 @@ -19,7 +19,6 @@ #include "tla/libarch/inode-sig.h" #include "tla/libarch/inv-ids.h" #include "tla/libarch/invent.h" -#include "tla/libarch/cmdutils.h" diff -Nru tla-1.3.5+dfsg/src/tla/libfsutils/tmp-files.c tla-1.3.5+dfsg/src/tla/libfsutils/tmp-files.c --- tla-1.3.5+dfsg/src/tla/libfsutils/tmp-files.c 2011-11-26 18:13:56.000000000 +0000 +++ tla-1.3.5+dfsg/src/tla/libfsutils/tmp-files.c 2006-07-20 06:34:40.000000000 +0000 @@ -18,7 +18,6 @@ #include "hackerlab/fs/file-names.h" #include "hackerlab/vu/safe.h" #include "tla/libfsutils/tmp-files.h" -#include "tla/libarch/cmdutils.h"