r42724 - in /trunk/libswish-api-common-perl: ./ debian/ debian/patches/ eg/canned/ lib/SWISH/API/

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Tue Aug 25 02:48:31 UTC 2009


Author: jawnsy-guest
Date: Tue Aug 25 02:48:20 2009
New Revision: 42724

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=42724
Log:
No release necessary. Fix a regex typo.
IGNORE-VERSION: 0.04-1
* New upstream release
  + Fix bug in 30fix-makefile-pl.patch (RT#48597)
* Bump compat to debhelper 7. Use new short rules format
* Standards-Version 3.8.3
* Remove patches applied upstream
* Rewrote control description
* Update to machine readable copyright format

Added:
    trunk/libswish-api-common-perl/eg/canned/abc
      - copied unchanged from r42723, branches/upstream/libswish-api-common-perl/current/eg/canned/abc
    trunk/libswish-api-common-perl/eg/canned/def
      - copied unchanged from r42723, branches/upstream/libswish-api-common-perl/current/eg/canned/def
Removed:
    trunk/libswish-api-common-perl/debian/patches/30fix-makefile-pl.patch
Modified:
    trunk/libswish-api-common-perl/Changes
    trunk/libswish-api-common-perl/MANIFEST
    trunk/libswish-api-common-perl/MANIFEST.SKIP
    trunk/libswish-api-common-perl/META.yml
    trunk/libswish-api-common-perl/Makefile.PL
    trunk/libswish-api-common-perl/README
    trunk/libswish-api-common-perl/debian/changelog
    trunk/libswish-api-common-perl/debian/compat
    trunk/libswish-api-common-perl/debian/control
    trunk/libswish-api-common-perl/debian/copyright
    trunk/libswish-api-common-perl/debian/patches/series
    trunk/libswish-api-common-perl/debian/rules
    trunk/libswish-api-common-perl/lib/SWISH/API/Common.pm

Modified: trunk/libswish-api-common-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/Changes?rev=42724&op=diff
==============================================================================
--- trunk/libswish-api-common-perl/Changes (original)
+++ trunk/libswish-api-common-perl/Changes Tue Aug 25 02:48:20 2009
@@ -1,6 +1,10 @@
 ######################################################################
 Revision history for Perl extension SWISH::API::Common
 ######################################################################
+
+0.04  2009/08/10
+    (ms) [RT 48597] Fixed regex typo in Makefile.PL, reported by
+         Przemek Czerkas.
 
 0.03  2005/07/01
     (ms) Search swish-e in /usr/local/bin and other PATHs.

Modified: trunk/libswish-api-common-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/MANIFEST?rev=42724&op=diff
==============================================================================
--- trunk/libswish-api-common-perl/MANIFEST (original)
+++ trunk/libswish-api-common-perl/MANIFEST Tue Aug 25 02:48:20 2009
@@ -1,13 +1,15 @@
 Changes
+eg/canned/abc
 eg/canned/data1/abc
 eg/canned/data1/def
 eg/canned/data2/ghi
+eg/canned/def
 eg/idx_and_search.pl
 lib/SWISH/API/Common.pm
 Makefile.PL
 MANIFEST			This list of files
 MANIFEST.SKIP
-META.yml			Module meta-data (added by MakeMaker)
+META.yml
 README
 t/001Basic.t
 t/002Merge.t

Modified: trunk/libswish-api-common-perl/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/MANIFEST.SKIP?rev=42724&op=diff
==============================================================================
--- trunk/libswish-api-common-perl/MANIFEST.SKIP (original)
+++ trunk/libswish-api-common-perl/MANIFEST.SKIP Tue Aug 25 02:48:20 2009
@@ -6,3 +6,4 @@
 docs
 MANIFEST.bak
 adm/release
+.git

Modified: trunk/libswish-api-common-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/META.yml?rev=42724&op=diff
==============================================================================
--- trunk/libswish-api-common-perl/META.yml (original)
+++ trunk/libswish-api-common-perl/META.yml Tue Aug 25 02:48:20 2009
@@ -1,7 +1,7 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         SWISH-API-Common
-version:      0.03
+version:      0.04
 version_from: lib/SWISH/API/Common.pm
 installdirs:  site
 requires:
@@ -16,4 +16,4 @@
     Sysadm::Install:               0
 
 distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+generated_by: ExtUtils::MakeMaker version 6.30_01

Modified: trunk/libswish-api-common-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/Makefile.PL?rev=42724&op=diff
==============================================================================
--- trunk/libswish-api-common-perl/Makefile.PL (original)
+++ trunk/libswish-api-common-perl/Makefile.PL Tue Aug 25 02:48:20 2009
@@ -57,7 +57,7 @@
          #print "*** Temporary directory: $dir\n";
          chdir $dir or die "Cannot chdir to $dir";
          my $distro = "swish-e-2.4.3.tar.gz";
-         (my $distrodir = $distro) =~ s/\.tar.\gz$//g;
+         (my $distrodir = $distro) =~ s/\.tar\.gz$//g;
          print "Downloading $distro ...\n";
 #File::Copy::copy("/tmp/$distro", "$dir/$distro");
          LWP::Simple::getstore(

Modified: trunk/libswish-api-common-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/README?rev=42724&op=diff
==============================================================================
--- trunk/libswish-api-common-perl/README (original)
+++ trunk/libswish-api-common-perl/README Tue Aug 25 02:48:20 2009
@@ -1,5 +1,5 @@
 ######################################################################
-    SWISH::API::Common 0.03
+    SWISH::API::Common 0.04
 ######################################################################
 
 NAME

Modified: trunk/libswish-api-common-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/debian/changelog?rev=42724&op=diff
==============================================================================
--- trunk/libswish-api-common-perl/debian/changelog (original)
+++ trunk/libswish-api-common-perl/debian/changelog Tue Aug 25 02:48:20 2009
@@ -1,4 +1,16 @@
-libswish-api-common-perl (0.03-3) UNRELEASED; urgency=low
+libswish-api-common-perl (0.04-1) UNRELEASED; urgency=low
+
+  No release necessary. Fix a regex typo.
+  IGNORE-VERSION: 0.04-1
+
+  [ Jonathan Yu ]
+  * New upstream release
+    + Fix bug in 30fix-makefile-pl.patch (RT#48597)
+  * Bump compat to debhelper 7. Use new short rules format
+  * Standards-Version 3.8.3
+  * Remove patches applied upstream
+  * Rewrote control description
+  * Update to machine readable copyright format
 
   [ gregor herrmann ]
   * Add debian/README.source to document quilt usage, as required by
@@ -11,7 +23,7 @@
   [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
 
- -- gregor herrmann <gregoa at debian.org>  Wed, 06 Aug 2008 21:34:12 -0300
+ -- Jonathan Yu <frequency at cpan.org>  Mon, 24 Aug 2009 18:31:25 -0400
 
 libswish-api-common-perl (0.03-2) unstable; urgency=medium
 

Modified: trunk/libswish-api-common-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/debian/compat?rev=42724&op=diff
==============================================================================
--- trunk/libswish-api-common-perl/debian/compat (original)
+++ trunk/libswish-api-common-perl/debian/compat Tue Aug 25 02:48:20 2009
@@ -1,1 +1,1 @@
-4
+7

Modified: trunk/libswish-api-common-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/debian/control?rev=42724&op=diff
==============================================================================
--- trunk/libswish-api-common-perl/debian/control (original)
+++ trunk/libswish-api-common-perl/debian/control Tue Aug 25 02:48:20 2009
@@ -1,23 +1,23 @@
 Source: libswish-api-common-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 4.0.2), quilt (>= 0.40)
-Build-Depends-Indep: perl (>= 5.8.0-7), swish-e, libwww-perl, liblog-log4perl-perl, libsysadm-install-perl
+Build-Depends: debhelper (>= 7), quilt (>= 0.46-7)
+Build-Depends-Indep: perl, liblog-log4perl-perl, libsysadm-install-perl,
+ libwww-perl, swish-e
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: TODO
-Standards-Version: 3.6.2
+Uploaders: Jonathan Yu <frequency at cpan.org>
+Standards-Version: 3.8.3
 Homepage: http://search.cpan.org/dist/SWISH-API-Common/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libswish-api-common-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libswish-api-common-perl/
 
 Package: libswish-api-common-perl
 Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, swish-e, libwww-perl, liblog-log4perl-perl, libsysadm-install-perl
-Description: SWISH Document Indexing Made Easy
- SWISH::API::Common offers an easy interface to the Swish index engine.
- While SWISH::API offers a complete API, SWISH::API::Common focusses
- on ease of use.
- .
- Currently, SWISH::API::Common just allows for indexing documents
- in a single directory and any of its subdirectories. Also, don't run
- index() and search() in parallel yet.
+Depends: ${misc:Depends}, ${perl:Depends}, liblog-log4perl-perl, libwww-perl,
+ libsysadm-install-perl, swish-e
+Description: Perl interface to the SWISH index engine
+ SWISH::API::Common offers an easy interface to the Swish index engine. While
+ SWISH::API offers a complete API, SWISH::API::Common focuses on ease of use.
+ Currently, this API allows for indexing documents in a single directory and
+ any of its subdirectories. However, index() and search() cannot be executed
+ in parallel.

Modified: trunk/libswish-api-common-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/debian/copyright?rev=42724&op=diff
==============================================================================
--- trunk/libswish-api-common-perl/debian/copyright (original)
+++ trunk/libswish-api-common-perl/debian/copyright Tue Aug 25 02:48:20 2009
@@ -1,14 +1,32 @@
-This package was debianized by Florian Ragwitz <rafl at debianforum.de> on
-Tue, 23 Aug 2005 22:12:04 +0200
+Format-Specification:
+    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: Michael Schilli <m at perlmeister.com>
+Upstream-Source: http://search.cpan.org/dist/SWISH-API-Common/
+Upstream-Name: SWISH-API-Common
 
-The upstream author is: Mike Schilli <cpan at perlmeister.com>
+Files: *
+Copyright: 2005, Mike Schilli <cpan at perlmeister.com>
+License-Alias: Perl
+License: Artistic | GPL-1+
 
-Copyright 2005 by Mike Schilli, all rights reserved.
+Files: debian/*
+Copyright: 2009, Jonathan Yu <frequency at cpan.org>
+ 2008, Frank Lichtenheld <djpig at debian.org>
+ 2008, Gunnar Wolf <gwolf at debian.org>
+ 2005, Florian Ragwitz <rafl at debian.org>
+License: Artistic | GPL-1+
 
-This program is free software, you can redistribute it and/or modify it under
-the same terms as Perl itself.
+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 GNU/Linux systems, the complete text of the Artistic License
+    can be found in `/usr/share/common-licenses/Artistic'
 
-Perl is distributed under your choice of the GNU General Public License or
-the Artistic License.  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'.
+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 GNU/Linux systems, the complete text of the GNU General
+    Public License can be found in `/usr/share/common-licenses/GPL'
+

Modified: trunk/libswish-api-common-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/debian/patches/series?rev=42724&op=diff
==============================================================================
--- trunk/libswish-api-common-perl/debian/patches/series (original)
+++ trunk/libswish-api-common-perl/debian/patches/series Tue Aug 25 02:48:20 2009
@@ -1,3 +1,2 @@
 20swish-e_path.patch
-30fix-makefile-pl.patch
 40provide_VERSION.patch

Modified: trunk/libswish-api-common-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/debian/rules?rev=42724&op=diff
==============================================================================
--- trunk/libswish-api-common-perl/debian/rules (original)
+++ trunk/libswish-api-common-perl/debian/rules Tue Aug 25 02:48:20 2009
@@ -1,64 +1,4 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
-export PERL_MM_USE_DEFAULT=1
-
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP     =$(CURDIR)/debian/$(PACKAGE)
-
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
-	dh_testdir
-	$(PERL) Makefile.PL INSTALLDIRS=vendor
-	$(MAKE) OPTIMIZE="-Wall -O2 -g"
-	touch build-stamp
-
-clean: clean1 unpatch
-clean1:
-	dh_testdir
-	dh_testroot
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean build-stamp install-stamp
-
-install: build install-stamp
-install-stamp:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	$(MAKE) test
-	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-	[ ! -d $(TMP)/usr/lib/perl5 ] || \
-		rmdir --ignore-fail-on-non-empty --parents --verbose \
-		$(TMP)/usr/lib/perl5
-	touch install-stamp
-
-binary-arch:
-# We have nothing to do by default.
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installexamples eg/idx_and_search.pl
-	dh_installdocs
-	dh_installchangelogs Changes
-	dh_perl
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	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 patch unpatch clean1
+%:
+	dh --with quilt $@

Modified: trunk/libswish-api-common-perl/lib/SWISH/API/Common.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/lib/SWISH/API/Common.pm?rev=42724&op=diff
==============================================================================
--- trunk/libswish-api-common-perl/lib/SWISH/API/Common.pm (original)
+++ trunk/libswish-api-common-perl/lib/SWISH/API/Common.pm Tue Aug 25 02:48:20 2009
@@ -9,7 +9,7 @@
 use strict;
 use warnings;
 
-our $VERSION         = "0.03";
+our $VERSION         = "0.04";
 our $SWISH_EXE       = "swish-e";
 our @SWISH_EXE_PATHS = qw(/usr/local/bin);
 




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