--- fish-1.23.0.orig/doc_src/and.txt
+++ fish-1.23.0/doc_src/and.txt
@@ -17,7 +17,7 @@
\subsection and-example Example
The following code runs the \c make command to build a program, if the
-build succceeds, the program is installed. If either step fails,
+build succeeds, the program is installed. If either step fails,
make clean is run, which removes the files created by the
build process
--- fish-1.23.0.orig/doc_src/index.hdr.in
+++ fish-1.23.0/doc_src/index.hdr.in
@@ -138,8 +138,8 @@
- '\\xxx', where xx is a hexadecimal number, escapes the ascii character with the specified value. For example, \\x9 is the tab character.
- '\\Xxx', where xx is a hexadecimal number, escapes a byte of data with the specified value. If you are using a mutibyte encoding, this can be used to enter invalid strings. Only use this if you know what you are doing.
- '\\ooo', where ooo is an octal number, escapes the ascii character with the specified value. For example, \\011 is the tab character.
-- '\\uxxxx', where xxxx is a hexadecimal number, escapes the 16-bit unicode character with the specified value. For example, \\u9 is the tab character.
-- '\\Uxxxxxxxx', where xxxxxxxx is a hexadecimal number, escapes the 32-bit unicode character with the specified value. For example, \\U9 is the tab character.
+- '\\uxxxx', where xxxx is a hexadecimal number, escapes the 16-bit Unicode character with the specified value. For example, \\u9 is the tab character.
+- '\\Uxxxxxxxx', where xxxxxxxx is a hexadecimal number, escapes the 32-bit Unicode character with the specified value. For example, \\U9 is the tab character.
- '\\cx', where x is a letter of the alphabet, escapes the control sequence generated by pressing the control key and the specified letter. For example, \\ci is the tab character
\subsection redirects IO redirection
@@ -306,7 +306,7 @@
The default value for \$fish_function_path is \c ~/.config/fish/functions
\c /etc/fish/functions \c /usr/share/fish/functions. The exact path
-to the last two of these may be slighly different depending on what
+to the last two of these may be slightly different depending on what
install path prefix was chosen at configuration time. The rationale
behind having three different directories is that the first one is for
user specific functions, the second one is for system-wide additional
@@ -466,11 +466,11 @@
__fish_complete_pids
-prints a list of all procceses IDs with the command name as description.
+prints a list of all processes IDs with the command name as description.
__fish_complete_suffix SUFFIX
-performs file completion allowing only files ending in SUFFIX. The mimetype database is usded to find a suitable description.
+performs file completion allowing only files ending in SUFFIX. The mimetype database is used to find a suitable description.
__fish_complete_users
@@ -494,7 +494,7 @@
__fish_print_packages
prints a list of all installed packages. This function currently handles
-debian, rpm and gentoo packages.
+Debian, rpm and Gentoo packages.
@@ -509,7 +509,7 @@
The default value for \$fish_complete_path is ~/.config/fish/completions,
/etc/fish/completions and /usr/share/fish/completions. The exact
-path to the last two of these may be slighly different depending on
+path to the last two of these may be slightly different depending on
what install path prefix was chosen at configuration time. If a
suitable file is found in one of these directories, it will be
automatically loaded and the search will be stopped. The rationale
@@ -519,14 +519,14 @@
If you have written new completions for a common
Unix command, please consider sharing your work by sending it to the fish mailinglist.
+href='mailto: fish-users@lists.sf.net'>the fish mailing list.
\section expand Parameter expansion (Globbing)
When an argument for a program is given on the commandline, it
undergoes the process of parameter expansion before it is sent on to
-the command. Parameter expansion is a powerful set of mechamisms that
+the command. Parameter expansion is a powerful set of mechanisms that
allow you to expand the parameter in various ways, including
performing wildcard matching on files, inserting the value of
environment variables into the parameter or even using the output of
@@ -749,7 +749,7 @@
Example:
-To use the value of a the variable \c smurf, write $ (dollar symbol)
+To use the value of the variable \c smurf, write $ (dollar symbol)
followed by the name of the variable, like echo Smurfs are
usually $smurf_color, which would print the result 'Smurfs are
usually blue'.
@@ -868,7 +868,7 @@
Note that array indices start at 1 in fish, not 0, as is more common
-in other languages. This is because many common unix tools like seq
+in other languages. This is because many common Unix tools like seq
are more suited to such use.
If you do not use any brackets, all the elements of the array will be
@@ -975,7 +975,7 @@
href='commands.html#set_color'>set_color command. The \c --bold
or \c -b switches accepted by \c set_color are also accepted.
-The following variables are available to change the highligting colors
+The following variables are available to change the highlighting colors
in fish:
- \c fish_color_normal, the default color
@@ -1050,7 +1050,7 @@
- Alt-left and Alt-right moves one word left or right, or moves forward/backward in the directory history if the commandline is empty
- Up and down search the command history for the previous/next command containing the string that was specified on the commandline before the search was started. If the commandline was empty when the search started, all commands match. See the history section for more information on history searching.
- Alt-up and Alt-down search the command history for the previous/next token containing the token under the cursor before the search was started. If the commandline was not on a token when the search started, all tokens match. See the history section for more information on history searching.
-- Delete and backspace removes one character forwards or backwards respecitvely
+- Delete and backspace removes one character forwards or backwards respectively
- Ctrl-c deletes entire line
- Ctrl-d delete one character to the right of the cursor, unless the buffer is empty, in which case the shell will exit
- Ctrl-k move contents from the cursor to the end of line to the killring
@@ -1140,7 +1140,7 @@
- Pressing the enter key while a block of commands is unclosed, i.e. when one or more block commands such as 'for', 'begin' or 'if' do not have a corresponding 'end' command.
- Pressing Alt-enter instead of pressing the enter key.
-- By backslash escaping a newline, i.e. by inserting a backslash (\\) character pefore pressing the enter key.
+- By backslash escaping a newline, i.e. by inserting a backslash (\\) character before pressing the enter key.
The fish commandline editor works exactly the same in single line mode
and in multiline mode. To move between lines use the left and right
@@ -1280,9 +1280,9 @@
documentation for the function
command.
-\subsection debuging Debuging fish scripts
+\subsection debugging Debugging fish scripts
-Fish includes a built in debuger. The debuger allows you to stop
+Fish includes a built in debugger. The debugger allows you to stop
execution of a script at an arbitrary point and launch a prompt. This
prompt can then be used to check or change the value of any variables
or perform any shellscript command. To resume normal execution of the
@@ -1290,15 +1290,15 @@
To start the debugger, simply call the builtin command
'breakpoint'. The default action of the TRAP signal is to call this
-builtin, so a running script can be debuged by sending it the TRAP
-signal. Once in the debuger, it is easy to insert new breakpoints by
+builtin, so a running script can be debugged by sending it the TRAP
+signal. Once in the debugger, it is easy to insert new breakpoints by
using the funced function to edit the definition of a function.
\section issues Common issues with fish
If you install fish in your home directory, fish will not work
correctly for any other user than yourself. This is because fish needs
-its initalization files to function properly. To solve this
+its initialization files to function properly. To solve this
problem, either copy the initialization files to each fish users home
directory, or install them in /etc.
@@ -1310,7 +1310,7 @@
translated, a future version of fish should also include translated
manuals.
-To make a translation of fish, you will first need the sourcecode,
+To make a translation of fish, you will first need the source code,
available from the fish
homepage. Download the latest version, and then extract it using a
command like tar -zxf fish-VERSION.tar.gz.
@@ -1318,7 +1318,7 @@
Next, cd into the newly created fish directory using cd
fish-VERSION.
-You will now need to configure the sourcecode using the command
+You will now need to configure the source code using the command
./configure. This step might take a while.
Before you continue, you will need to know the ISO 639 language code
@@ -1326,7 +1326,7 @@
href='http://www.w3.org/WAI/ER/IG/ert/iso639.htm'>here. For
example, the language code for Uighur is ug.
-Now you have the sourcecode and it is properly configured. Lets start
+Now you have the source code and it is properly configured. Lets start
translating. To do this, first create an empty translation table for
the language you wish to translate to by writing make
po/[LANGUAGE CODE].po in the fish terminal. For example, if you
@@ -1346,7 +1346,7 @@
The first line is the English string to translate, the second line
-should contain your translation. For example, in swedish the above
+should contain your translation. For example, in Swedish the above
might become:
@@ -1395,7 +1395,7 @@
- Selectable completions in the pager
- Per process output redirection
- Reduce the space of the pager by one line to allow the commandline to remain visible.
-- down-arrow could be used to save the current command to the history. Or give the next command in-sequnce. Or both.
+- down-arrow could be used to save the current command to the history. Or give the next command in-sequence. Or both.
- Drop support for inputrc-files. Use shellscripts and the bind builtin. Also, redo the syntax for the bind builtin to something more sane.
- History could reload itself when the file is updated. This would need to be done in a clever way to avoid chain reactions
- The error function should probably be moved into it's own library, and be made mere general purpose.
@@ -1417,7 +1417,7 @@
- delete-word is broken on the commandline 'sudo update-alternatives --config x-'
- Sometimes autoheader needs to be run on a fresh tarball. Fix dates before creating tarballs.
- The completion autoloader does not remember which completions where actually autoloaded, and may unload manually specified completions.
-- There have been stray reports of issues with strang values of the PATH variable during startup.
+- There have been stray reports of issues with strange values of the PATH variable during startup.
If you think you have found a bug not described here, please send a
report to fish-users@lists.sf.net.
--- fish-1.23.0.orig/doc_src/case.txt
+++ fish-1.23.0/doc_src/case.txt
@@ -19,7 +19,7 @@
Note that fish does not fall through on case statements. Though the
syntax may look a bit like C switch statements, it behaves more like
-the case statementes of traditional shells.
+the case statements of traditional shells.
Also note that command substitutions in a case statement will be
evaluated even if it's body is not taken. This may seem
--- fish-1.23.0.orig/doc_src/fish_indent.txt
+++ fish-1.23.0/doc_src/fish_indent.txt
@@ -1,15 +1,15 @@
-\section fish_indent fish_indent - indenter and prettyfier
+\section fish_indent fish_indent - indenter and prettifier
\subsection fish_indent-synopsis Synopsis
fish_indent [options]
\subsection fish_indent-description Description
-\c fish_indent is used to indent or otherwise prettyfy a piece of fish
+\c fish_indent is used to indent or otherwise prettify a piece of fish
code. \c fish_indent reads commands from standard input and outputs
them to standard output.
-\c fish_indent underatands the following options:
+\c fish_indent understands the following options:
- -h or --help displays this help message and then exits
- -i or --no-indent do not indent commands
--- fish-1.23.0.orig/doc_src/complete.txt
+++ fish-1.23.0/doc_src/complete.txt
@@ -6,7 +6,7 @@
\subsection complete-description Description
For an introduction to how to specify completions, see the section Writing your own completions of
+href='index.html#completion-own'>Writing your own completions of
the fish manual.
- COMMAND is the name of the command for which to add a completion
--- fish-1.23.0.orig/doc_src/or.txt
+++ fish-1.23.0/doc_src/or.txt
@@ -17,7 +17,7 @@
\subsection or-example Example
The following code runs the \c make command to build a program, if the
-build succceeds, the program is installed. If either step fails,
+build succeeds, the program is installed. If either step fails,
make clean is run, which removes the files created by the
build process
--- fish-1.23.0.orig/share/functions/__fish_config_interactive.fish
+++ fish-1.23.0/share/functions/__fish_config_interactive.fish
@@ -147,7 +147,7 @@
#
if set -q fish_greeting
- switch $fish_greeting
+ switch "$fish_greeting"
case ''
# If variable is empty, don't print anything, saves us a fork
--- fish-1.23.0.orig/debian/menu
+++ fish-1.23.0/debian/menu
@@ -0,0 +1,2 @@
+?package(fish):needs="text" section="Applications/Shells"\
+ title="fish" command="/usr/bin/fish"
--- fish-1.23.0.orig/debian/copyright
+++ fish-1.23.0/debian/copyright
@@ -0,0 +1,98 @@
+This package was debianized by James Vega on
+Fri, 20 May 2005 17:14:04 -0400.
+
+It was downloaded from http://fishshell.org/files/
+
+Upstream Author: Axel Liljencrantz
+
+Fish Copyright (C) 2005 Axel Liljencrantz. Fish is released under the
+GNU General Public License.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+Fish contains code under the BSD license, namely versions of the
+two functions strlcat and strlcpy, modified for use with wide
+character strings.
+
+ Copyright (c) 1998 Todd C. Miller
+
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+The XSel command, written and copyrighted by Conrad Parker, is
+distributed together with, and used by fish. It is released under the MIT
+license.
+
+ It is Copyright (C) 2001 Conrad Parker
+
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without fee,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation. No representations are made about the
+ suitability of this software for any purpose. It is provided "as is"
+ without express or implied warranty.
+
+The xdgmime library, written and copyrighted by Red Hat, Inc, is used
+by the mimedb command, which is a part of fish. It is released under
+the LGPL license.
+
+The copyright for the xdgmime-related files belong to the following people
+xdgmime.c
+ Copyright (C) 2003,2004 Red Hat, Inc.
+ Copyright (C) 2003,2004 Jonathan Blandford
+
+xdgmime.h
+ Copyright (C) 2003 Red Hat, Inc.
+ Copyright (C) 2003 Jonathan Blandford
+
+xdgmimealias.c, xdgmimealias.h
+ Copyright (C) 2004 Red Hat, Inc.
+ Copyright (C) 2004 Matthias Clasen
+
+xdgmimeglob.c, xdgmimeglob.h
+ Copyright (C) 2003 Red Hat, Inc.
+ Copyright (C) 2003 Jonathan Blandford
+
+xdgmimeint.c, xdgmimeint.h
+ Copyright (C) 2003 Red Hat, Inc.
+ Copyright (C) 2003 Jonathan Blandford
+
+xdgmimemagic.c, xdgmimemagic.h
+ Copyright (C) 2003 Red Hat, Inc.
+ Copyright (C) 2003 Jonathan Blandford
+
+xdgmimeparent.c, xdgmimeparent.h
+ Copyright (C) 2004 Red Hat, Inc.
+ Copyright (C) 2004 Matthias Clasen
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+
+Fish contains code from the glibc library, namely the wcstok function
+in fallback.c. This code is licensed under the LGPL.
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
--- fish-1.23.0.orig/debian/preinst
+++ fish-1.23.0/debian/preinst
@@ -0,0 +1,33 @@
+#! /bin/sh
+
+set -e
+
+# Remove a no-longer used conffile
+rm_conffile() {
+ PKGNAME="$1"
+ CONFFILE="$2"
+
+ if [ -e "$CONFFILE" ]; then
+ md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
+ if [ "$md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-old ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-old
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
+ fi
+ fi
+}
+
+case "$1" in
+install|upgrade)
+ if dpkg --compare-versions "$2" le "1.22.3-3"; then
+ rm_conffile fish "/etc/fish/fish_inputrc"
+ fi
+esac
+
+#DEBHELPER#
+
+exit 0
--- fish-1.23.0.orig/debian/postrm
+++ fish-1.23.0/debian/postrm
@@ -0,0 +1,15 @@
+#! /bin/sh
+# postrm script for fish
+#
+# see: dh_installdeb(1)
+
+set -e
+
+remove-shell /usr/bin/fish
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- fish-1.23.0.orig/debian/postinst
+++ fish-1.23.0/debian/postinst
@@ -0,0 +1,17 @@
+#! /bin/sh
+# postinst script for fish
+#
+# see: dh_installdeb(1)
+
+set -e
+
+add-shell /usr/bin/fish
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- fish-1.23.0.orig/debian/completions/dupload.fish
+++ fish-1.23.0/debian/completions/dupload.fish
@@ -0,0 +1,32 @@
+#dupload
+complete -c dupload -s h -l help -d (_ "Display help and exit")
+complete -c dupload -s f -l force -d (_ "Upload regardless of the transfers logged as already completed")
+complete -c dupload -s k -l keep -d (_ "Ignore packages whose MD5sums don't match")
+complete -c dupload -s c -l configfile -d (_ "Read ./dupload.conf")
+complete -c dupload -l no -d (_ "Dry-run")
+complete -c dupload -l nomail -d (_ "Suppress announcement")
+complete -c dupload -l mailonly -d (_ "Dry-run and real announcement")
+complete -c dupload -l noarchive -d (_ "Add an anti-archival header")
+complete -c dupload -s p -l print -d (_ "Print config")
+complete -c dupload -s q -l quiet -d (_ "Quiet")
+complete -c dupload -s t -l to -x -a "(__dupload_hosts)" -d (_ "Nickname of target site")
+complete -c dupload -s V -l version -d (_ "Display version information and exit")
+complete -c dupload -x -a "(__fish_complete_suffix .changes)"
+
+function __dupload_hosts -d "List hosts for dupload"
+ set -l nicks
+ set -l hosts
+ for n in (awk -F "'" '/\$cfg{/ {print $2}' /etc/dupload.conf $HOME/.dupload.conf | uniq);
+ set nicks $nicks $n;
+ end
+ for h in (awk -F "=" '/('\''fqdn'\''| *fqdn *=)/ {print $2}' /etc/dupload.conf $HOME/.dupload.conf | cut -d"'" -f2 | cut -d'"' -f2);
+ set hosts $hosts $h;
+ end
+ set -l i 1
+ set -l max (count $nicks)
+ while test $i -le $max;
+ echo (printf "%s\t%s" $nicks[$i] $hosts[$i])
+ set i (echo "$i + 1" | bc)
+ end
+ return
+end
--- fish-1.23.0.orig/debian/fish.install
+++ fish-1.23.0/debian/fish.install
@@ -0,0 +1,2 @@
+debian/tmp/usr
+debian/tmp/etc
--- fish-1.23.0.orig/debian/fish.doc-base
+++ fish-1.23.0/debian/fish.doc-base
@@ -0,0 +1,12 @@
+Document: fish
+Title: Debian fish Manual
+Author: Axel Liljencrantz
+Abstract: This guide documents fish, a shell
+ geared towards interactive use.
+Section: Shells
+
+Format: HTML
+Index: /usr/share/doc/fish/index.html
+Files: /usr/share/doc/fish/*.html
+
+
--- fish-1.23.0.orig/debian/NEWS
+++ fish-1.23.0/debian/NEWS
@@ -0,0 +1,41 @@
+fish (1.22.1-1) unstable; urgency=low
+
+ Much has changed since the last major upstream release. It is recommended
+ that all old shells be exited after upgrading. It is a known problem that
+ ctrl-d will not exit any shells that were running before the upgrade because
+ function definitions for key-bindings changed in a backwards-incompatible
+ way in 1.22.X. Simply use the 'exit' command.
+
+ Fish has changed where it looks for config files both in the system-wide
+ directories and in the user's home directory. Upon first starting this
+ version of fish, it will attempt to migrate the user's config files to the
+ new directory structure as well as display a message notifying the user.
+ The changes are as follows:
+
+ System-wide:
+ /etc/fish.d -> /etc/fish
+ /etc/fish -> /etc/fish/config.fish
+ /etc/fish_inputrc -> /etc/fish/fish_inputrc
+ /etc/fish.d/fish_interactive.fish -> /usr/share/fish/config_interactive.fish
+
+ Per-user:
+ Fish's config files now live under $XDG_CONFIG_HOME/fish ($XDG_CONFIG_HOME
+ defaults to $HOME/.config).
+ $HOME/.fish -> $XDG_CONFIG_HOME/fish/config.fish
+ $HOME/.fish_history -> $XDG_CONFIG_HOME/fish/fish_history
+ $HOME/.fish_inputrc -> $XDG_CONFIG_HOME/fish/fish_inputrc
+
+ -- James Vega Mon, 13 Nov 2006 10:59:16 -0500
+
+fish (1.21.1-1) unstable; urgency=low
+
+ Fish's completion and function files have been moved from
+ /etc/fish.d/{completions,functions} to
+ /usr/share/fish{completions,functions}. Fish will still source files under
+ /etc/fish.d{completions,functions} in order to allow the sysadmin a means of
+ overriding the default completions/functions.
+
+ If any of these files have been modified, they will be saved under
+ /etc/fish.d as {completions,functions}_$filename.dpkg-bak.
+
+ -- James Vega Sun, 5 Mar 2006 21:01:40 -0500
--- fish-1.23.0.orig/debian/changelog
+++ fish-1.23.0/debian/changelog
@@ -0,0 +1,444 @@
+fish (1.23.0-5) unstable; urgency=low
+
+ "Where's that brown paper bag?" release
+ * debian/rules:
+ - Properly preserve the original versions of the config.sub/config.guess
+ instead of using config.sub for both.
+ - Tell dh_clean not to remove the preserved config.sub/config.guess.
+
+ -- James Vega Thu, 06 Mar 2008 15:58:43 -0500
+
+fish (1.23.0-4) unstable; urgency=low
+
+ * debian/completions/dupload.fish:
+ - Remove use of a function that doesn't exist anymore.
+
+ -- James Vega Wed, 05 Mar 2008 15:36:41 -0500
+
+fish (1.23.0-3) unstable; urgency=low
+
+ * debian/control:
+ - Priority: extra for fish-dbg
+ * debian/fish.doc-base
+ - Change Section to Shells to match doc-base naming
+
+ -- James Vega Wed, 05 Mar 2008 02:29:58 -0500
+
+fish (1.23.0-2) unstable; urgency=low
+
+ * debian/preinst:
+ - Use .dpkg-old instead of .dpkg-bak when removing conffiles.
+ * Added patches:
+ - Fix a spelling error in fish_indent.1. (Closes: #463612)
+ - Quote $fish_greeting when used as a switch condition to allow users to
+ set it to an empty value. (Closes: #465415)
+ - Fix the "Writing your own completions" link in the complete command's
+ documentation. (Closes: #466267)
+ * debian/control:
+ - Add fish-dbg package.
+ - Remove cdbs from Build-Depends.
+ * debian/rules:
+ - Rewrite without using cdbs.
+ * debian/compat:
+ - Bump to debhelper version 5
+
+ -- James Vega Wed, 05 Mar 2008 02:03:59 -0500
+
+fish (1.23.0-1) unstable; urgency=low
+
+ * New upstream version.
+ - Merged patches:
+ + screen.c: Use wcsstr instead of wcscmp when checking if $TERM is a
+ screen variant.
+ + complete.c: Use wcscmp instead of == for string comparisons.
+ * debian/control:
+ - Bump policy to 3.7.3.0 - no changes needed.
+ - Remove version from debhelper Build-Depends.
+ - Add Doxygen to Build-Depends.
+ * debian/preinst:
+ - Handle upstream's removal of /etc/fish/fish_inputrc
+ * Added patches:
+ - Fix various spelling errors in documentation.
+ * debian/rules:
+ - Remove inclusion of simply-patchsys.mk.
+ - Remove dead code to figure out the upstream version.
+
+ -- James Vega Mon, 14 Jan 2008 09:29:03 -0500
+
+fish (1.22.3-3) unstable; urgency=low
+
+ * debian/control: Add Vcs-* and Homepage fields.
+ * Added patches:
+ - screen.c: Use wcsstr instead of wcscmp to determine whether $TERM is
+ screen in order to properly handle $TERM set to screen-bce,
+ screen-256color, etc.
+ - complete.c: Change a few string comparisons to use wcscmp instead of ==.
+ * Removed conffile handling from debian/{pre,post}inst since the version of
+ fish in Etch is newer than the version the maintainer scripts were
+ handling.
+ * debian/menu: Change the Apps section to Applications.
+
+ -- James Vega Sat, 13 Oct 2007 16:34:09 -0400
+
+fish (1.22.3-2) unstable; urgency=low
+
+ * Apparently, fish's tests still aren't well behaved on certain systems when
+ there's no $HOME. Disabling the tests again while I talk with upstream.
+
+ -- James Vega Mon, 26 Mar 2007 18:30:10 -0400
+
+fish (1.22.3-1) unstable; urgency=low
+
+ * New upstream releases.
+ * debian/patches:
+ + Remove unnecessary_libs.diff since it causes some build issues I don't
+ feel like working around, it's not extremely important, and upstream's
+ next version will have a proper fix.
+ + Add Makefile.in-user_doc.diff which allows fish to build without
+ attempting to invoke Doxygen (since the docs are shipped with it).
+ + Add __fish_complete_vi.fish-unknown_function.diff which removes a line
+ that calls a non-existent function.
+ * debian/rules:
+ + No longer have to clean up after upstream's clean target.
+ + Remove export target now that I'm using bzr-builddeb
+ + Re-enable upstream's tests. (Closes: #398721)
+
+ -- James Vega Mon, 26 Mar 2007 16:00:39 -0400
+
+fish (1.22.1-2) unstable; urgency=low
+
+ * Stop running upstream's test target since it relies on already having a
+ version of fish installed. Fixes the FTBFS on all the buildds.
+
+ -- James Vega Tue, 14 Nov 2006 14:47:30 -0500
+
+fish (1.22.1-1) unstable; urgency=low
+
+ * New upstream releases. (closes: #396705)
+ - Added multi-line commandline editing.
+ - Restructured config file directories/naming.
+ * Clean out debian/patches since those are all integrated upstream.
+ * Update preinst/postinst to handle (re)moving the conffiles to the new
+ locations upstream is using.
+
+ -- James Vega Mon, 13 Nov 2006 10:58:42 -0500
+
+fish (1.21.12-4) unstable; urgency=medium
+
+ * Pull fish_tests.diff from upstream, which should fix the pointer
+ conversions in fish_tests.c. (closes: #394409)
+ * Urgency medium for RC bug.
+
+ -- James Vega Sun, 22 Oct 2006 10:37:37 -0400
+
+fish (1.21.12-3) unstable; urgency=medium
+
+ * medium urgency for fix to #388342 which was causing fish to FTBFS on ia64
+ * Pull a few patches from upstream:
+ - xdg_posix.diff: Should fix the problems with using strdup() and
+ compiling with -std=c99. (closes: #388342)
+ - zero_cast.diff: Cast 0 to void* when being used as a null pointer to
+ avoid problems on archs where sizeof(int) != sizeof(void*).
+
+ -- James Vega Fri, 20 Oct 2006 19:23:54 -0400
+
+fish (1.21.12-2) unstable; urgency=low
+
+ * Add unnecessary_libs.diff, which removes extra libraries which were being
+ linked with a couple binaries.
+ * Update upstream's URL. (closes: #391668)
+ * Pull a few patches from upstream to fix various bugs:
+ - manpages.diff: Fixes the formatting of a few manpages (closes: #382731)
+ - prevd_error.diff: Errors when using prevd or 'cd -'
+ - subcommand_completion.diff, subcommand_root_completion.diff,
+ sudo_path.diff: Fixes sudo completion. (closes: #380707)
+ - proper_clean.diff: Fix the clean target so that it doesn't remove extra
+ files and does remove generated files.
+ * Re-add groff-base Build-Depends. This was used for more than just
+ building the documentation.
+
+ -- James Vega Mon, 9 Oct 2006 00:43:07 -0400
+
+fish (1.21.12-1) unstable; urgency=low
+
+ * New upstream versions.
+
+ -- James Vega Tue, 12 Sep 2006 09:17:27 -0400
+
+fish (1.21.10-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- James Vega Mon, 31 Jul 2006 19:21:49 -0400
+
+fish (1.21.9-2) unstable; urgency=low
+
+ * Pull 01_darcs-snapshot-2006-07-23.diff from upstream's Darcs repo to fix
+ variable substitutions which prevented fish's inputrc from being sourced.
+ + Remove 01_darcs-snapshot-2006-07-19.diff and 02_PACKAGE_TARNAME.diff
+ since they're included in this patch.
+
+ -- James Vega Thu, 27 Jul 2006 09:12:34 -0400
+
+fish (1.21.9-1) unstable; urgency=low
+
+ * New upstream release.
+ + Additional emacs-like keybindings (closes: #372174)
+ + Documentation is distributed in the tarball. No longer need doxygen and
+ groff-base Build-depends.
+ * Pull 01_darcs-snapshot-2006-07-19.diff from upstream's Darcs repo to fix
+ some test failures and incorrectly generated config files.
+ * Pull 02_PACKAGE_TARNAME.diff from upstream's Darcs repo to correct where
+ files are installed under /usr/share/doc.
+ * Re-add the preinst and NEWS files that went missing in 1.21.6-1 to handle
+ upstream moving the function/completion files from /etc/fish.d to
+ /usr/share/fish. Thanks, mjt.
+
+ -- James Vega Sat, 22 Jul 2006 03:42:28 -0400
+
+fish (1.21.8-1) unstable; urgency=low
+
+ * New upstream release. (closes: #376407)
+
+ -- James Vega Mon, 3 Jul 2006 00:34:55 -0400
+
+fish (1.21.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add export rule to debian/rules to prepare a clean build directory.
+
+ -- James Vega Thu, 25 May 2006 08:58:05 -0400
+
+fish (1.21.6-2) unstable; urgency=low
+
+ * Pull 02-Eterm_workaround.diff from upstream which fixes a bug where
+ fish wouldn't terminate when Eterm was killed. (closes: #364052)
+
+ -- James Vega Wed, 10 May 2006 16:25:34 -0400
+
+fish (1.21.6-1) unstable; urgency=low
+
+ * New upstream release.
+ * Pull 01-apropos.fish.diff from upstream to fix an escaping problem in the
+ completion file for apropos. (closes: #366688)
+ * Update to 3.7.2.0 policy compliance (no changes needed)
+
+ -- James Vega Wed, 10 May 2006 11:03:05 -0400
+
+fish (1.21.5-1) unstable; urgency=low
+
+ * New upstream releases.
+ + Merged 01-fallback.c.patch
+ + 'type -f' no longer returns success in all cases (closes: #363495)
+ * debian/control:
+ + Add Depends: lynx | www-browser (closes: #361713)
+ * debian/copyright:
+ + Update to reflect inclusion of glibc's wcstok in fallback.c.
+ * Pull history.c-segfault.patch from upstream to fix a segfault when the
+ history is modified in non-interactive mode.
+
+ -- James Vega Thu, 20 Apr 2006 01:04:24 -0400
+
+fish (1.21.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches:
+ + Add 01-fallback.c.patch, which fixes a FTBFS on ppc.
+
+ -- James Vega Mon, 3 Apr 2006 11:00:01 -0400
+
+fish (1.21.2-1) unstable; urgency=low
+
+ * New upstream release
+ + Fix invalid GREP_OPTIONS environment variable. (closes: #358200)
+ * debian/patches:
+ + Remove 01backslash_escape.diff, was pulled from upstream for a bug
+ that's fixed in this release.
+ + Remove 00clean.diff, applied upstream.
+ * Add completion for dupload(1).
+ * debian/copyright:
+ + Reorganize the license information.
+ + Include direct copies of license headers from source files.
+
+ -- James Vega Sun, 26 Mar 2006 19:20:17 -0500
+
+fish (1.21.1-1) unstable; urgency=low
+
+ * New upstream release
+ + Fixes segfault when parsing a command with invalid syntax.
+ (closes: #355372)
+ * debian/copyright: Add the copyright/license information for the
+ xdgmime* files.
+ * Add 01backslash_escape.diff from upstream to support escaped
+ backslashes in quoted strings.
+
+ -- James Vega Sun, 5 Mar 2006 21:56:44 -0500
+
+fish (1.20.2-1) unstable; urgency=low
+
+ * New upstream release
+ + Minor bug fixes.
+ + Gracefully handle improperly encoded text.
+ + Improved completion of subcommands (e.g., sudo {cmd}).
+
+ -- James Vega Thu, 9 Feb 2006 10:11:12 -0500
+
+fish (1.20.1-1) unstable; urgency=low
+
+ * New upstream release
+ + Updated Swedish translation.
+ + Updated/added command completions.
+ + Added stacktraces for errors in shell functions.
+ + Added manpages for fishd and fish_pager. (Take that lintian!)
+ * Last upload wasn't supposed to be an NMU. Fix the maintainer info.
+
+ -- James Vega Fri, 27 Jan 2006 00:29:05 -0500
+
+fish (1.20.0-1) unstable; urgency=low
+
+ * New upstream release.
+ + Fixes FTBFS/segfault on ia64.
+ + Added command completions for new commands, including gpg.
+ + Implemented i18n support.
+ + Short-circuit commands (and/or) now use infix instead of
+ RPN notation.
+ * debian/rules: No longer ship duplicate copies of upstream's
+ ChangeLog.
+ * debian/patches: Add 00make_clean.diff to make clean really clean.
+ * debian/control: Add autoconf and gettext to Build-Depend
+
+ -- James Vega Tue, 17 Jan 2006 18:02:07 -0500
+
+fish (1.19.0-1) unstable; urgency=low
+
+ * New upstream release.
+ + Add /sbin and /usr/sbin to PATH when root.
+ + Remove various GNUisms used in fish's shellscripts.
+ + Fix an infinite loop in the source builtin.
+ + Updated prompt_pwd to shorten long paths by displaying only
+ the first character of the shortened directories.
+
+ -- James Vega Wed, 11 Jan 2006 22:21:20 -0500
+
+fish (1.18.1-1) unstable; urgency=low
+
+ * New upstream releases.
+ * debian/watch: Update URL.
+ * debian/rules: Remove manual cleanup. Correctly handled by upstream.
+
+ -- James Vega Sun, 11 Dec 2005 11:38:23 -0500
+
+fish (1.16.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- James Vega Tue, 8 Nov 2005 10:13:39 -0500
+
+fish (1.16.1-1) unstable; urgency=low
+
+ * New upstream releases.
+
+ -- James Vega Thu, 27 Oct 2005 08:10:20 -0400
+
+fish (1.13.4-1) unstable; urgency=low
+
+ * The "Thanks for all the fish" release.
+ + Thanks to jbailey for sponsoring during the nm process.
+ * New upstream releases.
+ + debian/patches:
+ - 00env.c.diff applied upstream.
+ - 01function.c.diff applied upstream.
+ * debian/control:
+ + Upated email address.
+ + Dropped versioned Build-Depends on Doxygen since version is older than
+ oldstable's version.
+ * Removed unnecessary debian/docs.
+ * Updated email address.
+
+ -- James Vega Mon, 19 Sep 2005 10:50:02 -0400
+
+fish (1.13.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/rules: Update clean target to remove some generated files.
+
+ -- James Vega Wed, 31 Aug 2005 07:49:25 -0400
+
+fish (1.13.0-1) unstable; urgency=low
+
+ * New upstream release.
+ + ChangeLog is now included as a standalone file. (Closes: #315041)
+ * debian/patches:
+ + Add 00env.c.diff, prevents a segfault when compiling with GCC4.
+ + Add 01function.c.diff, include a missing header file.
+
+ -- James Vega Mon, 29 Aug 2005 08:00:16 -0400
+
+fish (1.12.1-1) unstable; urgency=low
+
+ * New upstream releases.
+ * debian/control:
+ + Bump Standards-Version to 3.6.2.
+ + Add autotools-dev to Build-Depends.
+ + Add doc-base and menu to Suggests.
+
+ -- James Vega Thu, 28 Jul 2005 13:59:44 -0400
+
+fish (1.11.1-2) unstable; urgency=low
+
+ * debian/control:
+ + Build-Depends: Remove autotools-dev.
+
+ -- James Vega Fri, 17 Jun 2005 09:41:58 -0400
+
+fish (1.11.1-1) unstable; urgency=low
+
+ * New upstream releases.
+ + Updated documentation to work around Doxygen. (Closes: #314280)
+ * Removed patches:
+ + 100_silence_warnings.diff, applied upstream.
+ + 101_interactive_option.diff, applied upstream.
+ + 102_spelling_fixes.diff, applied upstream.
+ * debian/control:
+ + Build-Depends: Add autotools-dev.
+
+ -- James Vega Fri, 17 Jun 2005 08:11:48 -0400
+
+fish (1.10.1-1) unstable; urgency=low
+
+ * New upstream releases.
+ * debian/rules:
+ + Remove DEB_INSTALL_MANPAGES_fish directive. count.1 is installed by
+ upstream now.
+ * Added patches:
+ + 100_silence_warnings.diff, which silences various warnings gcc emits
+ during compilation.
+ + 101_interactive_option.diff, which adds recognition of the -i argument
+ that various programs expect a shell to recognize.
+ + 102_spelling_fixes.diff, which fixes various spelling errors visible to
+ the end-user.
+ * debian/control:
+ + Build-Depends: added bc
+ + Depends: added bc
+
+ -- James Vega Tue, 7 Jun 2005 23:33:02 -0400
+
+fish (1.9.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Remove 100_Makefile.in.diff, applied upstream.
+ * Remove 200_b_append.diff, applied upstream.
+ * debian/control:
+ + Add groff-base and bsdmainutils to Build-Depends
+
+ -- James Vega Wed, 25 May 2005 10:26:01 -0400
+
+fish (1.9.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #310019)
+ * Added 100_Makefile.in.diff, to make the Makefile obey the configure
+ options.
+ * Added 200_b_append.diff, silence a compile warning and preserve constness.
+
+ -- James Vega Sat, 21 May 2005 12:06:27 -0400
+
--- fish-1.23.0.orig/debian/watch
+++ fish-1.23.0/debian/watch
@@ -0,0 +1,6 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# Site Directory Pattern Version Script
+version=3
+http://fishshell.org/ (?:.*/)?fish-([\d.]+)\.tar\.gz
--- fish-1.23.0.orig/debian/control
+++ fish-1.23.0/debian/control
@@ -0,0 +1,31 @@
+Source: fish
+Section: shells
+Priority: optional
+Maintainer: James Vega
+Build-Depends: debhelper, libncurses5-dev, bsdmainutils, bc, autotools-dev, autoconf, gettext, groff-base, doxygen
+Standards-Version: 3.7.3.0
+Homepage: http://fishshell.org/
+Vcs-Browser: http://git.debian.org/?p=users/jamessan/fish.git
+Vcs-Git: git://git.debian.org/git/users/jamessan/fish
+
+Package: fish
+Architecture: any
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends}, bc, lynx | www-browser
+Recommends: xsel
+Suggests: doc-base, menu
+Description: a friendly interactive shell
+ Fish is a shell geared towards interactive use. Its features are focused on
+ user friendliness and discoverability. The language syntax is simple but
+ incompatible with other shell languages.
+
+Package: fish-dbg
+Architecture: any
+Priority: extra
+Depends: fish (= ${binary:Version})
+Description: a friendly interactive shell (debugging symbols)
+ Fish is a shell geared towards interactive use. Its features are focused on
+ user friendliness and discoverability. The language syntax is simple but
+ incompatible with other shell languages.
+ .
+ This package contains gdb debugging symbols for the fish package.
--- fish-1.23.0.orig/debian/rules
+++ fish-1.23.0/debian/rules
@@ -0,0 +1,68 @@
+#!/usr/bin/make -f
+
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS += -g -Wall $(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),-O0,-O2)
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ for f in config.sub config.guess; do \
+ if [ -r /usr/share/misc/$$f ]; then \
+ if [ ! -f $$f.orig ]; then \
+ mv $$f $$f.orig; \
+ cp -f /usr/share/misc/$$f $$f; \
+ fi; \
+ fi; \
+ done
+ ./configure --without-xsel --build=$(DEB_BUILD_GNU_TYPE) \
+ --host=$(DEB_HOST_GNU_TYPE) --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --mandir=\$${prefix}/share/man CFLAGS="$(CFLAGS)"
+ touch $@
+
+build: configure
+ dh_testdir
+ $(MAKE)
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k -X config.sub -X config.guess
+ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ rm -f $(CURDIR)/debian/tmp/usr/share/doc/fish/ChangeLog
+ for f in debian/completions/*; do \
+ install -m0644 $$f debian/tmp/usr/share/fish/completions; \
+ done
+ dh_install -pfish
+ dh_installdocs README
+ dh_installman -pfish
+ dh_installmenu -pfish
+ dh_installchangelogs ChangeLog
+ dh_installdeb
+
+clean:
+ dh_testdir
+ dh_testroot
+ dh_clean -X config.sub -X config.guess
+ rm -f build-stamp configure-stamp
+ if [ -f Makefile ]; then make distclean; fi
+ for f in config.sub config.guess; do \
+ if [ -e $$f.orig ]; then mv $$f.orig $$f; fi; \
+ done
+
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_strip --dbg-package=fish-dbg
+ dh_compress
+ dh_fixperms
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-indep: build install
+
+binary: binary-indep binary-arch
+.PHONY: configure build install clean binary-indep binary-arch binary
--- fish-1.23.0.orig/debian/compat
+++ fish-1.23.0/debian/compat
@@ -0,0 +1 @@
+5