From eef71f11a5836eb82df133cb4e24cb4806642188 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 30 Nov 2013 14:01:28 +0100
Subject: introduce a vendor system to change sources.list

Many derivatives make quiet a few simple changes to apt introducing
silly diffs just to change examples and co making it harder for
them to update apt and harder for us to merge real changes back.

First stop: doc/examples/sources.list
---
 doc/makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'doc/makefile')

diff --git a/doc/makefile b/doc/makefile
index 274fbc278..ebaca908f 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -12,8 +12,9 @@ include $(DEBIANDOC_H)
 
 doc: manpages debiandoc
 
-examples/sources.list: examples/sources.list.in apt-verbatim.ent
-	sed -e 's#&stable-codename;#$(shell grep --max-count=1 '^<!ENTITY stable-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list
+examples/sources.list: ../vendor/current/sources.list
+	ln -sf $(shell readlink -f $^) $@
+
 
 # Examples
 SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf
@@ -23,8 +24,8 @@ include $(COPY_H)
 
 .PHONY: clean clean/subdirs veryclean veryclean/subdirs manpages/subdirs debiandoc/subdirs all binary doc stats
 
-clean: clean/subdirs
-veryclean: veryclean/subdirs
+clean: clean/subdirs clean/examples
+veryclean: veryclean/subdirs clean/examples
 manpages: manpages/subdirs
 debiandoc: debiandoc/subdirs
 
@@ -41,6 +42,9 @@ debiandoc/subdirs manpages/subdirs clean/subdirs veryclean/subdirs:
 		$(MAKE) -C $$dir $(patsubst %/subdirs,%,$@); \
 	done
 
+clean/examples:
+	rm -f examples/sources.list
+
 stats:
 	for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done
 
-- 
cgit v1.2.3


From 694ef56e802bbab94595fc491fdc6ef8b4f525c1 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 30 Nov 2013 19:15:02 +0100
Subject: add a vendor specific file to have configurable entities

manpages sometimes refer to distro-specific things like the name of the
package providing the achive-keyring. Having a central place to
configure this helps in having it consistent in the manpages and allows
to load this info from other places in the buildsystem as well later.
---
 doc/makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'doc/makefile')

diff --git a/doc/makefile b/doc/makefile
index ebaca908f..49f3e1b56 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -15,6 +15,8 @@ doc: manpages debiandoc
 examples/sources.list: ../vendor/current/sources.list
 	ln -sf $(shell readlink -f $^) $@
 
+apt-vendor.ent: ../vendor/current/apt-vendor.ent
+	ln -sf $(shell readlink -f $^) $@
 
 # Examples
 SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf
@@ -26,7 +28,7 @@ include $(COPY_H)
 
 clean: clean/subdirs clean/examples
 veryclean: veryclean/subdirs clean/examples
-manpages: manpages/subdirs
+manpages: manpages/subdirs apt-vendor.ent
 debiandoc: debiandoc/subdirs
 
 DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po)))
@@ -44,6 +46,7 @@ debiandoc/subdirs manpages/subdirs clean/subdirs veryclean/subdirs:
 
 clean/examples:
 	rm -f examples/sources.list
+	rm -f apt-vendor.ent
 
 stats:
 	for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done
-- 
cgit v1.2.3


From 5cc8cbf368251c4be4ffa1482fa5fb6b9d950452 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Fri, 6 Dec 2013 17:29:50 +0100
Subject: fix build failure with the new apt-vendors stuff

---
 doc/makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/makefile')

diff --git a/doc/makefile b/doc/makefile
index 49f3e1b56..4b63e542f 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -28,7 +28,7 @@ include $(COPY_H)
 
 clean: clean/subdirs clean/examples
 veryclean: veryclean/subdirs clean/examples
-manpages: manpages/subdirs apt-vendor.ent
+manpages: apt-vendor.ent manpages/subdirs
 debiandoc: debiandoc/subdirs
 
 DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po)))
-- 
cgit v1.2.3