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

[SCM] Debian package checker branch, master, updated. 2.5.0-50-g50b4035



The following commit has been merged in the master branch:
commit a18a48c260ce43c95ae3980a1e6460cd3372dbda
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Jun 14 13:52:23 2011 +0200

    Removed the ia32 part of libbaz; gave nothing new
    
    The test started to fail, fixing it would cause architecture
    dependent tags and the actual tags left for ia32 are covered
    by other tests, so it has been removed.

diff --git a/testset/libbaz/debian/control b/testset/libbaz/debian/control
index 7feaa86..983084c 100644
--- a/testset/libbaz/debian/control
+++ b/testset/libbaz/debian/control
@@ -56,12 +56,3 @@ Description: debugging package
  Lintian.  It is part of the Lintian test suite and may do very odd
  things.  It should not be installed like a regular package.
 
-Package: ia32-libbaz2
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: multiarch package
- Regression test for lintian's handling of libraries (multiarch).
- .
- 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/testset/libbaz/debian/rules b/testset/libbaz/debian/rules
index 65cec1b..39ead41 100755
--- a/testset/libbaz/debian/rules
+++ b/testset/libbaz/debian/rules
@@ -30,15 +30,9 @@ binary-correct:
 	cp -a libbaz2.so.* debian/libbaz2/usr/lib
 	chmod a-x debian/libbaz2/usr/lib/*
 
-	# Also install in the multiarch path.
-	install -d debian/ia32-libbaz2/usr/lib/i486-linux-gnu
-	cp -a libbaz2.so.* debian/ia32-libbaz2/usr/lib/i486-linux-gnu
-	chmod a-x debian/ia32-libbaz2/usr/lib/i486-linux-gnu/*
-
 	# General stuff that is tested in other testsets:
-	dh_installdocs -plibbaz2 -plibbaz2-dev -plibbaz2-dbg -pia32-libbaz2
-	dh_installchangelogs -pia32-libbaz2
-	dh_compress -plibbaz2 -plibbaz2-dev -plibbaz2-dbg -pia32-libbaz2
+	dh_installdocs -plibbaz2 -plibbaz2-dev -plibbaz2-dbg
+	dh_compress -plibbaz2 -plibbaz2-dev -plibbaz2-dbg
 
 	# Mess up the libbaz2 changelog files to test the symlink handling.
 	ln -s /usr/share/doc/lintian/changelog.gz \
@@ -49,16 +43,14 @@ binary-correct:
 
 	# Okay, if either line is omitted, it should be noted
 	dh_strip --dbg-package=libbaz2-dbg -plibbaz2 -plibbaz2-dev
-	dh_strip -pia32-libbaz2
-	dh_makeshlibs -plibbaz2 -plibbaz2-dev -plibbaz2-dbg -pia32-libbaz2
-	dh_shlibdeps -plibbaz2 -plibbaz2-dev -plibbaz2-dbg -pia32-libbaz2
+	dh_makeshlibs -plibbaz2 -plibbaz2-dev -plibbaz2-dbg
+	dh_shlibdeps -plibbaz2 -plibbaz2-dev -plibbaz2-dbg
 
 	# and again, regular packaging stuff
-	dh_installdeb -plibbaz2 -plibbaz2-dev -plibbaz2-dbg -pia32-libbaz2
+	dh_installdeb -plibbaz2 -plibbaz2-dev -plibbaz2-dbg
 	echo udeb: libbaz2 1.0 libbaz2 >> debian/libbaz2/DEBIAN/shlibs
-	dh_gencontrol -plibbaz2 -plibbaz2-dev -plibbaz2-dbg -pia32-libbaz2
-	dh_md5sums -pia32-libbaz2
-	dh_builddeb -plibbaz2 -plibbaz2-dev -plibbaz2-dbg -pia32-libbaz2
+	dh_gencontrol -plibbaz2 -plibbaz2-dev -plibbaz2-dbg
+	dh_builddeb -plibbaz2 -plibbaz2-dev -plibbaz2-dbg
 
 # and the incorrect one
 binary-arch: build-arch binary-correct
diff --git a/testset/tags.libbaz b/testset/tags.libbaz
index 21f0d31..c47cda4 100644
--- a/testset/tags.libbaz
+++ b/testset/tags.libbaz
@@ -24,7 +24,6 @@ E: libbaz2-dbg: debian-changelog-file-missing
 E: libbaz2-dev: changelog-file-not-compressed changelog
 E: libbaz2-dev: debian-changelog-file-missing-or-wrong-name
 E: libbaz2: debian-changelog-file-missing-or-wrong-name
-I: ia32-libbaz2: no-symbols-control-file usr/lib/i486-linux-gnu/libbaz2.so.1.0.3b
 I: libbaz source: missing-debian-source-format
 I: libbaz1-dev: binary-has-unneeded-section usr/lib/perl5/auto/Foo/Foo.so .comment
 I: libbaz1-dev: no-md5sums-control-file
@@ -36,10 +35,8 @@ I: libbaz2-dev: no-md5sums-control-file
 I: libbaz2: no-md5sums-control-file
 I: libbaz2: no-symbols-control-file usr/lib/libbaz2.so.1.0.3b
 N: 4 tags overridden (4 warnings)
-W: ia32-libbaz2: new-package-should-close-itp-bug
 W: libbaz source: ancient-standards-version 3.2.1 (current is 3.9.2)
 W: libbaz source: changelog-should-mention-nmu
-W: libbaz source: debhelper-but-no-misc-depends ia32-libbaz2
 W: libbaz source: debhelper-but-no-misc-depends libbaz1
 W: libbaz source: debhelper-but-no-misc-depends libbaz1-dev
 W: libbaz source: debhelper-but-no-misc-depends libbaz2

-- 
Debian package checker


Reply to: