r20797 - in /trunk/libsys-utmp-perl: debian/changelog debian/control debian/patches/ debian/patches/empty_utmp.patch debian/patches/series debian/rules t/06taint.t t/07utent_methods.t t/08utent_types.t
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sat Jun 7 00:38:13 UTC 2008
Author: gregoa
Date: Sat Jun 7 00:38:13 2008
New Revision: 20797
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20797
Log:
* Set Standards-Version to 3.7.3 (no changes).
* Split fix for the test suite out into empty_utmp.patch; add quilt
framework.
* Refresh debian/rules, no functional changes.
* Activate additional tests by adding build dependencies on
libtest-pod-perl, libtest-pod-coverage-perl.
Added:
trunk/libsys-utmp-perl/debian/patches/
trunk/libsys-utmp-perl/debian/patches/empty_utmp.patch
trunk/libsys-utmp-perl/debian/patches/series
Modified:
trunk/libsys-utmp-perl/debian/changelog
trunk/libsys-utmp-perl/debian/control
trunk/libsys-utmp-perl/debian/rules
trunk/libsys-utmp-perl/t/06taint.t
trunk/libsys-utmp-perl/t/07utent_methods.t
trunk/libsys-utmp-perl/t/08utent_types.t
Modified: trunk/libsys-utmp-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-utmp-perl/debian/changelog?rev=20797&op=diff
==============================================================================
--- trunk/libsys-utmp-perl/debian/changelog (original)
+++ trunk/libsys-utmp-perl/debian/changelog Sat Jun 7 00:38:13 2008
@@ -4,11 +4,12 @@
field (source stanza); Homepage field (source stanza). Removed: XS-
Vcs-Svn fields.
* Use dist-based URL in debian/watch.
- * debian/rules:
- - don't install empty /usr/share/perl5 directory
- - use $(CURDIR) instead of `pwd`
- - let install target depend on build target
- * debian/rules: delete /usr/share/perl5 only if it exists.
+ * Set Standards-Version to 3.7.3 (no changes).
+ * Split fix for the test suite out into empty_utmp.patch; add quilt
+ framework.
+ * Refresh debian/rules, no functional changes.
+ * Activate additional tests by adding build dependencies on
+ libtest-pod-perl, libtest-pod-coverage-perl.
-- gregor herrmann <gregor+debian at comodo.priv.at> Tue, 09 Oct 2007 22:32:06 +0200
Modified: trunk/libsys-utmp-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-utmp-perl/debian/control?rev=20797&op=diff
==============================================================================
--- trunk/libsys-utmp-perl/debian/control (original)
+++ trunk/libsys-utmp-perl/debian/control Sat Jun 7 00:38:13 2008
@@ -1,9 +1,10 @@
Source: libsys-utmp-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 5), perl (>= 5.8), dpkg-dev (>= 1.9.0)
+Build-Depends: debhelper (>= 5), perl (>= 5.8), dpkg-dev (>= 1.9.0),
+ quilt (>= 0.40), libtest-pod-perl, libtest-pod-coverage-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Homepage: http://search.cpan.org/dist/Sys-Utmp/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libsys-utmp-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-utmp-perl/
Added: trunk/libsys-utmp-perl/debian/patches/empty_utmp.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-utmp-perl/debian/patches/empty_utmp.patch?rev=20797&op=file
==============================================================================
--- trunk/libsys-utmp-perl/debian/patches/empty_utmp.patch (added)
+++ trunk/libsys-utmp-perl/debian/patches/empty_utmp.patch Sat Jun 7 00:38:13 2008
@@ -1,0 +1,69 @@
+Author: Joey Hess <joeyh at debian.org>
+Description: Fix the test suite to not die if the utmp file is empty.
+Bug: #394618
+
+--- libsys-utmp-perl.orig/t/06taint.t
++++ libsys-utmp-perl/t/06taint.t
+@@ -23,5 +23,8 @@
+
+ my $utent = $utmp->getutent();
+
+-ok(tainted($utent->ut_user()),"ut_user is tainted");
+-ok(tainted($utent->ut_host()),"ut_host is tainted");
++SKIP: {
++ skip "no utmp entries", 2 if ! $utent;
++ ok(tainted($utent->ut_user()),"ut_user is tainted");
++ ok(tainted($utent->ut_host()),"ut_host is tainted");
++}
+--- libsys-utmp-perl.orig/t/07utent_methods.t
++++ libsys-utmp-perl/t/07utent_methods.t
+@@ -7,10 +7,13 @@
+
+ my $utent = $utmp->getutent();
+
+-ok(defined $utent->ut_user(),"ut_user");
+-ok(defined $utent->ut_id(),"ut_id");
+-ok(defined $utent->ut_line(),"ut_line");
+-ok(defined $utent->ut_pid(),"ut_pid");
+-ok(defined $utent->ut_type(),"ut_type");
+-ok(defined $utent->ut_host(),"ut_host");
+-ok(defined $utent->ut_time(),"ut_time");
++SKIP: {
++ skip "no utmp entries", 7 if ! $utent;
++ ok(defined $utent->ut_user(),"ut_user");
++ ok(defined $utent->ut_id(),"ut_id");
++ ok(defined $utent->ut_line(),"ut_line");
++ ok(defined $utent->ut_pid(),"ut_pid");
++ ok(defined $utent->ut_type(),"ut_type");
++ ok(defined $utent->ut_host(),"ut_host");
++ ok(defined $utent->ut_time(),"ut_time");
++}
+--- libsys-utmp-perl.orig/t/08utent_types.t
++++ libsys-utmp-perl/t/08utent_types.t
+@@ -6,13 +6,16 @@
+ my $utmp = Sys::Utmp->new();
+ my $utent = $utmp->getutent();
+
+-ok(defined $utent->accounting(),"accounting");
+-ok(defined $utent->boot_time(),"boot_time");
+-ok(defined $utent->dead_process(),"dead_process");
+-ok(defined $utent->empty(),"empty");
+-ok(defined $utent->init_process(),"init_process");
+-ok(defined $utent->login_process(),"login_process");
+-ok(defined $utent->new_time(),"new_time");
+-ok(defined $utent->old_time(),"old_time");
+-ok(defined $utent->run_lvl(),"run_lvl");
+-ok(defined $utent->user_process(),"user_process");
++SKIP: {
++ skip "no utmp entries", 10 if ! $utent;
++ ok(defined $utent->accounting(),"accounting");
++ ok(defined $utent->boot_time(),"boot_time");
++ ok(defined $utent->dead_process(),"dead_process");
++ ok(defined $utent->empty(),"empty");
++ ok(defined $utent->init_process(),"init_process");
++ ok(defined $utent->login_process(),"login_process");
++ ok(defined $utent->new_time(),"new_time");
++ ok(defined $utent->old_time(),"old_time");
++ ok(defined $utent->run_lvl(),"run_lvl");
++ ok(defined $utent->user_process(),"user_process");
++}
Added: trunk/libsys-utmp-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-utmp-perl/debian/patches/series?rev=20797&op=file
==============================================================================
--- trunk/libsys-utmp-perl/debian/patches/series (added)
+++ trunk/libsys-utmp-perl/debian/patches/series Sat Jun 7 00:38:13 2008
@@ -1,0 +1,1 @@
+empty_utmp.patch
Modified: trunk/libsys-utmp-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-utmp-perl/debian/rules?rev=20797&op=diff
==============================================================================
--- trunk/libsys-utmp-perl/debian/rules (original)
+++ trunk/libsys-utmp-perl/debian/rules Sat Jun 7 00:38:13 2008
@@ -1,50 +1,78 @@
#!/usr/bin/make -f
+# This debian/rules file is provided as a template for normal perl
+# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
+# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
+# be used freely wherever it is useful.
-OPTIMIZE = -O2 -Wall -g
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# If set to a true value then MakeMaker's prompt function will
+# always return the default without waiting for user input.
+export PERL_MM_USE_DEFAULT=1
+
+include /usr/share/quilt/quilt.make
+
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
+
+# Allow disabling build optimisation by setting noopt in
+# $DEB_BUILD_OPTIONS
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
-
- perl Makefile.PL INSTALLDIRS=vendor
- $(MAKE) OPTIMIZE="$(OPTIMIZE)"
+ $(PERL) Makefile.PL INSTALLDIRS=vendor
+ $(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
if [ -e /var/run/utmp ]; then \
$(MAKE) test; \
fi
- touch build-stamp
+ touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp
- if [ -e Makefile ]; then $(MAKE) realclean; fi
- dh_clean
+ dh_clean build-stamp install-stamp
+ [ ! -f Makefile ] || $(MAKE) realclean
-install: build
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
- $(MAKE) install PREFIX=$(CURDIR)/debian/libsys-utmp-perl/usr
- [ ! -d $(CURDIR)/debian/libsys-utmp-perl/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/libsys-utmp-perl/usr/share/perl5
+ $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+ [ ! -d $(TMP)/usr/share/perl5 ] || \
+ rmdir --ignore-fail-on-non-empty --parents --verbose \
+ $(TMP)/usr/share/perl5
+ touch $@
+# Build architecture-independent files here.
binary-indep: build install
+# We have nothing to do here for an architecture-dependent package
+# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
+ dh_installexamples examples/*
dh_installdocs
- dh_installexamples examples/pwho
dh_installchangelogs Changes
+ dh_shlibdeps
dh_strip
+ dh_perl
dh_compress
dh_fixperms
dh_installdeb
- dh_perl
- dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build clean binary-indep binary-arch binary install
Modified: trunk/libsys-utmp-perl/t/06taint.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-utmp-perl/t/06taint.t?rev=20797&op=diff
==============================================================================
--- trunk/libsys-utmp-perl/t/06taint.t (original)
+++ trunk/libsys-utmp-perl/t/06taint.t Sat Jun 7 00:38:13 2008
@@ -23,8 +23,5 @@
my $utent = $utmp->getutent();
-SKIP: {
- skip "no utmp entries", 2 if ! $utent;
- ok(tainted($utent->ut_user()),"ut_user is tainted");
- ok(tainted($utent->ut_host()),"ut_host is tainted");
-}
+ok(tainted($utent->ut_user()),"ut_user is tainted");
+ok(tainted($utent->ut_host()),"ut_host is tainted");
Modified: trunk/libsys-utmp-perl/t/07utent_methods.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-utmp-perl/t/07utent_methods.t?rev=20797&op=diff
==============================================================================
--- trunk/libsys-utmp-perl/t/07utent_methods.t (original)
+++ trunk/libsys-utmp-perl/t/07utent_methods.t Sat Jun 7 00:38:13 2008
@@ -7,13 +7,10 @@
my $utent = $utmp->getutent();
-SKIP: {
- skip "no utmp entries", 7 if ! $utent;
- ok(defined $utent->ut_user(),"ut_user");
- ok(defined $utent->ut_id(),"ut_id");
- ok(defined $utent->ut_line(),"ut_line");
- ok(defined $utent->ut_pid(),"ut_pid");
- ok(defined $utent->ut_type(),"ut_type");
- ok(defined $utent->ut_host(),"ut_host");
- ok(defined $utent->ut_time(),"ut_time");
-}
+ok(defined $utent->ut_user(),"ut_user");
+ok(defined $utent->ut_id(),"ut_id");
+ok(defined $utent->ut_line(),"ut_line");
+ok(defined $utent->ut_pid(),"ut_pid");
+ok(defined $utent->ut_type(),"ut_type");
+ok(defined $utent->ut_host(),"ut_host");
+ok(defined $utent->ut_time(),"ut_time");
Modified: trunk/libsys-utmp-perl/t/08utent_types.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-utmp-perl/t/08utent_types.t?rev=20797&op=diff
==============================================================================
--- trunk/libsys-utmp-perl/t/08utent_types.t (original)
+++ trunk/libsys-utmp-perl/t/08utent_types.t Sat Jun 7 00:38:13 2008
@@ -6,16 +6,13 @@
my $utmp = Sys::Utmp->new();
my $utent = $utmp->getutent();
-SKIP: {
- skip "no utmp entries", 10 if ! $utent;
- ok(defined $utent->accounting(),"accounting");
- ok(defined $utent->boot_time(),"boot_time");
- ok(defined $utent->dead_process(),"dead_process");
- ok(defined $utent->empty(),"empty");
- ok(defined $utent->init_process(),"init_process");
- ok(defined $utent->login_process(),"login_process");
- ok(defined $utent->new_time(),"new_time");
- ok(defined $utent->old_time(),"old_time");
- ok(defined $utent->run_lvl(),"run_lvl");
- ok(defined $utent->user_process(),"user_process");
-}
+ok(defined $utent->accounting(),"accounting");
+ok(defined $utent->boot_time(),"boot_time");
+ok(defined $utent->dead_process(),"dead_process");
+ok(defined $utent->empty(),"empty");
+ok(defined $utent->init_process(),"init_process");
+ok(defined $utent->login_process(),"login_process");
+ok(defined $utent->new_time(),"new_time");
+ok(defined $utent->old_time(),"old_time");
+ok(defined $utent->run_lvl(),"run_lvl");
+ok(defined $utent->user_process(),"user_process");
More information about the Pkg-perl-cvs-commits
mailing list