Package: svk
Version: 1.07-0.1
Severity: wishlist
Tags: patch
Hi,
Please find attached the diff of the 1.07-0.1 NMU I've prepared for
svk. I uploaded the changes to the 3-days delayed queue.
Cheers,
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-1-686
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)
Versions of packages svk depends on:
ii libalgorithm-annotate-perl 0.10-1 represent a series of changes in a
ii libalgorithm-diff-perl 1.19.01-2 a perl library for finding Longest
ii libclass-autouse-perl 1.23-1 Defer loading ( 'use'ing ) of a cl
ii libclone-perl 0.18-1 recursively copy Perl datatypes
ii libcompress-zlib-perl 1.41-1 Perl module for creation and manip
ii libdata-hierarchy-perl 0.21-1 Handle data in a hierarchical stru
ii libfile-type-perl 0.22-1 determine file type using magic st
ii libfreezethaw-perl 0.43-2 converting Perl structures to stri
ii libio-digest-perl 0.10-1 Calculate digests while reading or
ii libio-string-perl 1.05-1 Emulate IO::File interface for in-
ii liblocale-maketext-lexicon- 0.53-2 Lexicon-handling backends for "Loc
ii liblocale-maketext-simple-p 0.12-2 Simple interface to Locale::Makete
ii libperlio-eol-perl 0.13-1 PerlIO layer for normalizing line
ii libperlio-via-dynamic-perl 0.11-1 dynamic PerlIO layers
ii libperlio-via-symlink-perl 0.05-1 PerlIO layers for create symlinks
ii libpod-simple-perl 3.04-1 Perl framework for parsing files i
ii libregexp-shellish-perl 0.93-1 Shell-like regular expressions
ii libsvn-core-perl 1.2.3dfsg1-3 perl bindings for Subversion (aka.
ii libsvn-mirror-perl 0.68-1 A subversion repository mirroring
ii libsvn-simple-perl 0.27-1 A simple interface for writing a d
ii libtext-diff-perl 0.35-2 Perform diffs on files and record
ii libtimedate-perl 1.1600-5 Time and date functions for Perl
ii libyaml-perl 0.57-2 YAML Ain't Markup Language (tm)
ii perl 5.8.8-2 Larry Wall's Practical Extraction
ii subversion 1.2.3dfsg1-3 advanced version control system (a
svk recommends no packages.
-- no debconf information
--
Loïc Minier <[EMAIL PROTECTED]>
Current Earth status: NOT DESTROYED
--- svk-1.06/debian/changelog
+++ svk-1.07/debian/changelog
@@ -1,3 +1,24 @@
+svk (1.07-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release. (Closes: #336387)
+ - Fixes prototype mismatch warning caused by autouse and Perl 5.8.8.
+ (Closes: #353455)
+ * Add a subversion Depends for svnadmin, called in the admin command, thanks
+ John V. Belmonte. (Closes: #298224)
+ [debian/control]
+ * Fix watch file by using search.cpan.org URLs.
+ [debian/watch]
+ * Bump up Standards-Version to 3.6.2.
+ [debian/control]
+ * Use gnuclient.emacs instead of gnuclient-emacs, thanks Otavio Salvador.
+ (Closes: #289086)
+ [lib/SVK/Resolve/Emacs.pm]
+ * Install new bash completion, thanks Luis Mondesi. (Closes: #305950)
+ [debian/bash_completion, debian/rules]
+
+ -- Loic Minier <[EMAIL PROTECTED]> Sat, 11 Mar 2006 23:09:46 +0100
+
svk (1.06-1) unstable; urgency=low
* New upstream version.
--- svk-1.06/debian/control
+++ svk-1.07/debian/control
@@ -4,11 +4,11 @@
Build-Depends: debhelper (>= 4.0.2)
Build-Depends-Indep: perl (>= 5.8.0-7), gnupg, libalgorithm-annotate-perl,
libalgorithm-diff-perl, libclass-autouse-perl (>= 1.15), libclone-perl,
libcompress-zlib-perl, libdata-hierarchy-perl (>= 0.21), libfile-type-perl,
libfreezethaw-perl, libio-digest-perl, libio-string-perl,
liblocale-maketext-lexicon-perl (>= 0.42), liblocale-maketext-simple-perl,
libperlio-eol-perl, libperlio-via-dynamic-perl (>= 0.11),
libperlio-via-symlink-perl, libpod-simple-perl, libregexp-shellish-perl,
libsvn-core-perl (>= 1.0.7), libsvn-mirror-perl (>= 0.66), libsvn-simple-perl
(>= 0.27), libtext-diff-perl, libtimedate-perl, libyaml-perl (>= 0.38)
Maintainer: Bastian Blank <[EMAIL PROTECTED]>
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2
Package: svk
Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, libalgorithm-annotate-perl,
libalgorithm-diff-perl, libclass-autouse-perl (>= 1.15), libclone-perl,
libcompress-zlib-perl, libdata-hierarchy-perl (>= 0.21), libfile-type-perl,
libfreezethaw-perl, libio-digest-perl, libio-string-perl,
liblocale-maketext-lexicon-perl (>= 0.42), liblocale-maketext-simple-perl,
libperlio-eol-perl, libperlio-via-dynamic-perl (>= 0.11),
libperlio-via-symlink-perl, libpod-simple-perl, libregexp-shellish-perl,
libsvn-core-perl (>= 1.0.7), libsvn-mirror-perl (>= 0.66), libsvn-simple-perl
(>= 0.27), libtext-diff-perl, libtimedate-perl, libyaml-perl (>= 0.38)
+Depends: ${perl:Depends}, ${misc:Depends}, subversion,
libalgorithm-annotate-perl, libalgorithm-diff-perl, libclass-autouse-perl (>=
1.15), libclone-perl, libcompress-zlib-perl, libdata-hierarchy-perl (>= 0.21),
libfile-type-perl, libfreezethaw-perl, libio-digest-perl, libio-string-perl,
liblocale-maketext-lexicon-perl (>= 0.42), liblocale-maketext-simple-perl,
libperlio-eol-perl, libperlio-via-dynamic-perl (>= 0.11),
libperlio-via-symlink-perl, libpod-simple-perl, libregexp-shellish-perl,
libsvn-core-perl (>= 1.0.7), libsvn-mirror-perl (>= 0.66), libsvn-simple-perl
(>= 0.27), libtext-diff-perl, libtimedate-perl, libyaml-perl (>= 0.38)
Suggests: gnupg
Description: A Distributed Version Control System
svk is a decentralized version control system written in Perl.
--- svk-1.06/debian/watch
+++ svk-1.07/debian/watch
@@ -2 +2 @@
-http://www.cpan.org/pub/CPAN/authors/id/C/CL/CLKAO/SVK-(.*)\.tar.gz
+http://search.cpan.org/CPAN/authors/id/C/CL/CLKAO/SVK-(.*)\.tar.gz
--- svk-1.06/debian/rules
+++ svk-1.07/debian/rules
@@ -55,6 +55,7 @@
# dh_installcron
# dh_installmenu
# dh_installexamples
+ dh_install debian/bash_completion etc/bash_completion.d/svk
dh_installdocs README
dh_installchangelogs CHANGES
dh_perl
--- svk-1.07.orig/lib/SVK/Resolve/Emacs.pm
+++ svk-1.07/lib/SVK/Resolve/Emacs.pm
@@ -4,7 +4,7 @@
use SVK::I18N;
use SVK::Util qw( devnull );
-sub commands { 'gnuclient-emacs' }
+sub commands { 'gnuclient.emacs' }
sub arguments {
my $self = shift;
--- svk-1.07.orig/debian/bash_completion
+++ svk-1.07/debian/bash_completion
@@ -0,0 +1,207 @@
+# Programmable completion for the svk command under bash.
+# This file was inspired on svn bash_completion file
+# Source this file to use it
+# Known to work with bash 2.05a with programmable completion and extended
+# pattern matching enabled (use 'shopt -s extglob progcomp' to enable
+# these if they are not already enabled).
+
+_svk()
+{
+ local cur cmds cmdOpts pOpts mOpts rOpts qOpts nOpts optsParam opt
+ local helpCmds optBase i
+
+ COMPREPLY=()
+ cur=${COMP_WORDS[COMP_CWORD]}
+
+ # Possible expansions, without unambiguous abbreviations such as "up".
+ cmds='add blame annotate praise cat checkout co cleanup commit ci \
+ copy cp delete remove rm diff export help ? import info \
+ list ls log merge mkdir move mv rename \
+ propdel pdel propedit pedit propget pget \
+ proplist plist propset pset resolved revert \
+ status switch update --version'
+
+ if [[ $COMP_CWORD -eq 1 ]] ; then
+ COMPREPLY=( $( compgen -W "$cmds" -- $cur ) )
+ return 0
+ fi
+
+ # options that require a parameter
+ # note: continued lines must end '|' continuing lines must start '|'
+ optsParam="-r|--revision|--username|--password|--targets|
+ |-x|--extensions|-m|--message|-F|--file|--encoding|
+ |--diff-cmd|--diff3-cmd|--editor-cmd|--old|--new|
+ |--config-dir|--native-eol"
+
+ # if not typing an option, or if the previous option required a
+ # parameter, then fallback on ordinary filename expansion
+ helpCmds='help|--help|h|\?'
+ if [[ ${COMP_WORDS[1]} != @($helpCmds) ]] && \
+ [[ "$cur" != -* ]] || \
+ [[ ${COMP_WORDS[COMP_CWORD-1]} == @($optsParam) ]] ; then
+ return 0
+ fi
+
+ pOpts="--username --password --no-auth-cache --non-interactive"
+ mOpts="-m --message -F --file --encoding --force-log"
+ rOpts="-r --revision"
+ qOpts="-q --quiet"
+ nOpts="-N --non-recursive"
+
+ # possible options for the command
+ cmdOpts=
+ case ${COMP_WORDS[1]} in
+ --version)
+ cmdOpts="$qOpts"
+ ;;
+ add)
+ cmdOpts="--auto-props --no-auto-props --force --targets \
+ $nOpts $qOpts"
+ ;;
+ blame|annotate|ann|praise)
+ cmdOpts="$rOpts $pOpts -v --verbose"
+ ;;
+ cat)
+ cmdOpts="$rOpts $pOpts"
+ ;;
+ checkout|co)
+ cmdOpts="$rOpts $qOpts $nOpts $pOpts"
+ ;;
+ cleanup)
+ cmdOpts="--diff3-cmd"
+ ;;
+ commit|ci)
+ cmdOpts="$mOpts $qOpts $nOpts --targets --editor-cmd $pOpts"
+ ;;
+ copy|cp)
+ cmdOpts="$mOpts $rOpts $qOpts --editor-cmd $pOpts"
+ ;;
+ delete|del|remove|rm)
+ cmdOpts="--force $mOpts $qOpts --targets --editor-cmd $pOpts"
+ ;;
+ diff|di)
+ cmdOpts="$rOpts -x --extensions --diff-cmd --no-diff-deleted \
+ $nOpts $pOpts --old --new --notice-ancestry"
+ ;;
+ export)
+ cmdOpts="$rOpts $qOpts $pOpts --force --native-eol"
+ ;;
+ help|h|\?)
+ cmdOpts="$cmds $qOpts"
+ ;;
+ import)
+ cmdOpts="--auto-props --no-auto-props $mOpts $qOpts $nOpts \
+ --editor-cmd $pOpts"
+ ;;
+ info)
+ cmdOpts="--targets -R --recursive"
+ ;;
+ list|ls)
+ cmdOpts="$rOpts -v --verbose -R --recursive $pOpts"
+ ;;
+ log)
+ cmdOpts="$rOpts -v --verbose --targets $pOpts --stop-on-copy \
+ --incremental --xml $qOpts"
+ ;;
+ merge)
+ cmdOpts="$rOpts $nOpts $qOpts --force --dry-run --diff3-cmd \
+ $pOpts --ignore-ancestry"
+ ;;
+ mkdir)
+ cmdOpts="$mOpts $qOpts --editor-cmd $pOpts"
+ ;;
+ move|mv|rename|ren)
+ cmdOpts="$mOpts $rOpts $qOpts --force --editor-cmd $pOpts"
+ ;;
+ propdel|pdel|pd)
+ cmdOpts="$qOpts -R --recursive $rOpts --revprop $pOpts"
+ ;;
+ propedit|pedit|pe)
+ cmdOpts="$rOpts --revprop --encoding --editor-cmd $pOpts \
+ --force"
+ ;;
+ propget|pget|pg)
+ cmdOpts="-R --recursive $rOpts --revprop --strict $pOpts"
+ ;;
+ proplist|plist|pl)
+ cmdOpts="-v --verbose -R --recursive $rOpts --revprop $qOpts \
+ $pOpts"
+ ;;
+ propset|pset|ps)
+ cmdOpts="-F --file $qOpts --targets -R --recursive --revprop \
+ --encoding $pOpts $rOpts --force"
+ ;;
+ resolved)
+ cmdOpts="--targets -R --recursive $qOpts"
+ ;;
+ revert)
+ cmdOpts="--targets -R --recursive $qOpts"
+ ;;
+ status|stat|st)
+ cmdOpts="-u --show-updates -v --verbose $nOpts $qOpts $pOpts \
+ --no-ignore"
+ ;;
+ switch|sw)
+ cmdOpts="--relocate $rOpts $nOpts $qOpts $pOpts --diff3-cmd"
+ ;;
+ update|up)
+ cmdOpts="$rOpts $nOpts $qOpts $pOpts --diff3-cmd"
+ ;;
+ *)
+ ;;
+ esac
+
+ cmdOpts="$cmdOpts --help -h --config-dir"
+
+ # take out options already given
+ for (( i=2; i<=$COMP_CWORD-1; ++i )) ; do
+ opt=${COMP_WORDS[$i]}
+
+ case $opt in
+ --*) optBase=${opt/=*/} ;;
+ -*) optBase=${opt:0:2} ;;
+ esac
+
+ cmdOpts=" $cmdOpts "
+ cmdOpts=${cmdOpts/ ${optBase} / }
+
+ # take out alternatives and mutually exclusives
+ case $optBase in
+ -v) cmdOpts=${cmdOpts/ --verbose / } ;;
+ --verbose) cmdOpts=${cmdOpts/ -v / } ;;
+ -N) cmdOpts=${cmdOpts/ --non-recursive / } ;;
+ --non-recursive) cmdOpts=${cmdOpts/ -N / } ;;
+ -R) cmdOpts=${cmdOpts/ --recursive / } ;;
+ --recursive) cmdOpts=${cmdOpts/ -R / } ;;
+ -x) cmdOpts=${cmdOpts/ --extensions / } ;;
+ --extensions) cmdOpts=${cmdOpts/ -x / } ;;
+ -q) cmdOpts=${cmdOpts/ --quiet / } ;;
+ --quiet) cmdOpts=${cmdOpts/ -q / } ;;
+ -h) cmdOpts=${cmdOpts/ --help / } ;;
+ --help) cmdOpts=${cmdOpts/ -h / } ;;
+ -r) cmdOpts=${cmdOpts/ --revision / } ;;
+ --revision) cmdOpts=${cmdOpts/ -r / } ;;
+ --auto-props) cmdOpts=${cmdOpts/ --no-auto-props / } ;;
+ --no-auto-props) cmdOpts=${cmdOpts/ --auto-props / } ;;
+
+ -m|--message|-F|--file)
+ cmdOpts=${cmdOpts/ --message / }
+ cmdOpts=${cmdOpts/ -m / }
+ cmdOpts=${cmdOpts/ --file / }
+ cmdOpts=${cmdOpts/ -F / }
+ ;;
+ esac
+
+ # skip next option if this one requires a parameter
+ if [[ $opt == @($optsParam) ]] ; then
+ ((++i))
+ fi
+ done
+
+ COMPREPLY=( $( compgen -W "$cmdOpts" -- $cur ) )
+
+ return 0
+}
+complete -F _svk -o default svk
+
+
