/{x;p' -e '}' \
+ -e '/
/,$p' < $infile
+
+# exit normally
+exit 0
diff --git a/src/qtgui/mtpics/aptosid-manual-copyright.txt b/src/qtgui/mtpics/aptosid-manual-copyright.txt
new file mode 100644
index 00000000..a91858b3
--- /dev/null
+++ b/src/qtgui/mtpics/aptosid-manual-copyright.txt
@@ -0,0 +1,306 @@
+This package was debianized by Kel Modderman on
+Mon, 9 Apr 2007 13:54:11 +1000.
+
+It was downloaded from http://developer.berlios.de/projects/fullstory/
+
+Files: lib/*
+Copyright: © 2006-2010 Trevor Walkley (bluewater)
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: bg/*
+Copyright: © 2008-2009 manul
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: da/*
+Copyright: © 2006-2009 Rasmus Pørksen
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: de/*
+Copyright: © 2006-2010 Markus Huber
+ © 2006-2009 Markus Müller
+ © 2006-2009 Philipp Rudolph
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License.. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: el/*
+Copyright: © 2008-2008 Gregory Gretri (grigris) siduxgr@gmail.com
+ © 2008-2010 Nikolas Poniros (edhunter)edhunter@TBA.com
+ © 2007-2008 mixalis (miles) georgiou mechmg93@gmail.com
+ © 2007-2008 Pavlos (lathspell) fubar.ath@gmail.com
+ © 2007-2008 Lazaros (riddle3)lazarost@gmail.com
+ © 2007-2008 spyros melcher (xouzouris)
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: en/*
+Copyright: © 2006-2010 Trevor Walkley
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: es/*
+Copyright: © 2006-2009 Richard Holt
+ © 2009-2010 Luis_P
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: fr/*
+Copyright: © 2006-2009 Philippe Masson
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: hr/*
+Copyright: © 2006-2009 Dinko Sabo
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: hu/*
+Copyright: © 2008-2009 mrowl Bagoj Ur
+ © 2008-2009 ruess reuss@chello.hu
+ © 2008-2009 Siposs Zoltan
+ © 2008-2009 honorshark honorshark@gmail.com
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License.Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: it/*
+Copyright: © 2008-2009 Renato Zanotti zenren@tiscali.it
+ © 2008-2009 speedygeo speedygeo@email.it
+ © 2007-2009 Stefano Tombolini dedo.tombolini@gmail.com
+ © 2008-2010 Alessio Giustini alessio@alessiogiustini.com
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: ja/*
+Copyright: © 2006-2009 Mutsumu Nomura
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: nl/*
+Copyright: © 2006-2010 S R Eissens
+ © 2007-2009 Ronald Stam
+ © 2007-2009 HarzG
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: pl/*
+Copyright: © 2006-2008 Marcin Słotwiński
+ © 2008-2009 Michael R' Tokarczyk
+ © 2009 dongle
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: pt-br/*
+Copyright: © 2006-2010 Jose Tadeu Barros
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: ro/*
+Copyright: © 2006-2008 Gabriel Palade
+ © 2009-2010 Dorin Vatavu
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: ru/*
+Copyright: © 2006-2010 Roland Engert
+ © 2006-2007 Dmytro Kychenko
+ © 2006-2007 Mikhail Burov
+ © 2009 kostiagol
+
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: menu/*
+Copyright: © 2006-2010 Trevor Walkley
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: debian/*
+Copyright: © 2007, Kel Modderman
+License: GPL-2+
+ The Debian packaging information is licensed under the GNU General
+ Public License, version 2 or later.
+
+Files: menu/*
+Copyright: © 2006-2010 Trevor Walkley
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License.. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: menu/icons/*
+Copyright: © 2010 Rick Battle
+ © 2008-2010 Bernard Gray
+ © 2008 David Creedy
+ © 2007 David Vignoni
+ © 2007 Johann Ollivier Lapeyre
+ © 2007 Kenneth Wimer
+ © 2007 Nuno Fernades Pinheiro
+ © 2007 Riccardo Iaconelli
+ © 2007 David Miller
+License: CC-ASA-3.0 | LGPL-2+ | GPL-2+
+ aptosid-manual.svg also includes elements from The Oxygen Icon Theme.
+ Licensed under the Creative Common Attribution-ShareAlike 3.0
+ license, as found here:
+
+ http://creativecommons.org/licenses/by-sa/3.0/
+
+ or the GNU Library General Public License (with following clarification).
+
+ Clarification:
+ The GNU Lesser General Public License or LGPL is written for
+ software libraries in the first place. We expressly want the LGPL to
+ be valid for this artwork library too.
+
+ KDE Oxygen theme icons is a special kind of software library, it is an
+ artwork library, it's elements can be used in a Graphical User Interface, or
+ GUI.
+
+ Source code, for this library means:
+ - where they exist, SVG;
+ - otherwise, if applicable, the multi-layered formats xcf or psd, or
+ otherwise png.
+
+ The LGPL in some sections obliges you to make the files carry
+ notices. With images this is in some cases impossible or hardly useful.
+
+ With this library a notice is placed at a prominent place in the directory
+ containing the elements. You may follow this practice.
+
+ The exception in section 6 of the GNU Lesser General Public License covers
+ the use of elements of this art library in a GUI.
+
+Files: *
+Copyright: © 2006-2010 Trevor Walkley
+License: GFDL-1.2+
+ All content is © 2006-2010 and released
+ under GNU Free Documentation License. Permission is granted to copy,
+ distribute and/or modify this document under the terms of the GNU
+ Free Documentation License, Version 1.2 or any later version
+ published by the Free Software Foundation; with no Invariant
+ Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+
+Files: *Coloured sidux Book Icons (type2)
+
+Copyright (C) 2007 by spacepenguin, cako and cathbard (http://sidux.com)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+I suggest a copy be kept in your sources for safe keeping
+________________________________________________________________________________
+On Debian systems, the complete text of the GNU Free Documentation License,
+version 2, can be found in `/usr/share/common-licenses/GFDL-1.2'.
+
+On Debian systems, the complete text of the GNU General Public License,
+version 2, can be found in `/usr/share/common-licenses/GPL-2'.
+
+On Debian systems, the complete text of the GNU Lesser General Public License,
+version 2, can be found in `/usr/share/common-licenses/LGPL-2'.
+
+The Debian packaging is © 2007--2010, Kel Modderman and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
diff --git a/src/qtgui/mtpics/aptosid-manual.png b/src/qtgui/mtpics/aptosid-manual.png
new file mode 100644
index 00000000..7a1a22ea
Binary files /dev/null and b/src/qtgui/mtpics/aptosid-manual.png differ
diff --git a/src/sampleconf/mimeconf b/src/sampleconf/mimeconf
index 945004c1..8b06ae12 100644
--- a/src/sampleconf/mimeconf
+++ b/src/sampleconf/mimeconf
@@ -92,6 +92,7 @@ text/x-c = internal
text/x-fictionbook = exec rclfb2
text/x-gaim-log = exec rclgaim
text/x-html-sidux-man = exec rclsiduxman
+text/x-html-aptosid-man = exec rclaptosidman
text/x-mail = internal
text/x-man = exec rclman
text/x-purple-log = exec rclpurple
@@ -154,6 +155,7 @@ text/x-c = source
text/x-c++ = source
text/x-fictionbook = document
text/x-html-sidux-man = sidux-book
+text/x-html-aptosid-man = aptosid-manual
text/x-mail = message
text/x-man = document
application/x-chm = document
@@ -191,6 +193,7 @@ text = \
text/x-c++ \
text/x-fictionbook \
text/x-html-sidux-man \
+ text/x-html-aptosid-man \
text/x-man \
text/x-python \
text/x-shellscript
diff --git a/src/sampleconf/mimemap b/src/sampleconf/mimemap
index 0a1b1234..ed3cb633 100644
--- a/src/sampleconf/mimemap
+++ b/src/sampleconf/mimemap
@@ -128,10 +128,13 @@ recoll_noindex = .tar.gz .tgz .tar.bz2 .tbz .log.gz .md5 .map \
[~/.purple]
.txt = text/x-purple-log
-# Special handling of sidux manual menu system
+# Special handling of sidux/aptosid manual menu system
[/usr/share/sidux-manual]
.htm = text/x-html-sidux-man
.html = text/x-html-sidux-man
+[/usr/share/aptosid-manual]
+.htm = text/x-html-aptosid-man
+.html = text/x-html-aptosid-man
# Manual files. You may want to adjust the location for your system
# We can't use the default text/troff type because this doesn't say
diff --git a/src/sampleconf/mimeview b/src/sampleconf/mimeview
index 2a3ee048..506d1dcf 100644
--- a/src/sampleconf/mimeview
+++ b/src/sampleconf/mimeview
@@ -59,5 +59,5 @@ text/html = firefox %u
text/plain = gnuclient -q %f
text/x-c = gnuclient -q %f
text/x-html-sidux-man = konqueror %f
-#text/x-html-sidux-man = iceweasel %f
+text/x-html-aptosid-man = konqueror %f
text/x-python = idle %f