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

[SCM] Debian package checker branch, master, updated. 2.2.5-46-g477283b



The following commit has been merged in the master branch:
commit 73adb068f13bf875e882a11d984b3b1162c84823
Author: Russ Allbery <rra@debian.org>
Date:   Sat Feb 21 17:15:18 2009 -0800

    Add new test cases for upstream source tarball construction

diff --git a/t/source/unpack-srcpkg-dot-dir/Makefile b/t/source/unpack-srcpkg-dot-dir/Makefile
new file mode 100644
index 0000000..32c04fb
--- /dev/null
+++ b/t/source/unpack-srcpkg-dot-dir/Makefile
@@ -0,0 +1,18 @@
+name = unpack-srcpkg-dot-dir
+dir  = $(name)-1.0
+
+all:
+	echo 'Some upstream README' > README
+	echo '/* some C program */' > foo.c
+	echo '/* some header */' > foo.h
+	tar -c -z -f $(name)_1.0.orig.tar.gz ./README ./foo.c ./foo.h
+	mkdir -p $(dir)/debian
+	cp README foo.c foo.h $(dir)
+	cp changelog copyright control rules $(dir)/debian/
+	echo 7 > $(dir)/debian/compat
+	echo > $(dir)/debian/watch
+	dpkg-source -sp -b $(dir)
+
+clean:
+	rm -rf $(dir)
+	rm -f $(name)_1.0* README foo.c foo.h
diff --git a/t/source/unpack-srcpkg-lzma/changelog b/t/source/unpack-srcpkg-dot-dir/changelog
similarity index 58%
copy from t/source/unpack-srcpkg-lzma/changelog
copy to t/source/unpack-srcpkg-dot-dir/changelog
index dec3a7c..c121383 100644
--- a/t/source/unpack-srcpkg-lzma/changelog
+++ b/t/source/unpack-srcpkg-dot-dir/changelog
@@ -1,9 +1,9 @@
-unpack-srcpkg-lzma (1.0-1) unstable; urgency=low
+unpack-srcpkg-dot-dir (1.0-1) unstable; urgency=low
 
   * Lintian Test Suite.
-  * Test: unpack-srcpkg-lzma
+  * Test: unpack-srcpkg-dot-dir
 
   * Suppress "should close ITP bug" messages.  (Closes: #123456)
 
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 13:59:17 -0800
+ -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 15:30:54 -0800
 
diff --git a/t/source/unpack-srcpkg-lzma/control b/t/source/unpack-srcpkg-dot-dir/control
similarity index 74%
copy from t/source/unpack-srcpkg-lzma/control
copy to t/source/unpack-srcpkg-dot-dir/control
index 2d6a4aa..1663213 100644
--- a/t/source/unpack-srcpkg-lzma/control
+++ b/t/source/unpack-srcpkg-dot-dir/control
@@ -1,15 +1,14 @@
-Source: unpack-srcpkg-lzma
-Format: 3.0 (quilt)
+Source: unpack-srcpkg-dot-dir
 Section: devel
 Priority: optional
 Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
 Build-Depends: debhelper (>= 7)
 Standards-Version: 3.8.0
 
-Package: unpack-srcpkg-lzma
+Package: unpack-srcpkg-dot-dir
 Architecture: all
 Depends: ${misc:Depends}
-Description: Test package for lzma-compressed source packages
+Description: Test package for upstream tar files with a ./ prefix
  This is a test package designed to exercise some feature or tag of
  Lintian.  It is part of the Lintian test suite and may do very odd
  things.  It should not be installed like a regular package.
diff --git a/t/debs/deb-format-extra-member/copyright b/t/source/unpack-srcpkg-dot-dir/copyright
similarity index 100%
copy from t/debs/deb-format-extra-member/copyright
copy to t/source/unpack-srcpkg-dot-dir/copyright
diff --git a/t/source/unpack-srcpkg-lzma/rules b/t/source/unpack-srcpkg-dot-dir/rules
similarity index 100%
copy from t/source/unpack-srcpkg-lzma/rules
copy to t/source/unpack-srcpkg-dot-dir/rules
diff --git a/t/tests/basic-non-native-with-epoch/tags b/t/source/unpack-srcpkg-dot-dir/tags
similarity index 100%
copy from t/tests/basic-non-native-with-epoch/tags
copy to t/source/unpack-srcpkg-dot-dir/tags
diff --git a/t/source/unpack-srcpkg-dot-subdir/Makefile b/t/source/unpack-srcpkg-dot-subdir/Makefile
new file mode 100644
index 0000000..dddab17
--- /dev/null
+++ b/t/source/unpack-srcpkg-dot-subdir/Makefile
@@ -0,0 +1,17 @@
+name = unpack-srcpkg-dot-subdir
+
+all:
+	mkdir $(name)
+	echo 'Some upstream README' > $(name)/README
+	echo '/* some C program */' > $(name)/foo.c
+	echo '/* some header */' > $(name)/foo.h
+	tar -c -z -f $(name)_1.0.orig.tar.gz ./$(name)
+	mkdir -p $(name)/debian
+	cp changelog copyright control rules $(name)/debian/
+	echo 7 > $(name)/debian/compat
+	echo > $(name)/debian/watch
+	dpkg-source -sp -b $(name)
+
+clean:
+	rm -rf $(name)
+	rm -f $(name)_1.0* README foo.c foo.h
diff --git a/t/source/unpack-srcpkg-lzma/changelog b/t/source/unpack-srcpkg-dot-subdir/changelog
similarity index 57%
copy from t/source/unpack-srcpkg-lzma/changelog
copy to t/source/unpack-srcpkg-dot-subdir/changelog
index dec3a7c..6727899 100644
--- a/t/source/unpack-srcpkg-lzma/changelog
+++ b/t/source/unpack-srcpkg-dot-subdir/changelog
@@ -1,9 +1,9 @@
-unpack-srcpkg-lzma (1.0-1) unstable; urgency=low
+unpack-srcpkg-dot-subdir (1.0-1) unstable; urgency=low
 
   * Lintian Test Suite.
-  * Test: unpack-srcpkg-lzma
+  * Test: unpack-srcpkg-dot-subdir
 
   * Suppress "should close ITP bug" messages.  (Closes: #123456)
 
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 13:59:17 -0800
+ -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 15:30:54 -0800
 
diff --git a/t/source/unpack-srcpkg-lzma/control b/t/source/unpack-srcpkg-dot-subdir/control
similarity index 74%
copy from t/source/unpack-srcpkg-lzma/control
copy to t/source/unpack-srcpkg-dot-subdir/control
index 2d6a4aa..e48d43c 100644
--- a/t/source/unpack-srcpkg-lzma/control
+++ b/t/source/unpack-srcpkg-dot-subdir/control
@@ -1,15 +1,14 @@
-Source: unpack-srcpkg-lzma
-Format: 3.0 (quilt)
+Source: unpack-srcpkg-dot-subdir
 Section: devel
 Priority: optional
 Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
 Build-Depends: debhelper (>= 7)
 Standards-Version: 3.8.0
 
-Package: unpack-srcpkg-lzma
+Package: unpack-srcpkg-dot-subdir
 Architecture: all
 Depends: ${misc:Depends}
-Description: Test package for lzma-compressed source packages
+Description: Test package for upstream tar files with a ./ prefix
  This is a test package designed to exercise some feature or tag of
  Lintian.  It is part of the Lintian test suite and may do very odd
  things.  It should not be installed like a regular package.
diff --git a/t/debs/deb-format-extra-member/copyright b/t/source/unpack-srcpkg-dot-subdir/copyright
similarity index 100%
copy from t/debs/deb-format-extra-member/copyright
copy to t/source/unpack-srcpkg-dot-subdir/copyright
diff --git a/t/source/unpack-srcpkg-lzma/rules b/t/source/unpack-srcpkg-dot-subdir/rules
similarity index 100%
copy from t/source/unpack-srcpkg-lzma/rules
copy to t/source/unpack-srcpkg-dot-subdir/rules
diff --git a/t/tests/basic-non-native-with-epoch/tags b/t/source/unpack-srcpkg-dot-subdir/tags
similarity index 100%
copy from t/tests/basic-non-native-with-epoch/tags
copy to t/source/unpack-srcpkg-dot-subdir/tags
diff --git a/t/source/unpack-srcpkg-no-subdir/Makefile b/t/source/unpack-srcpkg-no-subdir/Makefile
new file mode 100644
index 0000000..0058819
--- /dev/null
+++ b/t/source/unpack-srcpkg-no-subdir/Makefile
@@ -0,0 +1,18 @@
+name = unpack-srcpkg-no-subdir
+dir  = $(name)-1.0
+
+all:
+	echo 'Some upstream README' > README
+	echo '/* some C program */' > foo.c
+	echo '/* some header */' > foo.h
+	tar -c -z -f $(name)_1.0.orig.tar.gz README foo.c foo.h
+	mkdir -p $(dir)/debian
+	cp README foo.c foo.h $(dir)
+	cp changelog copyright control rules $(dir)/debian/
+	echo 7 > $(dir)/debian/compat
+	echo > $(dir)/debian/watch
+	dpkg-source -sp -b $(dir)
+
+clean:
+	rm -rf $(dir)
+	rm -f $(name)_1.0* README foo.c foo.h
diff --git a/t/source/unpack-srcpkg-lzma/changelog b/t/source/unpack-srcpkg-no-subdir/changelog
similarity index 57%
copy from t/source/unpack-srcpkg-lzma/changelog
copy to t/source/unpack-srcpkg-no-subdir/changelog
index dec3a7c..4a0735c 100644
--- a/t/source/unpack-srcpkg-lzma/changelog
+++ b/t/source/unpack-srcpkg-no-subdir/changelog
@@ -1,9 +1,9 @@
-unpack-srcpkg-lzma (1.0-1) unstable; urgency=low
+unpack-srcpkg-no-subdir (1.0-1) unstable; urgency=low
 
   * Lintian Test Suite.
-  * Test: unpack-srcpkg-lzma
+  * Test: unpack-srcpkg-no-subdir
 
   * Suppress "should close ITP bug" messages.  (Closes: #123456)
 
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 13:59:17 -0800
+ -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 15:30:54 -0800
 
diff --git a/t/source/unpack-srcpkg-lzma/control b/t/source/unpack-srcpkg-no-subdir/control
similarity index 74%
copy from t/source/unpack-srcpkg-lzma/control
copy to t/source/unpack-srcpkg-no-subdir/control
index 2d6a4aa..4a58817 100644
--- a/t/source/unpack-srcpkg-lzma/control
+++ b/t/source/unpack-srcpkg-no-subdir/control
@@ -1,15 +1,14 @@
-Source: unpack-srcpkg-lzma
-Format: 3.0 (quilt)
+Source: unpack-srcpkg-no-subdir
 Section: devel
 Priority: optional
 Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
 Build-Depends: debhelper (>= 7)
 Standards-Version: 3.8.0
 
-Package: unpack-srcpkg-lzma
+Package: unpack-srcpkg-no-subdir
 Architecture: all
 Depends: ${misc:Depends}
-Description: Test package for lzma-compressed source packages
+Description: Test package for upstream tar files with no subdirectories
  This is a test package designed to exercise some feature or tag of
  Lintian.  It is part of the Lintian test suite and may do very odd
  things.  It should not be installed like a regular package.
diff --git a/t/debs/deb-format-extra-member/copyright b/t/source/unpack-srcpkg-no-subdir/copyright
similarity index 100%
copy from t/debs/deb-format-extra-member/copyright
copy to t/source/unpack-srcpkg-no-subdir/copyright
diff --git a/t/source/unpack-srcpkg-lzma/rules b/t/source/unpack-srcpkg-no-subdir/rules
similarity index 100%
copy from t/source/unpack-srcpkg-lzma/rules
copy to t/source/unpack-srcpkg-no-subdir/rules
diff --git a/t/tests/basic-non-native-with-epoch/tags b/t/source/unpack-srcpkg-no-subdir/tags
similarity index 100%
copy from t/tests/basic-non-native-with-epoch/tags
copy to t/source/unpack-srcpkg-no-subdir/tags

-- 
Debian package checker


Reply to: