[SCM] Debian packaging of Net-Z3950-SimpleServer CPAN distribution branch, master, updated. debian/1.12-1-4-g70f37ad

Ben Webb bjwebb67 at googlemail.com
Mon Aug 29 14:39:51 UTC 2011


The following commit has been merged in the master branch:
commit 70f37ad9f43fbafca5956ac464890f6c4f1437f6
Author: Ben Webb <bjwebb67 at googlemail.com>
Date:   Mon Aug 29 14:38:48 2011 +0000

    Update patches and copyright information for new upstream release

diff --git a/debian/changelog b/debian/changelog
index 545e407..bd868de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
-libnet-z3950-simpleserver-perl (1.12-2) UNRELEASED; urgency=low
+libnet-z3950-simpleserver-perl (1.14-1) UNRELEASED; urgency=low
 
+  TODO:
+  - Requires a version of lib4yaz-dev that is not yet availible in unstable
+  
+  [ Ben Webb ]
+  * New upstream release
+  * Update copyright file for new upstream licensing information
+
+  [ Salvatore Bonaccorso ]
   * debian/copyright: Replace DEP5 Format-Specification URL from
     svn.debian.org to anonscm.debian.org URL.
 
- -- Salvatore Bonaccorso <carnil at debian.org>  Sun, 07 Aug 2011 16:37:40 +0200
+ -- Ben Webb <bjwebb67 at googlemail.com>  Mon, 29 Aug 2011 12:06:44 +0000
 
 libnet-z3950-simpleserver-perl (1.12-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index d16a8c3..1cd9d3a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: libnet-z3950-simpleserver-perl
 Section: perl
-Priority: optional
+Priority: extra
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Ben Webb <bjwebb67 at googlemail.com>
-Build-Depends: debhelper (>= 8), perl, libyaz4-dev | libyaz-dev, yaz
+Build-Depends: debhelper (>= 8), perl, libyaz4-dev (>= 4.2) | libyaz-dev (>= 4.2), yaz
 Standards-Version: 3.9.2
 Homepage: http://search.cpan.org/dist/Net-Z3950-SimpleServer/
 Vcs-Git: git://git.debian.org/pkg-perl/packages/libbusiness-edi-perl.git
diff --git a/debian/copyright b/debian/copyright
index ababeb9..e266fe5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,52 +7,33 @@ Upstream-Contact:
 Source: http://search.cpan.org/dist/Net-Z3950-SimpleServer/
 
 Files: *
-Copyright: 2000-2009, Index Data.
-License: Artistic or GPL-1+
-
-Files: SimpleServer.* GRS1.pm ztest.pl
 Copyright: 2000-2006, Index Data.
 License: BSD-3-clause
 
 Files: debian/*
 Copyright: 2011, Ben Webb <bjwebb67 at googlemail.com>
-License: Artistic or GPL-1+
-
-License: Artistic
- This program is free software; you can redistribute it and/or modify
- it under the terms of the Artistic License, which comes with Perl.
- .
- On Debian systems, the complete text of the Artistic License can be
- found in `/usr/share/common-licenses/Artistic'.
-
-License: GPL-1+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
- .
- On Debian systems, the complete text of version 1 of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-1'.
+License: BSD-3-clause
 
 License: BSD-3-clause
- Permission to use, copy, modify, distribute, and sell this software and
- its documentation, in whole or in part, for any purpose, is hereby granted,
- provided that:
- .
- 1. This copyright and permission notice appear in all copies of the
-    software and its documentation. Notices of copyright or attribution
-    which appear at the beginning of any file must remain unchanged.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
  .
- 2. The name of Index Data or the individual authors may not be used to
-    endorse or promote products derived from this software without specific
-    prior written permission.
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Index Data nor the names of its contributors
+      may be used to endorse or promote products derived from this
+      software without specific prior written permission.
  .
- THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
- INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
- NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- OF THIS SOFTWARE.
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
index 08f9b02..cf9c5f3 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/makefile.patch
@@ -6,7 +6,16 @@ Last-Update: 2011-08-05
 
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -42,4 +42,7 @@
+@@ -2,7 +2,7 @@
+ 
+ # Use: perl Makefile.PL OPTIMIZE="-O0 -g -Wdeclaration-after-statement"
+ 
+-my $yazconf = "../yaz/yaz-config";
++my $yazconf = "/usr/bin/yaz-config";
+ my $yazver = `$yazconf --version`;
+ my $yazinc = `$yazconf --cflags servers`;
+ my $yazlibs = `$yazconf --libs server`;
+@@ -40,4 +40,7 @@
      'DEFINE'	=> '',     # e.g., '-DHAVE_SOMETHING' 
      'INC'	=> $yazinc,     # e.g., '-I/usr/include/other' 
  #    OPTIMIZE   => "-Wdeclaration-after-statement -g -O0",
diff --git a/debian/patches/manpage_spelling.patch b/debian/patches/manpage_spelling.patch
deleted file mode 100644
index a75b714..0000000
--- a/debian/patches/manpage_spelling.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Description: spelling fixes
-Origin: vendor
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=70052
-Author: Ben Webb <bjwebb67 at googlemail.com>
-Last-Update: 2011-08-05
-
---- a/SimpleServer.pm
-+++ b/SimpleServer.pm
-@@ -226,7 +226,7 @@
- retrieving the results in the form of structured "records". It is widely
- used in libraries around the world, as well as in the US Federal Government.
- In addition, it is generally useful whenever you wish to integrate a number
--of different database systems around a shared, asbtract data model.
-+of different database systems around a shared, abstract data model.
- 
- The model of the module is simple: It implements a "generic" Z39.50
- server, which invokes callback functions supplied by you to search
-@@ -371,7 +371,7 @@
- 
- 				    ## Response parameters:
- 
--	     ERR_CODE  =>  0,       ## Error code (0=Succesful search)
-+	     ERR_CODE  =>  0,       ## Error code (0=Successful search)
- 	     ERR_STR   =>  "",      ## Error string
- 	     HITS      =>  0        ## Number of matches
- 	  };
-@@ -436,7 +436,7 @@
- 
- =item C<query>
- 
--Mandatory: a refererence to the RPN tree itself.
-+Mandatory: a reference to the RPN tree itself.
- 
- =back
- 
-@@ -517,8 +517,8 @@
- =item C<attributeValue>
- 
- An integer or string indicating the value of the attribute - for example, under
--BIB-1, if the attribute type is 1, then value 4 indictates a title
--search and 7 indictates an ISBN search; but if the attribute type is
-+BIB-1, if the attribute type is 1, then value 4 indicates a title
-+search and 7 indicates an ISBN search; but if the attribute type is
- 2, then value 4 indicates a ``greater than or equal'' search, and 102
- indicates a relevance match.
- 
-@@ -567,7 +567,7 @@
- sets are likely to occur, the implementation of a reasonable present
- handler can gain performance significantly.
- 
--The informations exchanged between client and present handle are:
-+The information exchanged between client and present handle is:
- 
-   $args = {
- 				    ## Client/server request:
-@@ -580,7 +580,7 @@
- 	     NUMBER    =>  yyy,	    ## Number of requested records
- 
- 
--				    ## Respons parameters:
-+				    ## Response parameters:
- 
- 	     HITS      =>  zzz,	    ## Number of returned records
- 	     ERR_CODE  =>  0,	    ## Error code
-@@ -698,7 +698,7 @@
- 
- A better alternative to the TERM member is the the RPN
- member, which is a reference to a Net::Z3950::RPN::Term object
--representing the scan cloause.  The structure of that object is the
-+representing the scan clause.  The structure of that object is the
- same as for Term objects included as part of the RPN tree passed to
- search handlers.  This is more useful than the simple TERM because it
- includes attributes (e.g. access points associated with the term),
-@@ -706,7 +706,7 @@
- 
- =head2 Close handler
- 
--The argument hash recieved by the close handler has two elements only:
-+The argument hash received by the close handler has two elements only:
- 
-   $args = {
- 				    ## Server provides:
-@@ -721,7 +721,7 @@
- 
- =head2 Delete handler
- 
--The argument hash recieved by the delete handler has the following elements:
-+The argument hash received by the delete handler has the following elements:
- 
-   $args = {
- 				    ## Client request:
-@@ -745,7 +745,7 @@
- 
- =head2 Sort handler
- 
--The argument hash recieved by the sort handler has the following elements:
-+The argument hash received by the sort handler has the following elements:
- 
- 	$args = {
- 					## Client request:
-@@ -815,7 +815,7 @@
- 
- Precisely why all of the above is so is not clear, but goes some way
- to explain why, in the Z39.50 world, the developers of the standard
--are not so much worshipped as blamed.
-+are not so much worshiped as blamed.
- 
- The backend function should set STATUS to 0 on success, 1 for "partial
- success" (don't ask) or 2 on failure, in which case ERR_CODE and
diff --git a/debian/patches/series b/debian/patches/series
index 169bfde..82374e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-manpage_spelling.patch
 makefile.patch
-test.patch
diff --git a/debian/patches/test.patch b/debian/patches/test.patch
deleted file mode 100644
index 6b79919..0000000
--- a/debian/patches/test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: use localhost as server bind address so client can always connect
-Origin: vendor
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=70109
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2011-08-06
-
---- a/test.pl
-+++ b/test.pl
-@@ -96,7 +96,7 @@
- 		SEARCH		=>      \&my_search_handler,
- 		FETCH		=>	\&my_fetch_handler);
- 
--	$handler->launch_server("test.pl", "-1", @ARGV);
-+	$handler->launch_server("test.pl", "-1", "tcp:localhost:9999", @ARGV);
- } else {						## Child starts the client
- 	sleep(1);
- 	open(CLIENT, "| yaz-client tcp:localhost:9999 > /dev/null")

-- 
Debian packaging of Net-Z3950-SimpleServer CPAN distribution



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