r9276 - in /trunk/libsearch-xapian-perl/debian: changelog control patches/ patches/series patches/stop_failing_tests_on_values_begin.patch rules

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Wed Nov 14 14:37:01 UTC 2007


Author: dmn
Date: Wed Nov 14 14:37:01 2007
New Revision: 9276

URL: http://svn.debian.org/wsvn/?sc=1&rev=9276
Log:
* Add patch siggested by upstream for avoiding failing in t/threads.t
  See http://thread.gmane.org/gmane.comp.search.xapian.general/5425
* Migrate the change to t/03podcoverage.t to a separate patch
* Add quilt to Build-Depends and debian/rules
* Add myself to Uploaders

Added:
    trunk/libsearch-xapian-perl/debian/patches/
    trunk/libsearch-xapian-perl/debian/patches/series
    trunk/libsearch-xapian-perl/debian/patches/stop_failing_tests_on_values_begin.patch
Modified:
    trunk/libsearch-xapian-perl/debian/changelog
    trunk/libsearch-xapian-perl/debian/control
    trunk/libsearch-xapian-perl/debian/rules

Modified: trunk/libsearch-xapian-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libsearch-xapian-perl/debian/changelog?rev=9276&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/debian/changelog (original)
+++ trunk/libsearch-xapian-perl/debian/changelog Wed Nov 14 14:37:01 2007
@@ -17,8 +17,13 @@
   * Add libtest-pod-coverage-perl to B-D-I, but do not enable the test yet, as
     most of them fail :/
   * Update copyright years and download URL
+  * Add patch siggested by upstream for avoiding failing in t/threads.t
+    See http://thread.gmane.org/gmane.comp.search.xapian.general/5425
+  * Migrate the change to t/03podcoverage.t to a separate patch
+  * Add quilt to Build-Depends and debian/rules
+  * Add myself to Uploaders
 
- -- Damyan Ivanov <dmn at debian.org>  Wed, 14 Nov 2007 13:24:53 +0200
+ -- Damyan Ivanov <dmn at debian.org>  Wed, 14 Nov 2007 16:35:57 +0200
 
 libsearch-xapian-perl (1.0.2.0-1) unstable; urgency=low
 

Modified: trunk/libsearch-xapian-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libsearch-xapian-perl/debian/control?rev=9276&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/debian/control (original)
+++ trunk/libsearch-xapian-perl/debian/control Wed Nov 14 14:37:01 2007
@@ -1,13 +1,17 @@
 Source: libsearch-xapian-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5), perl (>= 5.8.0-7), libtest-pod-perl, libtest-pod-coverage-perl, libxapian-dev (>= 1.0.4)
+Build-Depends: debhelper (>= 5), perl (>= 5.8.0-7), libtest-pod-perl,
+ libtest-pod-coverage-perl, libxapian-dev (>= 1.0.4), quilt
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Frank Lichtenheld <djpig at debian.org>, Olly Betts <olly at survex.com>, gregor herrmann <gregor+debian at comodo.priv.at>, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
+Uploaders: Frank Lichtenheld <djpig at debian.org>, Olly Betts <olly at survex.com>,
+ gregor herrmann <gregor+debian at comodo.priv.at>,
+ Krzysztof Krzyzaniak (eloy) <eloy at debian.org>,
+ Damyan Ivanov <dmn at debian.org>
 Standards-Version: 3.7.2
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libsearch-xapian-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libsearch-xapian-perl/
-Homepage: http://www.xapian.org/ 
+Homepage: http://www.xapian.org/
 
 Package: libsearch-xapian-perl
 Architecture: any

Added: trunk/libsearch-xapian-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libsearch-xapian-perl/debian/patches/series?rev=9276&op=file
==============================================================================
--- trunk/libsearch-xapian-perl/debian/patches/series (added)
+++ trunk/libsearch-xapian-perl/debian/patches/series Wed Nov 14 14:37:01 2007
@@ -1,0 +1,2 @@
+test_pod_coverage_with_separate_env_var.patch
+stop_failing_tests_on_values_begin.patch

Added: trunk/libsearch-xapian-perl/debian/patches/stop_failing_tests_on_values_begin.patch
URL: http://svn.debian.org/wsvn/trunk/libsearch-xapian-perl/debian/patches/stop_failing_tests_on_values_begin.patch?rev=9276&op=file
==============================================================================
--- trunk/libsearch-xapian-perl/debian/patches/stop_failing_tests_on_values_begin.patch (added)
+++ trunk/libsearch-xapian-perl/debian/patches/stop_failing_tests_on_values_begin.patch Wed Nov 14 14:37:01 2007
@@ -1,0 +1,14 @@
+# Avoid test failures die to long-time crappy values_begin
+# See http://thread.gmane.org/gmane.comp.search.xapian.general/5425
+Index: libsearch-xapian-perl/t/thread.t
+===================================================================
+--- libsearch-xapian-perl.orig/t/thread.t	2007-11-14 15:55:18.000000000 +0200
++++ libsearch-xapian-perl/t/thread.t	2007-11-14 15:58:17.000000000 +0200
+@@ -134,6 +134,7 @@
+ ok( $termit = $db->termlist_begin(1), 'create TermIterator' );
+ is( ref($termit), 'Search::Xapian::TermIterator', 'check TermIterator' );
+ 
++$doc->values_count();
+ ok( $valueit = $doc->values_begin(), 'create ValueIterator' );
+ is( $valueit->get_valueno(), 0, 'check ValueIterator' );
+ 

Modified: trunk/libsearch-xapian-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libsearch-xapian-perl/debian/rules?rev=9276&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/debian/rules (original)
+++ trunk/libsearch-xapian-perl/debian/rules Wed Nov 14 14:37:01 2007
@@ -4,6 +4,8 @@
 # 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.
+
+include /usr/share/quilt/quilt.make
 
 PACKAGE=$(shell dh_listpackages)
 
@@ -14,20 +16,20 @@
 TMP     =$(CURDIR)/debian/$(PACKAGE)
 
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE)
 	TEST_POD=1 $(MAKE) test
 
-	touch build-stamp
+	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
+	dh_clean build-stamp install-stamp
 	if [ -f Makefile ]; then $(MAKE) distclean; fi
-	dh_clean build-stamp install-stamp
 	rm -fr testdb testdb-exception
 
 install: install-stamp
@@ -39,7 +41,7 @@
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
 	rmdir --parents --ignore-fail-on-non-empty $(TMP)/usr/share/perl5
 	
-	touch install-stamp
+	touch $@
 
 binary-indep:
 # We have nothing to do by default.
@@ -51,7 +53,6 @@
 	dh_installexamples examples/simplesearch.pl
 	dh_perl
 	dh_installchangelogs Changes
-	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms




More information about the Pkg-perl-cvs-commits mailing list