r16532 - in /trunk/libsql-statement-perl: debian/changelog debian/control debian/patches/ debian/patches/series debian/patches/update_previous_values.patch debian/rules lib/SQL/Statement.pm

[gregoa-guest at users.alioth.debian.org]

Author: gregoa-guest
Date: Wed Mar  5 18:45:30 2008
New Revision: 16532

URL: http://svn.debian.org/wsvn/?sc=1&rev=16532
Log:
Split patch for #311788 out; add quilt framework.

Added:
    trunk/libsql-statement-perl/debian/patches/
    trunk/libsql-statement-perl/debian/patches/series
    trunk/libsql-statement-perl/debian/patches/update_previous_values.patch
Modified:
    trunk/libsql-statement-perl/debian/changelog
    trunk/libsql-statement-perl/debian/control
    trunk/libsql-statement-perl/debian/rules
    trunk/libsql-statement-perl/lib/SQL/Statement.pm

Modified: trunk/libsql-statement-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libsql-statement-perl/debian/changelog?rev=16532&op=diff
==============================================================================
--- trunk/libsql-statement-perl/debian/changelog (original)
+++ trunk/libsql-statement-perl/debian/changelog Wed Mar  5 18:45:30 2008
@@ -11,8 +11,9 @@
     copyright.
   * Set Standards-Version to 3.7.3 (no changes).
   * Remove build-dependency on perl-doc.
+  * Split patch for #311788 out; add quilt framework.
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Wed, 05 Mar 2008 19:36:18 +0100
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Wed, 05 Mar 2008 19:43:16 +0100
 
 libsql-statement-perl (1.15-2) unstable; urgency=low
 

Modified: trunk/libsql-statement-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libsql-statement-perl/debian/control?rev=16532&op=diff
==============================================================================
--- trunk/libsql-statement-perl/debian/control (original)
+++ trunk/libsql-statement-perl/debian/control Wed Mar  5 18:45:30 2008
@@ -7,7 +7,7 @@
 Homepage: http://search.cpan.org/dist/SQL-Statement/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libsql-statement-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-statement-perl/
-Build-Depends: debhelper (>= 5.0)
+Build-Depends: debhelper (>= 5.0), quilt
 Build-Depends-Indep: perl (>= 5.8), libdbi-perl, libdbd-xbase-perl
 
 Package: libsql-statement-perl

Added: trunk/libsql-statement-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libsql-statement-perl/debian/patches/series?rev=16532&op=file
==============================================================================
--- trunk/libsql-statement-perl/debian/patches/series (added)
+++ trunk/libsql-statement-perl/debian/patches/series Wed Mar  5 18:45:30 2008
@@ -1,0 +1,1 @@
+update_previous_values.patch

Added: trunk/libsql-statement-perl/debian/patches/update_previous_values.patch
URL: http://svn.debian.org/wsvn/trunk/libsql-statement-perl/debian/patches/update_previous_values.patch?rev=16532&op=file
==============================================================================
--- trunk/libsql-statement-perl/debian/patches/update_previous_values.patch (added)
+++ trunk/libsql-statement-perl/debian/patches/update_previous_values.patch Wed Mar  5 18:45:30 2008
@@ -1,0 +1,12 @@
+--- libsql-statement-perl.orig/lib/SQL/Statement.pm
++++ libsql-statement-perl/lib/SQL/Statement.pm
+@@ -1762,7 +1762,8 @@
+     # we use the existing S::S::Func object
+     #
+     use SQL::Statement::Util;
+-    if ( $type eq 'function' and $structure->{name} !~ /(TRIM|SUBSTRING)/i ){
++    if ( $type eq 'function' and $structure->{name} =~ /[A-Z]/ and 
++	 $structure->{name}!~ /(TRIM|SUBSTRING)/i ){
+         $self->{loaded_function}->{$structure->{name}}
+             ||= SQL::Statement::Util::Function->new($structure);
+         $structure = $self->{loaded_function}->{$structure->{name}};

Modified: trunk/libsql-statement-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libsql-statement-perl/debian/rules?rev=16532&op=diff
==============================================================================
--- trunk/libsql-statement-perl/debian/rules (original)
+++ trunk/libsql-statement-perl/debian/rules Wed Mar  5 18:45:30 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.
@@ -20,7 +22,7 @@
 TMP     =$(CURDIR)/debian/$(PACKAGE)
 
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
@@ -29,7 +31,7 @@
 
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 

Modified: trunk/libsql-statement-perl/lib/SQL/Statement.pm
URL: http://svn.debian.org/wsvn/trunk/libsql-statement-perl/lib/SQL/Statement.pm?rev=16532&op=diff
==============================================================================
--- trunk/libsql-statement-perl/lib/SQL/Statement.pm (original)
+++ trunk/libsql-statement-perl/lib/SQL/Statement.pm Wed Mar  5 18:45:30 2008
@@ -1762,8 +1762,7 @@
     # we use the existing S::S::Func object
     #
     use SQL::Statement::Util;
-    if ( $type eq 'function' and $structure->{name} =~ /[A-Z]/ and 
-	 $structure->{name}!~ /(TRIM|SUBSTRING)/i ){
+    if ( $type eq 'function' and $structure->{name} !~ /(TRIM|SUBSTRING)/i ){
         $self->{loaded_function}->{$structure->{name}}
             ||= SQL::Statement::Util::Function->new($structure);
         $structure = $self->{loaded_function}->{$structure->{name}};