r24212 - in /trunk/libnet-cups-perl: ./ debian/ debian/patches/ lib/Net/ lib/Net/CUPS/

gwolf at users.alioth.debian.org gwolf at users.alioth.debian.org
Tue Aug 12 15:59:05 UTC 2008


Author: gwolf
Date: Tue Aug 12 15:59:03 2008
New Revision: 24212

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=24212
Log:
New upstream version; no longer FTBFS

Added:
    trunk/libnet-cups-perl/debian/patches/
    trunk/libnet-cups-perl/debian/patches/disable_root_passwd_requiring_tests
    trunk/libnet-cups-perl/debian/patches/series
Modified:
    trunk/libnet-cups-perl/CUPS.xs
    trunk/libnet-cups-perl/Changes
    trunk/libnet-cups-perl/debian/changelog
    trunk/libnet-cups-perl/debian/control
    trunk/libnet-cups-perl/debian/rules
    trunk/libnet-cups-perl/lib/Net/CUPS.pm
    trunk/libnet-cups-perl/lib/Net/CUPS/Destination.pm
    trunk/libnet-cups-perl/lib/Net/CUPS/IPP.pm
    trunk/libnet-cups-perl/lib/Net/CUPS/PPD.pm

Modified: trunk/libnet-cups-perl/CUPS.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-cups-perl/CUPS.xs?rev=24212&op=diff
==============================================================================
--- trunk/libnet-cups-perl/CUPS.xs (original)
+++ trunk/libnet-cups-perl/CUPS.xs Tue Aug 12 15:59:03 2008
@@ -12,7 +12,6 @@
 #include <cups/ppd.h>
 #include <cups/file.h>
 #include <cups/dir.h>
-#include <cups/i18n.h>
 #include <cups/language.h>
 #include <cups/transcode.h>
 #include <cups/adminutil.h>

Modified: trunk/libnet-cups-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-cups-perl/Changes?rev=24212&op=diff
==============================================================================
--- trunk/libnet-cups-perl/Changes (original)
+++ trunk/libnet-cups-perl/Changes Tue Aug 12 15:59:03 2008
@@ -1,4 +1,9 @@
 Revision history for Perl extension Net::CUPS.
+
+0.57 Sun Aug 10 19:19:33 2008
+	+ Special thanks to Mike Eldridge <diz at cpan.org> for submitting a 
+      patch to correct issues with constants on certain platforms.
+	- Small compile patch to deal with changes in Fedora 9.
 
 0.56 Wed Mar 26 19:35:05 2008
 	+ Most of the changes below were added by Mark Gannon <mark at truenorth.nu>

Modified: trunk/libnet-cups-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-cups-perl/debian/changelog?rev=24212&op=diff
==============================================================================
--- trunk/libnet-cups-perl/debian/changelog (original)
+++ trunk/libnet-cups-perl/debian/changelog Tue Aug 12 15:59:03 2008
@@ -1,10 +1,9 @@
-libnet-cups-perl (0.56-1) UNRELEASED; urgency=low
+libnet-cups-perl (0.57-1) unstable; urgency=low
 
   [ gregor herrmann ]
   FTBFS (test failures - also on cpantesters). maybe upstream should
   actually run their own tests before releasing ...
 
-  * New upstream release.
   * Change build dependency from libcupsys2-dev to libcups2-dev and Suggests:
     from cupsys-common to cups-common (the cups* packages have been renamed;
     closes: #494035).
@@ -12,7 +11,15 @@
   [ Martín Ferrari ]
   * Updating my email address
 
- -- Martín Ferrari <tincho at debian.org>  Fri, 13 Jun 2008 00:04:45 +0000
+  [ Gunnar Wolf ]
+  * New upstream release.
+  * Added myself as an uploader
+  * Added build-dependency on quilt
+  * Standards-version -> 3.8.0
+  * Disabled some test cases requiring interactivity or root privileges,
+    which caused a FTBFS
+
+ -- Gunnar Wolf <gwolf at debian.org>  Tue, 12 Aug 2008 10:58:43 -0500
 
 libnet-cups-perl (0.55-3) unstable; urgency=medium
 

Modified: trunk/libnet-cups-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-cups-perl/debian/control?rev=24212&op=diff
==============================================================================
--- trunk/libnet-cups-perl/debian/control (original)
+++ trunk/libnet-cups-perl/debian/control Tue Aug 12 15:59:03 2008
@@ -4,9 +4,9 @@
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Rene Mayorga <rmayorga at debian.org.sv>,
  Martín Ferrari <tincho at debian.org>, Damyan Ivanov <dmn at debian.org>,
- gregor herrmann <gregoa at debian.org>
-Build-Depends: perl, debhelper (>= 6), libcups2-dev (>= 1.3.7-3), libcupsimage2-dev
-Standards-Version: 3.7.3
+ gregor herrmann <gregoa at debian.org>, Gunnar Wolf <gwolf at debian.org>
+Build-Depends: perl, debhelper (>= 6), libcups2-dev (>= 1.3.7-3), libcupsimage2-dev, quilt
+Standards-Version: 3.8.0
 Homepage: http://search.cpan.org/dist/Net-CUPS/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libnet-cups-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-cups-perl/

Added: trunk/libnet-cups-perl/debian/patches/disable_root_passwd_requiring_tests
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-cups-perl/debian/patches/disable_root_passwd_requiring_tests?rev=24212&op=file
==============================================================================
--- trunk/libnet-cups-perl/debian/patches/disable_root_passwd_requiring_tests (added)
+++ trunk/libnet-cups-perl/debian/patches/disable_root_passwd_requiring_tests Tue Aug 12 15:59:03 2008
@@ -1,0 +1,57 @@
+Index: libnet-cups-perl/t/03_destination.t
+===================================================================
+--- libnet-cups-perl.orig/t/03_destination.t	2008-08-12 10:47:28.000000000 -0500
++++ libnet-cups-perl/t/03_destination.t	2008-08-12 10:55:25.000000000 -0500
+@@ -3,7 +3,7 @@
+ 
+ #########################
+ 
+-use Test::More tests => 11;
++use Test::More tests => 7;
+ BEGIN { use_ok('Net::CUPS'); use_ok('Net::CUPS::Destination'); };
+ 
+ #########################
+@@ -31,25 +31,30 @@
+ 
+ ok ($ppd_file);
+ 
+-my $name = "yatp";
+-my $location = "nowhere";
+-my $printer_info = "blahblah";
+-my $device_uri = 'socket://192.168.1.3:9100';
++## The following tests are apparently not portable outside upstream's
++## usual environment - they require root access or interactivity
++## depending on your setup. I'm disabling them for the Debian package
++## build process.
+ 
+-$cups->addDestination($name, $location, $printer_info, $ppd_file, $device_uri);
++# my $name = "yatp";
++# my $location = "nowhere";
++# my $printer_info = "blahblah";
++# my $device_uri = 'socket://192.168.1.3:9100';
+ 
+-my $dest = $cups->getDestination( $name );
++# $cups->addDestination($name, $location, $printer_info, $ppd_file, $device_uri);
+ 
+-ok ($dest);
++# my $dest = $cups->getDestination( $name );
+ 
+-my $description = $dest->getDescription();
++# ok ($dest);
+ 
+-ok( $description eq $printer_info );
++# my $description = $dest->getDescription();
+ 
+-my $uri = $dest->getUri();
++# ok( $description eq $printer_info );
+ 
+-ok( $uri eq $device_uri );
++# my $uri = $dest->getUri();
+ 
+-$cups->deleteDestination($name);
++# ok( $uri eq $device_uri );
+ 
+-ok (! $cups->getDestination($name));
++# $cups->deleteDestination($name);
++
++# ok (! $cups->getDestination($name));

Added: trunk/libnet-cups-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-cups-perl/debian/patches/series?rev=24212&op=file
==============================================================================
--- trunk/libnet-cups-perl/debian/patches/series (added)
+++ trunk/libnet-cups-perl/debian/patches/series Tue Aug 12 15:59:03 2008
@@ -1,0 +1,1 @@
+disable_root_passwd_requiring_tests

Modified: trunk/libnet-cups-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-cups-perl/debian/rules?rev=24212&op=diff
==============================================================================
--- trunk/libnet-cups-perl/debian/rules (original)
+++ trunk/libnet-cups-perl/debian/rules Tue Aug 12 15:59:03 2008
@@ -6,6 +6,8 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+
+include /usr/share/quilt/quilt.make
 
 # If set to a true value then MakeMaker's prompt function will
 # always return the default without waiting for user input.
@@ -25,14 +27,14 @@
 endif
 
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
 	$(MAKE) test
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	dh_clean build-stamp install-stamp const-c.inc const-xs.inc

Modified: trunk/libnet-cups-perl/lib/Net/CUPS.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-cups-perl/lib/Net/CUPS.pm?rev=24212&op=diff
==============================================================================
--- trunk/libnet-cups-perl/lib/Net/CUPS.pm (original)
+++ trunk/libnet-cups-perl/lib/Net/CUPS.pm Tue Aug 12 15:59:03 2008
@@ -959,7 +959,7 @@
 	PPD_VERSION
 );
 
-our $VERSION = '0.56';
+our $VERSION = '0.57';
 
 sub AUTOLOAD {
     # This AUTOLOAD is used to 'autoload' constants from the constant()

Modified: trunk/libnet-cups-perl/lib/Net/CUPS/Destination.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-cups-perl/lib/Net/CUPS/Destination.pm?rev=24212&op=diff
==============================================================================
--- trunk/libnet-cups-perl/lib/Net/CUPS/Destination.pm (original)
+++ trunk/libnet-cups-perl/lib/Net/CUPS/Destination.pm Tue Aug 12 15:59:03 2008
@@ -961,7 +961,7 @@
 	PPD_VERSION
 );
 
-our $VERSION = '0.56';
+our $VERSION = '0.57';
 
 sub AUTOLOAD {
     # This AUTOLOAD is used to 'autoload' constants from the constant()
@@ -1056,7 +1056,7 @@
 
 	return( NETCUPS_getDeviceAttribute( $self->getName(), 
 										"printer-info",
-										IPP_TAG_TEXT ) );
+										IPP_TAG_TEXT() ) );
 }
 
 
@@ -1103,7 +1103,7 @@
 
 	return( NETCUPS_getDeviceAttribute( $self->getName(), 
 										"printer-location",
-										IPP_TAG_TEXT ) );
+										IPP_TAG_TEXT() ) );
 }
 
 ##----------------------------------------------##
@@ -1145,7 +1145,7 @@
 
 	return( NETCUPS_getDeviceAttribute( $self->getName(), 
 										"device-uri",
-										IPP_TAG_URI ) );
+										IPP_TAG_URI() ) );
 }
 
 ##----------------------------------------------##

Modified: trunk/libnet-cups-perl/lib/Net/CUPS/IPP.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-cups-perl/lib/Net/CUPS/IPP.pm?rev=24212&op=diff
==============================================================================
--- trunk/libnet-cups-perl/lib/Net/CUPS/IPP.pm (original)
+++ trunk/libnet-cups-perl/lib/Net/CUPS/IPP.pm Tue Aug 12 15:59:03 2008
@@ -961,7 +961,7 @@
 	PPD_VERSION
 );
 
-our $VERSION = '0.56';
+our $VERSION = '0.57';
 
 sub AUTOLOAD {
     # This AUTOLOAD is used to 'autoload' constants from the constant()

Modified: trunk/libnet-cups-perl/lib/Net/CUPS/PPD.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-cups-perl/lib/Net/CUPS/PPD.pm?rev=24212&op=diff
==============================================================================
--- trunk/libnet-cups-perl/lib/Net/CUPS/PPD.pm (original)
+++ trunk/libnet-cups-perl/lib/Net/CUPS/PPD.pm Tue Aug 12 15:59:03 2008
@@ -964,7 +964,7 @@
 	PPD_VERSION
 );
 
-our $VERSION = '0.56';
+our $VERSION = '0.57';
 
 sub AUTOLOAD {
     # This AUTOLOAD is used to 'autoload' constants from the constant()




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