Commit 8cd4afd2 authored by Mike Miller's avatar Mike Miller

Refresh all patches so they apply cleanly.

parent c21ab7a3
......@@ -2,6 +2,7 @@ cdargs (1.35-10) UNRELEASED; urgency=low
* Create symlink to emacs lisp source as required by Debian Emacs
Policy. (Closes: #713003)
* Refresh all patches so they apply cleanly.
* Canonicalize Vcs-* control fields.
* Remove obsolete DM-Upload-Allowed control field.
* Bump Standards-Version to 3.9.4. No changes needed.
......
......@@ -6,7 +6,7 @@ Last-Update: 2006-04-17
--- a/contrib/cdargs-bash.sh
+++ b/contrib/cdargs-bash.sh
@@ -32,15 +32,15 @@ function _cdargs_get_dir ()
@@ -30,15 +30,15 @@ function _cdargs_get_dir ()
# if there is one exact match (possibly with extra path info after it),
# then just use that match without calling cdargs
if [ -e "$HOME/.cdargs" ]; then
......@@ -26,7 +26,7 @@ Last-Update: 2006-04-17
fi
if [ -z "$dir" -o "$dir" != "${dir/
/}" ]; then
@@ -49,7 +49,7 @@ function _cdargs_get_dir ()
@@ -47,7 +47,7 @@ function _cdargs_get_dir ()
dir=
if cdargs --noresolve "${1/\/*/}"; then
dir=`cat "$HOME/.cdargsresult"`
......@@ -35,7 +35,7 @@ Last-Update: 2006-04-17
fi
fi
if [ -z "$dir" ]; then
@@ -166,10 +166,10 @@ function mark ()
@@ -164,10 +164,10 @@ function mark ()
local tmpfile
# first clear any bookmarks with this same alias, if file exists
......@@ -49,7 +49,7 @@ Last-Update: 2006-04-17
fi
# add the alias to the list of bookmarks
cdargs --add=":$1:`pwd`";
@@ -218,7 +218,7 @@ function _cdargs_aliases ()
@@ -216,7 +216,7 @@ function _cdargs_aliases ()
cur=${COMP_WORDS[COMP_CWORD]}
if [ "$cur" != "${cur/\//}" ]; then # if at least one /
bookmark="${cur/\/*/}"
......@@ -58,7 +58,7 @@ Last-Update: 2006-04-17
if [ -n "$dir" -a "$dir" = "${dir/
/}" -a -d "$dir" ]; then
strip="${dir//?/.}"
@@ -226,8 +226,8 @@ function _cdargs_aliases ()
@@ -224,8 +224,8 @@ function _cdargs_aliases ()
IFS='
'
COMPREPLY=( $(
......
......@@ -5,7 +5,7 @@ Last-Update: 2009-03-29
--- a/contrib/cdargs-bash.sh
+++ b/contrib/cdargs-bash.sh
@@ -256,4 +256,14 @@ _cdargs_complete() {
@@ -254,4 +254,14 @@ _cdargs_complete() {
complete $nospace -S / -X '*/' -F _cdargs_aliases cv cb cdb
}
......
......@@ -5,7 +5,7 @@ Last-Update: 2009-03-29
--- a/doc/cdargs.1
+++ b/doc/cdargs.1
@@ -22,7 +22,7 @@ you can jump to various places throughout the file-system
@@ -22,7 +22,7 @@ you can jump to various places throughou
that are defined using a plain text, line oriented bookmarks file.
.PP
You can create bookmarks by editing your bookmarks file
......
......@@ -5,7 +5,7 @@ Last-Update: 2003-01-31
--- a/doc/cdargs.1
+++ b/doc/cdargs.1
@@ -284,19 +284,22 @@ bold font (if the terminal emulation understands that attribute).
@@ -284,19 +284,22 @@ bold font (if the terminal emulation und
.SH "FILES"
......
......@@ -6,7 +6,7 @@ Last-Update: 2008-03-11
--- a/doc/cdargs.1
+++ b/doc/cdargs.1
@@ -331,5 +331,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -334,5 +334,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICU
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment