[dpkg] 47/187: data: Move architecture tables to a new data directory

[Reiner Herrmann]

This is an automated email from the git hooks/post-receive script.

deki-guest pushed a commit to branch master
in repository dpkg.

commit 97309bef8b664c2d58cb689a3e82848021ae9bad
Author: Guillem Jover <guillem at debian.org>
Date:   Wed Aug 10 23:52:03 2016 +0200

    data: Move architecture tables to a new data directory
---
 Makefile.am                       | 10 +++++-----
 abitable => data/abitable         |  0
 cputable => data/cputable         |  0
 ostable => data/ostable           |  0
 triplettable => data/triplettable |  0
 run-script                        |  2 +-
 scripts/Makefile.am               |  2 +-
 utils/Makefile.am                 |  2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7545120..0306eaf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,10 +19,10 @@ ACLOCAL_AMFLAGS = -I m4
 
 
 dist_pkgdata_DATA = \
-	cputable \
-	ostable \
-	abitable \
-	triplettable
+	data/cputable \
+	data/ostable \
+	data/abitable \
+	data/triplettable
 
 EXTRA_DIST = \
 	.mailmap \
@@ -161,7 +161,7 @@ test_data = \
 # We need to use absolute paths here due to strict.t invoking a sub-perl,
 # while changing dir to source dir on out-of-tree builds.
 TEST_ENV_VARS = \
-	DPKG_DATADIR=$(abs_top_srcdir) \
+	DPKG_DATADIR=$(abs_top_srcdir)/data \
 	$(nil)
 
 include $(top_srcdir)/check.am
diff --git a/abitable b/data/abitable
similarity index 100%
rename from abitable
rename to data/abitable
diff --git a/cputable b/data/cputable
similarity index 100%
rename from cputable
rename to data/cputable
diff --git a/ostable b/data/ostable
similarity index 100%
rename from ostable
rename to data/ostable
diff --git a/triplettable b/data/triplettable
similarity index 100%
rename from triplettable
rename to data/triplettable
diff --git a/run-script b/run-script
index 45ee7ef..dbc5dcc 100755
--- a/run-script
+++ b/run-script
@@ -11,7 +11,7 @@ cd "$OLDPWD"
 # Set up the environment, to use local perl modules and data files.
 export PERL="${PERL:-perl}"
 export PERL5LIB="$cwd/scripts:$cwd/dselect/methods"
-export DPKG_DATADIR="$cwd"
+export DPKG_DATADIR="$cwd/data"
 
 script="$1"
 shift 1
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index cf068d9..e8f982a 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -187,7 +187,7 @@ coverage-clean:
 	rm -rf cover_db
 
 TEST_ENV_VARS = \
-	DPKG_DATADIR=$(srcdir)/.. \
+	DPKG_DATADIR=$(top_srcdir)/data \
 	DPKG_ORIGINS_DIR=$(srcdir)/t/origins
 TEST_COVERAGE = $(PERL_COVERAGE)
 
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 83378ad..ed67e94 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -59,7 +59,7 @@ endif
 uninstall-local:
 	rm -f $(DESTDIR)$(sysconfdir)/alternatives/README
 
-TEST_ENV_VARS = DPKG_DATADIR=$(top_srcdir)
+TEST_ENV_VARS = DPKG_DATADIR=$(top_srcdir)/data
 
 test_tmpdir = t.tmp
 test_scripts = \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git