From a11afb9d0dd5d2326acb2de19ea20b49238667d0 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 21 Mar 2012 23:47:54 +0100
Subject: do not update po and pot files in the process of the build as this
 causes timestamp changes for the mo files which therefore can't be refcounted
 by dpkg for your M-A: same packages (Closes: #659333, LP: #924628)

The commit also enables a top-level 'make update-po' and does
all the needed changes to let this work now that update-po might
be called in a freshly checkout tree
---
 buildlib/defaults.mak | 2 +-
 buildlib/podomain.mak | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'buildlib')

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index edb089160..c10813e9d 100644
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -121,7 +121,7 @@ MKDIRS := $(BIN)
 all: dirs binary doc
 binary: library program
 maintainer-clean dist-clean distclean pristine sanity: veryclean
-headers library clean veryclean program test:
+startup headers library clean veryclean program test update-po:
 
 veryclean:
 	echo Very Clean done for $(SUBDIR)
diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak
index 511a5cae2..bb1c77e47 100644
--- a/buildlib/podomain.mak
+++ b/buildlib/podomain.mak
@@ -14,7 +14,7 @@ MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN)
 $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE))
 $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile
 	(echo $(SRC) | xargs -n1 echo) > $@
-binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
+startup binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
 
 veryclean: veryclean/$(LOCAL)
 veryclean/po/$(LOCAL): LIST := $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
-- 
cgit v1.2.3


From 9179f697ed4796a86f820b516f034fd679e48be4 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 22 Mar 2012 00:16:11 +0100
Subject: the previously used VERSION didn't work everywhere so we are
 switching to the more standard PACKAGE_VERSION and make it work in every file

---
 buildlib/config.h.in        | 6 +++---
 buildlib/environment.mak.in | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'buildlib')

diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index 4798fe3f5..87918bbec 100644
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -39,10 +39,10 @@
 /* Define the arch name string */
 #undef COMMON_ARCH
 
-/* The version number string */
-#undef VERSION
-
 /* The package name string */
 #undef PACKAGE
 
+/* The version number string */
+#undef PACKAGE_VERSION
+
 #define APT_8_CLEANER_HEADERS
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index fdac3e6c3..b8ddb34a2 100644
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -2,6 +2,7 @@
 # if you want you can edit it, just don't re-run configure.
 
 PACKAGE = @PACKAGE@
+PACKAGE_VERSION = @PACKAGE_VERSION@
 
 # C++ compiler options
 CC = @CC@
-- 
cgit v1.2.3


From 7efb8c8ef10c1d0b9479c24a6a5b4e96fc0e6286 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 5 Apr 2012 15:18:03 +0200
Subject: detect zlib correctly. We still don't allow to build without it to
 remain compatible with users accessing it directly, but this prepares for a
 drop of this strict requirement in the future

---
 buildlib/config.h.in | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'buildlib')

diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index 87918bbec..43d39d304 100644
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -19,6 +19,9 @@
 /* Define if we have the timegm() function */
 #undef HAVE_TIMEGM
 
+/* Define if we have the zlib library for gzip */
+#undef HAVE_ZLIB
+
 /* These two are used by the statvfs shim for glibc2.0 and bsd */
 /* Define if we have sys/vfs.h */
 #undef HAVE_VFS_H
-- 
cgit v1.2.3


From c4997486bffc76e2581e9072bff05eba0feeb29c Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 5 Apr 2012 20:51:36 +0200
Subject:   - add libbz2-dev as new build-dependency   - remove the libz-dev
 alternative from zlib1g-dev build-dependency   - do the same for bz2 builtin
 if available * apt-pkg/contrib/fileutl.cc:   - use libz2 library for
 (de)compression instead of the bzip2 binary as     the first is a dependency
 of dpkg and the later just priority:optional     so we gain 'easier' access
 to bz2-compressed Translation files this way

---
 buildlib/config.h.in        | 3 +++
 buildlib/environment.mak.in | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'buildlib')

diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index 43d39d304..b07d4f77f 100644
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -22,6 +22,9 @@
 /* Define if we have the zlib library for gzip */
 #undef HAVE_ZLIB
 
+/* Define if we have the bz2 library for bzip2 */
+#undef HAVE_BZ2
+
 /* These two are used by the statvfs shim for glibc2.0 and bsd */
 /* Define if we have sys/vfs.h */
 #undef HAVE_VFS_H
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index b8ddb34a2..0f0fac095 100644
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -55,7 +55,8 @@ INTLLIBS = @INTLLIBS@
 # Shim Headerfile control
 HAVE_C9X = @HAVE_C9X@
 HAVE_STATVFS = @HAVE_STATVFS@
-HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_ZLIB = @HAVE_ZLIB@
+HAVE_BZ2 = @HAVE_BZ2@
 NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
 
 # Shared library things
-- 
cgit v1.2.3


From 742f57054fe787714c9ab59aa704cdcec25f3b28 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 12 May 2012 00:36:44 +0200
Subject: * Makefile, buildlib/*.mak:   - reshuffle dependencies so that
 parallel building seems to work

---
 buildlib/configure.mak | 11 +++++------
 buildlib/copy.mak      |  2 +-
 buildlib/podomain.mak  |  6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'buildlib')

diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index 310c2600c..c0d8e3c76 100644
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -20,16 +20,15 @@ startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTE
 buildlib/config.sub:
 	ln -sf /usr/share/misc/config.sub buildlib/config.sub
 buildlib/config.guess:
-	ln -sf /usr/share/misc/config.guess buildlib/config.guess	
+	ln -sf /usr/share/misc/config.guess buildlib/config.guess
 configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub
 	autoconf
 
 aclocal.m4: $(wildcard buildlib/*.m4)
 	aclocal -I buildlib
-	
+
 $(BUILDDIR)/config.status: configure
-	/usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR)	
+	/usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR)
 	(HERE=`pwd`; cd $(BUILDDIR) && $$HERE/configure)
-	
-$(addprefix $(BUILDDIR)/,$(CONVERTED)):
-	(cd $(BUILDDIR) && ./config.status)
+
+$(addprefix $(BUILDDIR)/,$(CONVERTED)): $(BUILDDIR)/config.status
diff --git a/buildlib/copy.mak b/buildlib/copy.mak
index 3ae11a7eb..e8fe43deb 100644
--- a/buildlib/copy.mak
+++ b/buildlib/copy.mak
@@ -21,7 +21,7 @@ veryclean: veryclean/$(LOCAL)
 
 MKDIRS += $(dir $($(LOCAL)-LIST))
 
-$($(LOCAL)-LIST) : $(TO)/% : %
+$($(LOCAL)-LIST) : $(TO)/% : % dirs
 	echo Installing $< to $(@D)
 	cp $< $(@D)
 
diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak
index bb1c77e47..d46652520 100644
--- a/buildlib/podomain.mak
+++ b/buildlib/podomain.mak
@@ -11,9 +11,9 @@ MY_DOMAIN := $(APT_DOMAIN)
 endif
 
 MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN)
-$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE))
-$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile
-	(echo $(SRC) | xargs -n1 echo) > $@
+$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: $(addprefix $(BASE)/$(SUBDIR)/,$(SOURCE))
+$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile dirs
+	(echo $(addprefix $(SUBDIR)/,$(SOURCE)) | xargs -n1 echo) > $@
 startup binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
 
 veryclean: veryclean/$(LOCAL)
-- 
cgit v1.2.3


From e4bc41c765f2b9fec55faa747e8330130c987678 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 14 May 2012 14:39:15 +0200
Subject:   - separate manpages from the rest of the doc building   - make apt
 and apt-utils packages depend on manpages instead of full doc

---
 buildlib/defaults.mak | 2 +-
 buildlib/manpage.mak  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'buildlib')

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index c10813e9d..7b084f4b9 100644
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -121,7 +121,7 @@ MKDIRS := $(BIN)
 all: dirs binary doc
 binary: library program
 maintainer-clean dist-clean distclean pristine sanity: veryclean
-startup headers library clean veryclean program test update-po:
+startup headers library clean veryclean program test update-po manpages:
 
 veryclean:
 	echo Very Clean done for $(SUBDIR)
diff --git a/buildlib/manpage.mak b/buildlib/manpage.mak
index 6cdf73ccf..063841d86 100644
--- a/buildlib/manpage.mak
+++ b/buildlib/manpage.mak
@@ -14,7 +14,8 @@ LOCAL := manpage-$(firstword $(SOURCE))
 $(LOCAL)-LIST := $(addprefix $(DOC)/,$(SOURCE))
 
 # Install generation hooks
-doc: $($(LOCAL)-LIST)
+doc: manpages
+manpages: $($(LOCAL)-LIST)
 veryclean: veryclean/$(LOCAL)
 
 MKDIRS += $(DOC)
-- 
cgit v1.2.3


From 1c8754c2fc67e6bafd92af8cb964661e858c6f41 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 17 May 2012 22:21:03 +0200
Subject: * doc/makefile:   - build manpages with the correct
 l10n.gentext.default.language setting     to get the correct section titles
 provided by docbook

---
 buildlib/po4a_manpage.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'buildlib')

diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index 404bb57a5..5814180d8 100644
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -16,7 +16,7 @@ INCLUDES = apt.ent apt-verbatim.ent
 # Do not use XMLTO, build the manpages directly with XSLTPROC
 ifdef XSLTPROC
 
-STYLESHEET=../manpage-style.xsl
+STYLESHEET=manpage-style.xsl
 
 LOCAL := po4a-manpage-$(firstword $(SOURCE))
 $(LOCAL)-LIST := $(SOURCE)
-- 
cgit v1.2.3


From 75f37d7d27c2579ddb88f852087a54934cb00c8b Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sun, 20 May 2012 18:37:14 +0200
Subject: move the creation of the manpage-style.xsl file to the rest of the
 manpage building instead of doing it at setup time, so we can properly depend
 on it

---
 buildlib/po4a_manpage.mak | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'buildlib')

diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index 5814180d8..1dedd0dcd 100644
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -28,7 +28,11 @@ veryclean: veryclean/$(LOCAL)
 apt-verbatim.ent: ../apt-verbatim.ent
 	cp ../apt-verbatim.ent .
 
-$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
+manpage-style.xsl: ../manpage-style.xsl
+	sed "/<!-- LANGUAGE -->/ i\
+<xsl:param name=\"l10n.gentext.default.language\" select=\"'$(LC)'\" />" ../manpage-style.xsl > manpage-style.xsl
+
+$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES)
 	echo Creating man page $@
 	$(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here???
 	test -f $(subst .$(LC),,$@) || echo FIXME: xsltproc respect the -o flag now, workaround can be removed
-- 
cgit v1.2.3


From a680e061adae846d1c02dd0bb4b1f951592c9580 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 21 May 2012 15:12:27 +0200
Subject: * buildlib/podomain.mak:   - ensure that all sources end up in the
 srclist so that we don't     forget to extract half of the translation
 strings

---
 buildlib/podomain.mak | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'buildlib')

diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak
index d46652520..cca7d55be 100644
--- a/buildlib/podomain.mak
+++ b/buildlib/podomain.mak
@@ -11,10 +11,10 @@ MY_DOMAIN := $(APT_DOMAIN)
 endif
 
 MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN)
-$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: $(addprefix $(BASE)/$(SUBDIR)/,$(SOURCE))
+$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE))
 $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile dirs
-	(echo $(addprefix $(SUBDIR)/,$(SOURCE)) | xargs -n1 echo) > $@
-startup binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
+	(echo $(SRC) | xargs -n1 echo) > $@
+startup binary program clean update-po: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
 
 veryclean: veryclean/$(LOCAL)
 veryclean/po/$(LOCAL): LIST := $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
-- 
cgit v1.2.3


From 1c46aec47a9059d308e21391a8b8e92bd1c41737 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 21 May 2012 15:13:05 +0200
Subject: apply the correct metadata (package, version, mail) to all pot and po
 files

---
 buildlib/config.h.in        | 3 +++
 buildlib/environment.mak.in | 1 +
 2 files changed, 4 insertions(+)

(limited to 'buildlib')

diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index b07d4f77f..656705038 100644
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -51,4 +51,7 @@
 /* The version number string */
 #undef PACKAGE_VERSION
 
+/* The mail address to reach upstream */
+#undef PACKAGE_MAIL
+
 #define APT_8_CLEANER_HEADERS
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 0f0fac095..7ceae70ce 100644
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -3,6 +3,7 @@
 
 PACKAGE = @PACKAGE@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PACKAGE_MAIL = @PACKAGE_MAIL@
 
 # C++ compiler options
 CC = @CC@
-- 
cgit v1.2.3


From 5c1715d8f847a5a3d8b8128d2dcc8a7622a9df1b Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 21 May 2012 15:16:39 +0200
Subject: whatever this script did, it didn't for a long long time (it creates
 changelog from cvs)

---
 buildlib/mkChangeLog | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100755 buildlib/mkChangeLog

(limited to 'buildlib')

diff --git a/buildlib/mkChangeLog b/buildlib/mkChangeLog
deleted file mode 100755
index 4164ec9d5..000000000
--- a/buildlib/mkChangeLog
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-NAMES="`sed -ne 's/'\''/'\''\\\\'\'''\''/g;
-	         s/^.*CVS:\([^ ]\+\) \([^<]\+\) <\([^>]*\)>/\
-		    -u '\''\1:\2:\3'\''/gp' AUTHORS`"
-OPTIONS="-l 78"
-
-# Generate the standard ChangeLog
-echo CVSIGNORE=po rcs2log $OPTIONS $NAMES
-eval CVSIGNORE=po rcs2log $OPTIONS $NAMES >> ChangeLog
-
-# Generate the po ChangeLog
-#echo rcs2log $OPTIONS $NAMES po
-#eval rcs2log $OPTIONS $NAMES po >> po/ChangeLog
-- 
cgit v1.2.3


From 65bf851838611139239805bee63a7cea4cb0a309 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 21 May 2012 16:50:52 +0200
Subject: * buildlib/inttypes.h.in:   - remove inttypes.h compatibility as
 providing such a c99 types     compatibility conflicts with the usage of c99
 type long long

---
 buildlib/config.h.in        | 14 -------------
 buildlib/environment.mak.in |  1 -
 buildlib/inttypes.h.in      | 50 ---------------------------------------------
 buildlib/makefile.in        |  5 -----
 buildlib/sizetable          | 25 -----------------------
 5 files changed, 95 deletions(-)
 delete mode 100644 buildlib/inttypes.h.in
 delete mode 100644 buildlib/sizetable

(limited to 'buildlib')

diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index 656705038..85d3883fc 100644
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -2,20 +2,6 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 
-/* The following 4 are only used by inttypes.h shim if the system lacks
-   inttypes.h */
-/* The number of bytes in a usigned char.  */
-#undef SIZEOF_CHAR
-
-/* The number of bytes in a unsigned int.  */
-#undef SIZEOF_INT
-
-/* The number of bytes in a unsigned long.  */
-#undef SIZEOF_LONG
-
-/* The number of bytes in a unsigned short.  */
-#undef SIZEOF_SHORT
-
 /* Define if we have the timegm() function */
 #undef HAVE_TIMEGM
 
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 7ceae70ce..fc859951e 100644
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -54,7 +54,6 @@ BDBLIB = @BDBLIB@
 INTLLIBS = @INTLLIBS@
 
 # Shim Headerfile control
-HAVE_C9X = @HAVE_C9X@
 HAVE_STATVFS = @HAVE_STATVFS@
 HAVE_ZLIB = @HAVE_ZLIB@
 HAVE_BZ2 = @HAVE_BZ2@
diff --git a/buildlib/inttypes.h.in b/buildlib/inttypes.h.in
deleted file mode 100644
index 3b43b7672..000000000
--- a/buildlib/inttypes.h.in
+++ /dev/null
@@ -1,50 +0,0 @@
-/* This is an ISO C 9X header file. We omit this copy to the include 
-   directory if the local platform does not have inttypes.h, it contains
-   [u]int[8,16,32]_t fixed width types */
-
-#include <config.h>
-
-#undef int32_t
-#undef uint32_t
-#undef int16_t
-#undef uint16_t
-#undef int8_t
-#undef uint8_t
-
-/* Generate the fixed bit size types */
-#if SIZEOF_INT == 4
-  typedef int int32_t;
-  typedef unsigned int uint32_t;
-#else
-# if SIZEOF_LONG == 4
-  typedef long int32_t;
-  typedef unsigned long uint32_t;
-# else
-#  if SIZEOF_SHORT == 4
-    typedef short int32_t;
-    typedef unsigned short uint32_t;
-#  else
-#   error Must have a form of 32-bit integer
-#  endif
-# endif
-#endif
-
-#if SIZEOF_INT == 2
-  typedef int int16_t;
-  typedef unsigned int uint16_t;
-#else
-# if SIZEOF_LONG == 2
-   typedef long int16_t;
-   typedef unsigned long uint16_t;
-# else
-#  if SIZEOF_SHORT == 2
-    typedef short int16_t;
-    typedef unsigned short uint16_t;
-#  else
-#   error Must have a form of 16-bit integer
-#  endif
-# endif
-#endif
-
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
diff --git a/buildlib/makefile.in b/buildlib/makefile.in
index 756565f40..66144cfc6 100644
--- a/buildlib/makefile.in
+++ b/buildlib/makefile.in
@@ -31,11 +31,6 @@ maintainer-clean dist-clean pristine sanity distclean:
 .PHONY: dirs
 dirs: 
 	$(MAKE) -C $(SRCDIR) -f Makefile $@
-ifeq ($(HAVE_C9X),yes)
-	@rm -f include/inttypes.h > /dev/null 2>&1
-else
-	@cp -p $(SRCDIR)/buildlib/inttypes.h.in include/inttypes.h
-endif
 ifeq ($(HAVE_STATVFS),yes)
 	@rm -f include/statvfs.h > /dev/null 2>&1
 else
diff --git a/buildlib/sizetable b/buildlib/sizetable
deleted file mode 100644
index 372ddd091..000000000
--- a/buildlib/sizetable
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# This file lists common architectures for cross-compilation (CPUs, not
-# OSs), and the endian-ness and relative type sizes. It is not needed for
-# native compilation.
-#
-# If you wish to cross-compile APT, and your architecture is not listed
-# here, you should add it, and submit it by email to the APT team at
-# <apt@packages.debian.org>.
-#
-# This is used primarily for the MD5 algorithm.
-# The format is:-
-# CPU endian sizeof: char, int, short, long
-i386    little  1 4 2 4
-amd64   little  1 4 2 8
-armeb   big     1 4 2 4
-arm     little  1 4 2 4
-alpha   little  1 4 2 8
-mipsel  little  1 4 2 4
-sparc   big     1 4 2 4
-sparc64 big     1 4 2 8
-m68k    big     1 4 2 4
-powerpc big     1 4 2 4
-mips    big     1 4 2 4
-hppa    big     1 4 2 4
-m32r	big	1 4 2 4
-- 
cgit v1.2.3


From 7f9692a9e91be568d8cb5208924b8e49d5a75e39 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 18 Jun 2012 12:33:53 +0200
Subject: * buildlib/configure.mak:   - print a message detailing how to get
 config.guess and config.sub     in case they are not in /usr/share/misc
 (Closes: #677312)

---
 buildlib/configure.mak | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'buildlib')

diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index c0d8e3c76..68d0535b4 100644
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -12,15 +12,42 @@
 # It would be a fairly good idea to run this after a cvs checkout.
 BUILDDIR=build
 
-.PHONY: startup
+.PHONY: startup missing-config-files
 startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTED))
 
 # use the files provided from the system instead of carry around
 # and use (most of the time outdated) copycats
+ifeq (file-okay,$(shell test -r buildlib/config.sub && echo 'file-okay'))
+buildlib/config.sub:
+else
+   ifeq (file-okay,$(shell test -r /usr/share/misc/config.sub && echo 'file-okay'))
 buildlib/config.sub:
 	ln -sf /usr/share/misc/config.sub buildlib/config.sub
+   else
+buildlib/config.sub: missing-config-files
+   endif
+endif
+
+ifeq (file-okay,$(shell test -r buildlib/config.guess && echo 'file-okay'))
+buildlib/config.guess:
+else
+   ifeq (file-okay,$(shell test -r /usr/share/misc/config.guess && echo 'file-okay'))
 buildlib/config.guess:
 	ln -sf /usr/share/misc/config.guess buildlib/config.guess
+   else
+buildlib/config.guess: missing-config-files
+   endif
+endif
+
+missing-config-files:
+	@echo "APT needs 'config.guess' and 'config.sub' in buildlib/ for configuration."
+	@echo "On Debian systems these are available in the 'autotools-dev' package."
+	@echo
+	@echo "The latest versions can be acquired from the upstream git repository:"
+	@echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD"
+	@echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD"
+	exit 100
+
 configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub
 	autoconf
 
-- 
cgit v1.2.3


From 1098ae37273547d0b4c7d05c8c6b36db56c25443 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Fri, 29 Jun 2012 13:52:52 +0200
Subject: * debian/control:   - demote debiandoc-sgml to Build-Depends-Indep *
 doc/makefile:   - separate translation building of debiandoc from manpages   
  so that we don't need to build debiandoc for binary packages

---
 buildlib/debiandoc.mak    | 6 ++++--
 buildlib/defaults.mak     | 2 +-
 buildlib/po4a_manpage.mak | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'buildlib')

diff --git a/buildlib/debiandoc.mak b/buildlib/debiandoc.mak
index a97af0caf..7e22467cf 100644
--- a/buildlib/debiandoc.mak
+++ b/buildlib/debiandoc.mak
@@ -14,13 +14,15 @@ LOCAL := debiandoc-$(firstword $(SOURCE))
 $(LOCAL)-HTML := $(addsuffix .html,$(addprefix $(DOC)/,$(basename $(SOURCE))))
 $(LOCAL)-TEXT := $(addsuffix .text,$(addprefix $(DOC)/,$(basename $(SOURCE))))
 
+debiandoc:
+
 #---------
 
 # Rules to build HTML documentations
 ifdef DEBIANDOC_HTML
 
 # Install generation hooks
-doc: $($(LOCAL)-HTML)
+debiandoc: $($(LOCAL)-HTML)
 veryclean: veryclean/html/$(LOCAL)
 
 vpath %.sgml $(SUBDIRS)
@@ -42,7 +44,7 @@ endif
 ifdef DEBIANDOC_TEXT
 
 # Install generation hooks
-doc: $($(LOCAL)-TEXT)
+debiandoc: $($(LOCAL)-TEXT)
 veryclean: veryclean/text/$(LOCAL)
 
 vpath %.sgml $(SUBDIRS)
diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 7b084f4b9..5b970876a 100644
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -121,7 +121,7 @@ MKDIRS := $(BIN)
 all: dirs binary doc
 binary: library program
 maintainer-clean dist-clean distclean pristine sanity: veryclean
-startup headers library clean veryclean program test update-po manpages:
+startup headers library clean veryclean program test update-po manpages debiandoc:
 
 veryclean:
 	echo Very Clean done for $(SUBDIR)
diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index 1dedd0dcd..09eca0ec2 100644
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -13,6 +13,8 @@
 SOURCE = $(patsubst %.xml,%,$(wildcard *.$(LC).?.xml))
 INCLUDES = apt.ent apt-verbatim.ent
 
+manpages:
+
 # Do not use XMLTO, build the manpages directly with XSLTPROC
 ifdef XSLTPROC
 
@@ -22,7 +24,7 @@ LOCAL := po4a-manpage-$(firstword $(SOURCE))
 $(LOCAL)-LIST := $(SOURCE)
 
 # Install generation hooks
-doc: $($(LOCAL)-LIST)
+manpages: $($(LOCAL)-LIST)
 veryclean: veryclean/$(LOCAL)
 
 apt-verbatim.ent: ../apt-verbatim.ent
-- 
cgit v1.2.3