The following commit has been merged in the master branch:
commit 6f398047c2fd6b04e4f1ff8dea5530a3bec4a2db
Author: Sven Joachim <svenj...@gmx.de>
Date: Mon Jun 14 23:08:10 2010 +0200
Fix ”make distcheck“ errors
Reflect the rewrite of update-alternatives in commit
cab5af04fadcd939a7becd5fcb25dcfb7bc121dd and the addition of
scripts/t/origin in commit 2d4fd627d4286dc42006fb486040209d4e021b9f.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 673573c..d73536c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -68,6 +68,6 @@ dpkg-split/queue.c
dpkg-split/split.c
utils/start-stop-daemon.c
+utils/update-alternatives.c
scripts/dpkg-divert.pl
-scripts/update-alternatives.pl
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 8d2e642..c019619 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -27,7 +27,6 @@ changelog_SCRIPTS = \
changelog/debian
EXTRA_DIST = \
- README.alternatives \
dpkg-architecture.pl \
dpkg-buildflags.pl \
dpkg-buildpackage.pl \
@@ -222,7 +221,10 @@ test_data = \
t/910_merge_changelogs/ch-merged \
t/910_merge_changelogs/ch-merged-basic \
t/910_merge_changelogs/ch-merged-pr \
- t/910_merge_changelogs/ch-merged-pr-basic
+ t/910_merge_changelogs/ch-merged-pr-basic \
+ t/origins/debian \
+ t/origins/default \
+ t/origins/ubuntu
clean-local:
rm -fr man
diff --git a/utils/Makefile.am b/utils/Makefile.am
index e0947e2..40bffbd 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -10,6 +10,13 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir)/lib
+test_cases = \
+ t/100_update_alternatives.t
+
+EXTRA_DIST = \
+ README.alternatives \
+ $(test_cases)
+
bin_PROGRAMS =
if WITH_UPDATE_ALTERNATIVES
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
