r9802 - in /trunk/libxml-sax-perl: SAX.pm debian/changelog debian/dirs debian/libxml-sax-perl.postinst update-perl-sax-parsers

ntyni-guest at users.alioth.debian.org ntyni-guest at users.alioth.debian.org
Tue Nov 27 18:56:19 UTC 2007


Author: ntyni-guest
Date: Tue Nov 27 18:56:19 2007
New Revision: 9802

URL: http://svn.debian.org/wsvn/?sc=1&rev=9802
Log:
* Move the ParserDetails.d under /var

Added:
    trunk/libxml-sax-perl/debian/dirs
Modified:
    trunk/libxml-sax-perl/SAX.pm
    trunk/libxml-sax-perl/debian/changelog
    trunk/libxml-sax-perl/debian/libxml-sax-perl.postinst
    trunk/libxml-sax-perl/update-perl-sax-parsers

Modified: trunk/libxml-sax-perl/SAX.pm
URL: http://svn.debian.org/wsvn/trunk/libxml-sax-perl/SAX.pm?rev=9802&op=diff
==============================================================================
--- trunk/libxml-sax-perl/SAX.pm (original)
+++ trunk/libxml-sax-perl/SAX.pm Tue Nov 27 18:56:19 2007
@@ -219,14 +219,14 @@
 
 sub save_parsers_debian {
     my $class = shift;
-    my ($parser_module,$directory) = @_;
+    my ($parser_module,$directory, $priority) = @_;
 
     # add parser
     $known_parsers = [];
     $class->add_parser($parser_module);
     
     # get parser's ParserDetails file
-    my $file = File::Spec->catfile($directory, $parser_module);
+    my $file = File::Spec->catfile($directory, $priority . "-" . $parser_module);
     chmod 0644, $file;
     unlink($file);
     

Modified: trunk/libxml-sax-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libxml-sax-perl/debian/changelog?rev=9802&op=diff
==============================================================================
--- trunk/libxml-sax-perl/debian/changelog (original)
+++ trunk/libxml-sax-perl/debian/changelog Tue Nov 27 18:56:19 2007
@@ -1,3 +1,9 @@
+libxml-sax-perl (0.16-0.2) unstable; urgency=low
+
+  * Move the ParserDetails.d under /var
+
+ -- Niko Tyni <ntyni at iki.fi>  Tue, 06 Nov 2007 13:32:53 +0200
+
 libxml-sax-perl (0.16-0.1) unstable; urgency=low
 
   * Non-maintainer upload.

Added: trunk/libxml-sax-perl/debian/dirs
URL: http://svn.debian.org/wsvn/trunk/libxml-sax-perl/debian/dirs?rev=9802&op=file
==============================================================================
--- trunk/libxml-sax-perl/debian/dirs (added)
+++ trunk/libxml-sax-perl/debian/dirs Tue Nov 27 18:56:19 2007
@@ -1,0 +1,1 @@
+/var/lib/libxml-sax-perl/ParserDetails.d

Modified: trunk/libxml-sax-perl/debian/libxml-sax-perl.postinst
URL: http://svn.debian.org/wsvn/trunk/libxml-sax-perl/debian/libxml-sax-perl.postinst?rev=9802&op=diff
==============================================================================
--- trunk/libxml-sax-perl/debian/libxml-sax-perl.postinst (original)
+++ trunk/libxml-sax-perl/debian/libxml-sax-perl.postinst Tue Nov 27 18:56:19 2007
@@ -9,7 +9,18 @@
 ## ----------------------------------------------------------------------
 if [ "$1" = configure ]
 then
-    update-perl-sax-parsers --quiet --add XML::SAX::PurePerl
+    if [ -n "$2" ] && dpkg --compare-versions "$2" lt 0.16-0.2
+    then
+        update-perl-sax-parsers --quiet --remove XML::SAX::PurePerl
+
+        for i in /etc/perl/XML/SAX/ParserDetails.d/*
+        do
+            mv "$i" "/var/lib/libxml-sax-perl/ParserDetails.d/50-$(basename $i)"
+        done
+        rmdir --ignore-fail-on-non-empty /etc/perl/XML/SAX/ParserDetails.d
+    fi
+
+    update-perl-sax-parsers --quiet --add XML::SAX::PurePerl --priority 10
     update-perl-sax-parsers --quiet --update
 fi
 

Modified: trunk/libxml-sax-perl/update-perl-sax-parsers
URL: http://svn.debian.org/wsvn/trunk/libxml-sax-perl/update-perl-sax-parsers?rev=9802&op=diff
==============================================================================
--- trunk/libxml-sax-perl/update-perl-sax-parsers (original)
+++ trunk/libxml-sax-perl/update-perl-sax-parsers Tue Nov 27 18:56:19 2007
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 ## ----------------------------------------------------------------------
-## Debian update-perl-sax-parsers version 0.2
+## Debian update-perl-sax-parsers version 0.3
 ## ----------------------------------------------------------------------
 ## Copyright (C) 2001-2003 Ardo van Rangelrooij
 ##
@@ -32,6 +32,7 @@
 my $test      = '';
 my $update    = '';
 my $version   = '';
+my $priority  = 50; # default priority
 
 ## ----------------------------------------------------------------------
 if ( ! GetOptions(
@@ -44,6 +45,7 @@
 		  'test'        => \$test,
 		  'update'      => \$update,
 		  'version'     => \$version,
+		  'priority=i'  => \$priority,
 		  )
      )
 {
@@ -71,7 +73,7 @@
     if $test && ! $quiet;
 
 ## ----------------------------------------------------------------------
-my $PARSER_DETAILS_DIR  = "/etc/perl/XML/SAX/ParserDetails.d";
+my $PARSER_DETAILS_DIR  = "/var/lib/libxml-sax-perl/ParserDetails.d";
 push( @directory, $PARSER_DETAILS_DIR) if ! @directory;
 
 ## ----------------------------------------------------------------------
@@ -84,14 +86,14 @@
     print "$name: Adding Perl SAX parser module info file of $add...\n"
         unless $quiet;
     
-    XML::SAX->save_parsers_debian( $add, $directory[0] );
+    XML::SAX->save_parsers_debian( $add, $directory[0], $priority );
 }
 elsif ( $remove )
 {
     print "$name: Removing Perl SAX parser module info file of $remove...\n"
         unless $quiet;
     
-    my $parser_file = File::Spec->catfile( $directory[0], $remove);
+    my $parser_file = File::Spec->catfile( $directory[0], $priority . "-" . $remove);
     unlink( $parser_file );
 }
 elsif ( $update )
@@ -105,7 +107,8 @@
     {
 	opendir( PARSER_DETAILS_DIR, $directory )
 	    || die "Cannot access $directory: $!";
-	while ( defined( my $parser_details = readdir( PARSER_DETAILS_DIR ) ) )
+    my @files = sort readdir ( PARSER_DETAILS_DIR );
+	for my $parser_details ( @files )
 	{
 	    next if $parser_details =~ /^\.\.?$/; # skip . and ..
 	    open( PARSER_DETAILS, "$directory/$parser_details" )
@@ -134,6 +137,8 @@
     --directory     Perl SAX parser module info file directory to be used
                     as target for 'add'/'remove' or as sources for 'update'
                     (default = '/etc/perl/XML/SAX/ParserDetails.d')
+    --priority      The priority of the parser to add. The parser with the
+                    highest priority is the default parser.
     --file          Perl SAX parser module info file to be updated
                     (default = '/etc/perl/XML/SAX/ParserDetails.ini')
     --help          display this help text (usage)
@@ -146,7 +151,7 @@
 ## ----------------------------------------------------------------------
 sub version
 {
-    print "Debian $name version 0.2\n";
+    print "Debian $name version 0.3\n";
 }
 
 ## ----------------------------------------------------------------------




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