hopefully finished -1

diff --git a/debian/changelog b/debian/changelog
index eabfe62..41878b4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-libwww-opensearch-perl (0.06.02) unstable; urgency=low
+libwww-opensearch-perl (0.06.02-1) unstable; urgency=low
 
-  * Initial Release.
+  * Initial Release (Closes: #386482).
+  * Changed upstream version number from 0.06_02 to 0.06.02.
+  * t/10-description.t: fixed/skipped buggy tests.
 
- -- Ian Beckwith <ianb@nessie.mcc.ac.uk>  Tue,  5 Sep 2006 21:03:24 +0100
+ -- Ian Beckwith <ianb@nessie.mcc.ac.uk>  Wed,  6 Sep 2006 00:18:55 +0100
 

diff --git a/debian/control b/debian/control
index 9bab904..5d46052 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,15 @@ Source: libwww-opensearch-perl
 Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 5.0.0)
-Build-Depends-Indep: perl (>= )
+Build-Depends-Indep: perl (>= 5.8.8-6.1), libtest-pod-perl (>= 1.02-1), libtest-pod-coverage-perl, libdata-page-perl (>= 2.00-1), libwww-perl (>= 5.60-1), liburi-perl, libxml-feed-perl (>= 0.08-1), libxml-libxml-perl (>= 1.58-1)
 Maintainer: Ian Beckwith <ianb@nessie.mcc.ac.uk>
 Standards-Version: 3.7.2
 
 Package: libwww-opensearch-perl
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, 
-Description:  Search A9 OpenSearch compatible engines
- WWW::OpenSearch is a module to search A9's OpenSearch compatible search engines. See http://opensearch.a9.com/ for details.
+Depends: libdata-page-perl (>= 2.00-1), libwww-perl (>= 5.60-1), liburi-perl, libxml-feed-perl (>= 0.08-1), libxml-libxml-perl (>= 1.58-1), ${perl:Depends}, ${misc:Depends}
+Description: search OpenSearch compatible web sites
+ WWW::OpenSearch is a perl module to search web sites that provide
+ an OpenSearch description and handle responses in Atom or RSS.
  .
- This description was automagically extracted from the module by dh-make-perl.
+ See http://opensearch.a9.com/ for more information on OpenSearch.

diff --git a/debian/copyright b/debian/copyright
index a9e3def..5a7105e 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,29 @@
 This is the debian package for the WWW-OpenSearch module.
-It was created by Ian Beckwith <ianb@nessie.mcc.ac.uk> using dh-make-perl.
+It was created by Ian Beckwith <ianb@nessie.mcc.ac.uk> using dh-make-perl
+on Tue Sep  5 22:56:34 BST 2006
 
-This copyright info was automatically extracted from the perl module.
-It may not be accurate, so you better check the module sources
-if don't want to get into legal troubles.
+It was downloaded from:
+http://www.perl.com/CPAN/authors/id/B/BR/BRICAS/WWW-OpenSearch-0.06_02.tar.gz
 
+COPYRIGHT AND LICENSE
+    Copyright 2006 by Tatsuhiko Miyagawa and Brian Cassidy
+
+    This library is free software; you can redistribute it and/or modify it
+    under the same terms as Perl itself.
+
+
+Those terms are (from /usr/share/doc/perl/copyright):
+
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of either:
+
+    a) the GNU General Public License as published by the Free Software
+       Foundation; either version 1, or (at your option) any later
+       version, or
+
+    b) the "Artistic License" which comes with Perl.
+
+    On Debian GNU/Linux systems, the complete text of the GNU General
+    Public License can be found in `/usr/share/common-licenses/GPL' and
+    the Artistic Licence in `/usr/share/common-licenses/Artistic'.

diff --git a/debian/rules b/debian/rules
index e7865d5..bf116f4 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
-# This debian/rules file is provided as a template for normal perl
-# packages. It was created by Marc Brockschmidt <marc@dch-faq.de> for
-# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
-# be used freely wherever it is useful.
+# Debian Customisations Copyright 2006 Ian Beckwith <ianb@nessie.mcc.ac.uk>
+# Based on a template by Marc Brockschmidt <marc@dch-faq.de>
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -11,7 +9,7 @@
 # always return the default without waiting for user input.
 export PERL_MM_USE_DEFAULT=1
 
-PACKAGE=$(shell dh_listpackages)
+PACKAGE=libwww-opensearch-perl
 
 ifndef PERL
 PERL = /usr/bin/perl
@@ -23,9 +21,8 @@ build: build-stamp
 build-stamp:
        dh_testdir
 
-       # Add commands to compile the package here
        $(PERL) Makefile.PL INSTALLDIRS=vendor
-       $(MAKE) OPTIMIZE="-Wall -O2 -g"
+       $(MAKE) 
 
        touch build-stamp
 
@@ -33,7 +30,6 @@ clean:
        dh_testdir
        dh_testroot
 
-       # Add commands to clean up after the build process here
        [ ! -f Makefile ] || $(MAKE) realclean
 
        dh_clean build-stamp install-stamp
@@ -44,7 +40,6 @@ install-stamp:
        dh_testroot
        dh_clean -k
 
-       # Add commands to install the package into debian/$PACKAGE_NAME here
        $(MAKE) test
        $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
 
@@ -61,14 +56,10 @@ binary-arch:
 binary-indep: build install
        dh_testdir
        dh_testroot
-#      dh_installcron
-#      dh_installmenu
-#      dh_installexamples
        dh_installdocs README
        dh_installchangelogs Changes
        dh_perl
        dh_link
-       dh_strip
        dh_compress
        dh_fixperms
        dh_installdeb
@@ -76,8 +67,5 @@ binary-indep: build install
        dh_md5sums
        dh_builddeb
 
-source diff:                                                                  
-       @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary

diff --git a/t/10-description.t b/t/10-description.t
index 784face..4270b3b 100644 (file)
--- a/t/10-description.t
+++ b/t/10-description.t
@@ -83,11 +83,11 @@ use_ok( 'WWW::OpenSearch::Description' );
     is( $osd->adultcontent, 'false' );
     is( $osd->syndicationright, 'open' );
 
-    TODO: {
-        local $TODO = 'Test Query and Image';
-
+    is( $osd->image, 'http://example.com/websearch.png' );
+    
+SKIP: {
+        skip 'Test Query', 1;
         is( $osd->query, undef );
-        is( $osd->image, undef );
     };
 
     # count the urls