[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.2.12-48-g608bfcc



The following commit has been merged in the master branch:
commit aabec081d1882cbd2fc3a940aa523e5feb709b50
Author: Russ Allbery <rra@debian.org>
Date:   Sun Jul 5 02:39:47 2009 -0700

    Merge files-windows-devel-file-in-package into files-general
    
    Remove the only new test case that wraps on an 80 column screen.

diff --git a/t/tests/files-windows-devel-file-in-package/debian/debian/examples b/t/tests/files-general/debian/debian/examples
similarity index 100%
rename from t/tests/files-windows-devel-file-in-package/debian/debian/examples
rename to t/tests/files-general/debian/debian/examples
diff --git a/t/tests/files-general/debian/debian/install b/t/tests/files-general/debian/debian/install
index aa0e69e..18bf731 100644
--- a/t/tests/files-general/debian/debian/install
+++ b/t/tests/files-general/debian/debian/install
@@ -3,3 +3,4 @@ lintian-22x22.png usr/share/apps/lintian/icons/hicolor/22x22
 --lzma etc/modprobe.d
 lintian.conf etc/modprobe.d
 dir usr/share/info
+foo.vcproj usr/lib/foo
diff --git a/t/tests/files-general/debian/foo.vcproj b/t/tests/files-general/debian/foo.vcproj
new file mode 100644
index 0000000..6ec1ca6
--- /dev/null
+++ b/t/tests/files-general/debian/foo.vcproj
@@ -0,0 +1 @@
+Not actually a VC project file.
diff --git a/t/tests/files-general/desc b/t/tests/files-general/desc
index 3c9e309..64e1cfc 100644
--- a/t/tests/files-general/desc
+++ b/t/tests/files-general/desc
@@ -11,3 +11,4 @@ Test-For:
  package-contains-empty-directory
  package-contains-info-dir-file
  stray-directory-in-manpage-directory
+ windows-devel-file-in-package
diff --git a/t/tests/files-general/tags b/t/tests/files-general/tags
index fbca809..431de07 100644
--- a/t/tests/files-general/tags
+++ b/t/tests/files-general/tags
@@ -7,3 +7,4 @@ E: files-general: stray-directory-in-manpage-directory usr/share/man/man1/random
 I: files-general: package-contains-empty-directory usr/share/man/man1/random/
 W: files-general: executable-not-elf-or-script ./usr/share/man/man5/foo.5.gz
 W: files-general: icon-size-and-directory-name-mismatch usr/share/apps/lintian/icons/hicolor/22x22/lintian-16x16.png 16x16
+W: files-general: windows-devel-file-in-package usr/lib/foo/foo.vcproj
diff --git a/t/tests/files-windows-devel-file-in-package/debian/Makefile b/t/tests/files-windows-devel-file-in-package/debian/Makefile
deleted file mode 100644
index 92f6a7c..0000000
--- a/t/tests/files-windows-devel-file-in-package/debian/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-default:
-	:
-
-install:
-	install -d $(DESTDIR)/usr/lib/foo
-	install -m644 foo.vcproj $(DESTDIR)/usr/lib/foo/foo.vcproj
-
-.PHONY: distclean realclean clean install test check
diff --git a/t/tests/files-windows-devel-file-in-package/debian/foo.vcproj b/t/tests/files-windows-devel-file-in-package/debian/foo.vcproj
deleted file mode 100644
index e69de29..0000000
diff --git a/t/tests/files-windows-devel-file-in-package/desc b/t/tests/files-windows-devel-file-in-package/desc
deleted file mode 100644
index 252b20d..0000000
--- a/t/tests/files-windows-devel-file-in-package/desc
+++ /dev/null
@@ -1,5 +0,0 @@
-Testname: files-windows-devel-file-in-package
-Sequence: 6000
-Version: 1.0
-Description: Test tag windows-devel-file-in-package
-Test-For: windows-devel-file-in-package
diff --git a/t/tests/files-windows-devel-file-in-package/tags b/t/tests/files-windows-devel-file-in-package/tags
deleted file mode 100644
index d8a4d52..0000000
--- a/t/tests/files-windows-devel-file-in-package/tags
+++ /dev/null
@@ -1 +0,0 @@
-W: files-windows-devel-file-in-package: windows-devel-file-in-package usr/lib/foo/foo.vcproj

-- 
Debian package checker


Reply to: