r21651 - in /trunk/libfile-scan-perl/debian: changelog control patches/00list patches/10Makefile.PL.dpatch patches/10Makefile.PL.patch patches/20Scan.base.dpatch patches/20Scan.base.patch patches/series rules
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sun Jun 15 17:12:15 UTC 2008
Author: gregoa
Date: Sun Jun 15 17:12:14 2008
New Revision: 21651
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=21651
Log:
Switch patch system from dpatch to quilt.
Added:
trunk/libfile-scan-perl/debian/patches/10Makefile.PL.patch
trunk/libfile-scan-perl/debian/patches/20Scan.base.patch
trunk/libfile-scan-perl/debian/patches/series
Removed:
trunk/libfile-scan-perl/debian/patches/00list
trunk/libfile-scan-perl/debian/patches/10Makefile.PL.dpatch
trunk/libfile-scan-perl/debian/patches/20Scan.base.dpatch
Modified:
trunk/libfile-scan-perl/debian/changelog
trunk/libfile-scan-perl/debian/control
trunk/libfile-scan-perl/debian/rules
Modified: trunk/libfile-scan-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-scan-perl/debian/changelog?rev=21651&op=diff
==============================================================================
--- trunk/libfile-scan-perl/debian/changelog (original)
+++ trunk/libfile-scan-perl/debian/changelog Sun Jun 15 17:12:14 2008
@@ -9,6 +9,7 @@
<rafl at debian.org>); Florian Ragwitz <rafl at debian.org> moved to
Uploaders.
* debian/watch: use dist-based URL.
+ * Switch patch system from dpatch to quilt.
-- gregor herrmann <gregoa at debian.org> Sun, 15 Jun 2008 16:00:07 +0200
Modified: trunk/libfile-scan-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-scan-perl/debian/control?rev=21651&op=diff
==============================================================================
--- trunk/libfile-scan-perl/debian/control (original)
+++ trunk/libfile-scan-perl/debian/control Sun Jun 15 17:12:14 2008
@@ -1,7 +1,7 @@
Source: libfile-scan-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 4), dpatch
+Build-Depends: debhelper (>= 4), quilt (>= 0.40)
Build-Depends-Indep: perl (>= 5.8.0-7)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Florian Ragwitz <rafl at debian.org>
Added: trunk/libfile-scan-perl/debian/patches/10Makefile.PL.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-scan-perl/debian/patches/10Makefile.PL.patch?rev=21651&op=file
==============================================================================
--- trunk/libfile-scan-perl/debian/patches/10Makefile.PL.patch (added)
+++ trunk/libfile-scan-perl/debian/patches/10Makefile.PL.patch Sun Jun 15 17:12:14 2008
@@ -1,0 +1,45 @@
+Author: Florian Ragwitz <florian at mookooh.org>
+Description: Seperate virus-definitions from Scan.pm
+--- libfile-scan-perl.orig/Makefile.PL
++++ libfile-scan-perl/Makefile.PL
+@@ -10,6 +10,7 @@
+ my $min_txt_size = 0;
+ my $signs = "files/signatures.txt";
+ my $susp = "files/suspicious.txt";
++my $data_path = "/var/lib/libfile-scan-perl/";
+
+ my @html_scripting = ("HTMLVBS", "HTMLJS");
+ my $script_lang = {
+@@ -74,6 +75,7 @@
+ 'DISTNAME' => 'File-Scan',
+ 'VERSION_FROM' => 'Scan.pm', # finds $VERSION
+ 'PREREQ_PM' => {}, # e.g., Module::Name => 1.1
++ 'clean' => { 'FILES' => "Scan.pm virus-definitions.pm" },
+ 'dist' => { 'COMPRESS' => 'gzip -9f', 'SUFFIX' => 'gz', },
+ @ppd,
+ );
+@@ -140,13 +142,23 @@
+ open(PMFILE, ">Scan.pm") or die("Can't open Scan.pm: $!");
+ while(<BASEFILE>) {
+ s/\$min_txt_size/$min_txt_size/;
++ s/\@data_path\@/$data_path/;
+ print PMFILE $_;
+ if(/^__DATA__/) {
+- print PMFILE $code;
++ print PMFILE <<DEBIAN;
++This version of File::Scan has been modified for the Debian GNU/Linux
++distribution. The virus definitions have been moved $data_path.
++See README.Debian for details.
++DEBIAN
+ }
+ }
+ close(PMFILE);
+ close(BASEFILE);
++
++ open(DATAFILE, ">virus-definitions.pm") or die("Can't open virus-definitions.pm: $!");
++ print DATAFILE $code;
++ print DATAFILE "1;";
++ close(DATAFILE);
+ }
+
+ sub get_code {
Added: trunk/libfile-scan-perl/debian/patches/20Scan.base.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-scan-perl/debian/patches/20Scan.base.patch?rev=21651&op=file
==============================================================================
--- trunk/libfile-scan-perl/debian/patches/20Scan.base.patch (added)
+++ trunk/libfile-scan-perl/debian/patches/20Scan.base.patch Sun Jun 15 17:12:14 2008
@@ -1,0 +1,23 @@
+Author: Florian Ragwitz <florian at mookooh.org>
+Description: Use external virus-definitions istead of SelfLoader.
+--- libfile-scan-perl.orig/files/Scan.base
++++ libfile-scan-perl/files/Scan.base
+@@ -14,7 +14,6 @@
+
+ require Exporter;
+ use File::Copy;
+-use SelfLoader;
+
+ use vars qw($VERSION @ISA @EXPORT $ERROR $SKIPPED $SUSPICIOUS $CALLBACK);
+
+@@ -23,7 +22,9 @@
+
+ ($ERROR, $SKIPPED, $SUSPICIOUS, $CALLBACK) = ("", 0, 0, "");
+
+-SelfLoader->load_stubs();
++my $data_path = "@data_path@";
++
++do "$data_path/virus-definitions.pm";
+
+ sub new {
+ my $proto = shift;
Added: trunk/libfile-scan-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-scan-perl/debian/patches/series?rev=21651&op=file
==============================================================================
--- trunk/libfile-scan-perl/debian/patches/series (added)
+++ trunk/libfile-scan-perl/debian/patches/series Sun Jun 15 17:12:14 2008
@@ -1,0 +1,2 @@
+10Makefile.PL.patch
+20Scan.base.patch
Modified: trunk/libfile-scan-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-scan-perl/debian/rules?rev=21651&op=diff
==============================================================================
--- trunk/libfile-scan-perl/debian/rules (original)
+++ trunk/libfile-scan-perl/debian/rules Sun Jun 15 17:12:14 2008
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
PACKAGE=$(shell dh_listpackages)
@@ -14,7 +14,7 @@
TMP =$(CURDIR)/debian/$(PACKAGE)
build: build-stamp
-build-stamp: patch-stamp
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
$(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE)
More information about the Pkg-perl-cvs-commits
mailing list