This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=4f39a9a91b45a0cc0f77d896ac298f03d762d693 commit 4f39a9a91b45a0cc0f77d896ac298f03d762d693 Author: Guillem Jover <[email protected]> AuthorDate: Sun May 31 00:26:11 2015 +0200 t-file-conflicts: Rename from t-conflict-file --- Makefile | 2 +- {t-conflict-file => t-file-conflicts}/Makefile | 0 {t-conflict-file => t-file-conflicts}/pkg-a/DEBIAN/control | 0 {t-conflict-file => t-file-conflicts}/pkg-a/test-conflict | 0 {t-conflict-file => t-file-conflicts}/pkg-b/DEBIAN/control | 0 {t-conflict-file => t-file-conflicts}/pkg-b/test-conflict | 0 6 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ede3b2751..9b6f5a9cc 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,6 @@ TESTS_PASS += t-provides-arch-qualified ifdef DPKG_HAS_SAME_RUN_BIDIRECTIONAL_CONFLICTS TESTS_PASS += t-conflicts endif -TESTS_PASS += t-conflict-file TESTS_PASS += t-conflict-provide-replace-real TESTS_PASS += t-conflict-provide-replace-virtual TESTS_PASS += t-conflict-provide-replace-virtual-multiarch @@ -103,6 +102,7 @@ TESTS_PASS += t-triggers-cycle ifdef DPKG_HAS_TRIGPROC_DEPCHECK TESTS_PASS += t-triggers-halt endif +TESTS_PASS += t-file-conflicts TESTS_PASS += t-file-replaces TESTS_PASS += t-file-replaces-disappear TESTS_PASS += t-file-replaces-versioned diff --git a/t-conflict-file/Makefile b/t-file-conflicts/Makefile similarity index 100% rename from t-conflict-file/Makefile rename to t-file-conflicts/Makefile diff --git a/t-conflict-file/pkg-a/DEBIAN/control b/t-file-conflicts/pkg-a/DEBIAN/control similarity index 100% rename from t-conflict-file/pkg-a/DEBIAN/control rename to t-file-conflicts/pkg-a/DEBIAN/control diff --git a/t-conflict-file/pkg-a/test-conflict b/t-file-conflicts/pkg-a/test-conflict similarity index 100% rename from t-conflict-file/pkg-a/test-conflict rename to t-file-conflicts/pkg-a/test-conflict diff --git a/t-conflict-file/pkg-b/DEBIAN/control b/t-file-conflicts/pkg-b/DEBIAN/control similarity index 100% rename from t-conflict-file/pkg-b/DEBIAN/control rename to t-file-conflicts/pkg-b/DEBIAN/control diff --git a/t-conflict-file/pkg-b/test-conflict b/t-file-conflicts/pkg-b/test-conflict similarity index 100% rename from t-conflict-file/pkg-b/test-conflict rename to t-file-conflicts/pkg-b/test-conflict -- Dpkg.Org's dpkg
