--- rox-2.4.orig/ROX-Filer/src/po/de.po +++ rox-2.4/ROX-Filer/src/po/de.po @@ -220,7 +220,7 @@ "on certain file systems and where the OS implements them.\n" msgstr "" "Normalerweise ermittelt ROX-Filer then Dateityp\n" -"über den Dateinamen. Um den Dateityp zu ändern,muss die Datei umbenannt " +"über den Dateinamen. Um den Dateityp zu ändern, muss die Datei umbenannt " "werden.\n" "\n" "Neuere Dateisysteme unterstützen sogenannte 'Erweiterte\n" @@ -741,7 +741,7 @@ #: bookmarks.c:304 #, c-format msgid "Can't bookmark non-local resource '%s'\n" -msgstr "Lesezeichen für Netzwerkresource '%s' nicht anlegbar\n" +msgstr "Lesezeichen für Netzwerkressource '%s' nicht anlegbar\n" #: bookmarks.c:312 bookmarks.c:630 #, c-format @@ -1011,7 +1011,7 @@ #: dnd.c:845 msgid "Sorry, can't display a menu of actions for a remote file / raw data." msgstr "" -"'tschuldigung, kann kein Aktionsmenü für eine Netwerkdatei / Rohdaten " +"'tschuldigung, kann kein Aktionsmenü für eine Netzwerkdatei / Rohdaten " "anzeigen." #: dnd.c:861 @@ -2888,7 +2888,7 @@ msgstr "" "Anwendung/Applikation:\n" "Dies ist ein Applikations-Verzeichnis - Sie können es als Programm starten " -"oder öffnen (halten Sie Shift gedrückt, währen Sie es öffnen). Die meisten " +"oder öffnen (halten Sie Shift gedrückt, während Sie es öffnen). Die meisten " "Applikationen stellen ihre eigene Hilfe hier bereit, aber diese tut das " "nicht." @@ -3127,7 +3127,7 @@ "Bitte ändern Sie die Rechte jetzt (das Problem könnte durch eine alte " "fehlerhafte Version des Dateimanagers verursacht sein).\n" "\n" -"Ein allgemeines Schreibrecht auf Startaktionen (ausser über Verknüpfung) " +"Ein allgemeines Schreibrecht auf Startaktionen (außer über Verknüpfung) " "bedeutet, dass jeder der Ihren Computer benutzt ihre Startaktionen durch " "bösartigen Version ersetzen kann.\n" "\n" @@ -3595,7 +3595,7 @@ #: tips:45 msgid "Double-click on background resizes" -msgstr "Doppelklick auf Hintegrund ändert Fenstergröße" +msgstr "Doppelklick auf Hintergrund ändert Fenstergröße" #: tips:46 msgid "" --- rox-2.4.orig/ROX-Filer/src/confdefs.h +++ rox-2.4/ROX-Filer/src/confdefs.h @@ -0,0 +1 @@ + --- rox-2.4.orig/debian/docs +++ rox-2.4/debian/docs @@ -0,0 +1,3 @@ +README +README-es +ROX-Filer/Help/TODO --- rox-2.4.orig/debian/menu +++ rox-2.4/debian/menu @@ -0,0 +1,2 @@ +?package(rox-filer):needs="X11" section="Apps/System" \ + title="ROX Filer" command="/usr/bin/rox" --- rox-2.4.orig/debian/control +++ rox-2.4/debian/control @@ -0,0 +1,21 @@ +Source: rox +Section: x11 +Priority: optional +Maintainer: Daniel T Chen +Standards-Version: 3.6.2 +Build-Depends: libgtk2.0-dev (>= 2.0.1), libxml2-dev, debhelper (>= 4.0.0), file, libatk1.0-dev, libglib2.0-dev (>= 2.0.3), libpango1.0-dev, dpatch, libsm-dev, libx11-dev, x-dev, libxext-dev, libxi-dev, libxrender-dev, libice-dev, zlib1g-dev, libxrandr-dev, libxft-dev, libexpat1-dev, libxmu-dev, libxmuu-dev, libxp-dev, libxpm-dev, libxt-dev, libxtrap-dev, libxtst-dev, libxv-dev, shared-mime-info (>= 0.16) + +Package: rox-filer +Architecture: any +Suggests: file, menu +Depends: ${shlibs:Depends}, shared-mime-info (>= 0.16) +Description: A simple graphical file manager for X11 + ROX-Filer is a simple and easy to use graphical file manager + for X11 based on the GTK2 library. It uses a uniform + drag-and-drop approach for every operation. + . + It is also the core component of the ROX Desktop Environment. + . + Invoking rox opens each directory or file listed, or the + current working directory if no arguments are given. + . --- rox-2.4.orig/debian/rules +++ rox-2.4/debian/rules @@ -0,0 +1,88 @@ +#!/usr/bin/make -f + +# This is the debhelper compatability version to use. +# +export DH_COMPAT=4 + +PACKAGE := $(shell dh_listpackages) +DESTDIR := $(shell pwd)/debian/$(PACKAGE) +BUILDDIR := $(shell pwd) + +include /usr/share/dpatch/dpatch.make + +configure: configure-stamp +configure-stamp: patch-stamp + dh_testdir + + # do nothing + + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + ROX-Filer/AppRun --compile + + touch build-stamp + +clean: myclean unpatch +myclean: + dh_testdir + dh_testroot + ( cd ${BUILDDIR}/ROX-Filer && rm -f ROX-Filer ROX-Filer.dbg && rm -rf build ) + rm -f build-stamp configure-stamp + rm -rf $(DESTDIR) + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cp -r ${BUILDDIR}/Choices ${DESTDIR}/usr/share/rox + rm -rf ${DESTDIR}/usr/share/rox/Choices/MIME-info/ + cp ${BUILDDIR}/ROX-Filer/*.xml ${DESTDIR}/usr/share/rox + + cp ${BUILDDIR}/ROX-Filer/Help/Changes ${DESTDIR}/usr/share/doc/${PACKAGE}/changelog + cp ${BUILDDIR}/ROX-Filer/Help/*html ${DESTDIR}/usr/share/doc/${PACKAGE}/html/. + cp ${BUILDDIR}/ROX-Filer/style.css ${DESTDIR}/usr/share/doc/${PACKAGE}/html/. + cp -r ${BUILDDIR}/ROX-Filer/images ${DESTDIR}/usr/share/rox + cp -r ${BUILDDIR}/ROX-Filer/ROX ${DESTDIR}/usr/share/rox + + cp ${BUILDDIR}/ROX-Filer/ROX-Filer ${DESTDIR}/usr/bin/rox + cp ${BUILDDIR}/ROX-Filer/.DirIcon ${DESTDIR}/usr/share/rox/.DirIcon + cp rox.xml ${DESTDIR}/usr/share/mime/packages + +# Menu method is currently disabled. It needs a better analysis +# cp debian/addons/rox ${DESTDIR}/etc/menu-methods/${PACKAGE} +# chmod 755 ${DESTDIR}/etc/menu-methods/${PACKAGE} + + /bin/sh debian/scripts/locale.sh + /bin/sh debian/scripts/manual.sh + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installmenu + dh_installman + dh_installchangelogs + dh_strip + dh_compress + dh_fixperms + dh_link usr/bin/rox usr/bin/rox-filer + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install patch unpatch myclean --- rox-2.4.orig/debian/rox-filer.postinst +++ rox-2.4/debian/rox-filer.postinst @@ -0,0 +1,9 @@ +#!/bin/sh +if [ "$1" = "configure" ]; then + if [ -x /usr/bin/update-mime-database ]; then + update-mime-database /usr/share/mime/ ; + fi +fi + +#DEBHELPER# + --- rox-2.4.orig/debian/scripts/locale.sh +++ rox-2.4/debian/scripts/locale.sh @@ -0,0 +1,9 @@ +#!/bin/bash +for f in ROX-Filer/Messages/*.gmo; do + export ROXTMP=`basename $f .gmo` ; + if [ $ROXTMP == "sp" ]; then + export ROXTMP="es" ; + fi + mkdir -p debian/rox-filer/usr/share/locale/$ROXTMP/LC_MESSAGES; + cp $f debian/rox-filer/usr/share/locale/$ROXTMP/LC_MESSAGES/rox.mo; +done --- rox-2.4.orig/debian/scripts/manual.sh +++ rox-2.4/debian/scripts/manual.sh @@ -0,0 +1,4 @@ +#!/bin/bash +for f in ROX-Filer/Help/Manual*.html; do + sed "s/\.\.\/style/style/" $f > debian/rox-filer/usr/share/doc/rox-filer/html/`basename $f` +done --- rox-2.4.orig/debian/changelog +++ rox-2.4/debian/changelog @@ -0,0 +1,389 @@ +rox (1:2.4-1ubuntu1) dapper; urgency=low + + * Revert to Debian packaging (but retain epoch) (Closes: #3684). + * debian/control: Remove spurious build dependency on pm-dev. + * debian/patches/listview_crash.dpatch: Apply patch from upstream cvs + to fix crash when activating list view with GTK+ >= 2.8.9 + (Closes: Debian #344678). + + -- Daniel T Chen Wed, 28 Dec 2005 18:34:38 -0800 + +rox (2.4-1) unstable; urgency=low + + * New upstream release + + -- Francesco Paolo Lovergine Tue, 27 Dec 2005 09:46:14 +0100 + +rox (2.3-2) unstable; urgency=low + + * Added share-mime-info build-dep and updated version. + (closes: #339767) + * Updated clean rule to remove the build dir too. + + -- Francesco Paolo Lovergine Sat, 19 Nov 2005 21:23:45 +0100 + +rox (2.3-1) unstable; urgency=low + + * New upstream release + (closes: #322485) + * Removed de.po patch + * Minor changes to rules file, due to changes in upstream build system. + + -- Francesco Paolo Lovergine Wed, 16 Nov 2005 13:47:22 +0100 + +rox (2.2.0-3) unstable; urgency=low + + * Added toolbar.dpatch patch to remove a double definition of a variable. + (closes: #288439) + * Added apprun.dpatch patch to complete transition to x-terminal-emulator alternative. + (closes: #299134) + * Patched de.po via dpatch. + (closes: #313825) + * xlibs-static-dev build-dep was superfluous: removed. + * Policy bumped to 3.6.2, no changes. + + -- Francesco Paolo Lovergine Mon, 18 Jul 2005 15:11:12 +0200 + +rox (2.2.0-2) unstable; urgency=high + + * Added auto detection of the silly arch-dependent building directory in rules file. + (closes: #293413) + + -- Francesco Paolo Lovergine Sat, 12 Feb 2005 20:49:44 +0100 + +rox (2.2.0-1) unstable; urgency=low + + * New upstream release + (closes: #273072) + * Disabled current menu method to avoid breaking FHS. It needs a better knowledge of rox-filer inners. + Maybe I'll re-introduce that later, if truly useful. + Also added menu to suggested packages in control. + (closes: #286162) + * Removed additional debian images and sharutils dependency. + * Rules file revised to meet current building system and files. + * rox-filer binary renamed rox, the same for all other rox-filer refs. + Leaving rox-filer symlink anyway. + (closes: #274007) + * Added mimeapps.dpatch and dnd.patch to manage mime apps for text and text-html a la debian way. + (closes: #289314) + + -- Francesco Paolo Lovergine Sun, 30 Jan 2005 11:59:27 +0100 + +rox (2.1.3-1) unreleased; urgency=low + + * New upstream release + + -- Francesco Paolo Lovergine Tue, 21 Dec 2004 23:13:09 +0100 + +rox (2.0.1-3) unstable; urgency=low + + * Using '.' instead of bash 'source' within /debian/addons/rox-filer. + (closes: #272936) + * Now /usr/share/rox symlinks /usr/share/rox-filer. Unfortunately rox-filer + uses both paths to get images. + I don't know yet if it is the best thing to do for a future rox desktop, anyway... + (closes: #272962) + + -- Francesco Paolo Lovergine Thu, 23 Sep 2004 14:50:02 +0200 + +rox (2.0.1-2) unstable; urgency=low + + [Francesco P. Lovergine] + + * Little typo in long description corrected. + * Added a few missing X-dev build-deps. + + -- Francesco Paolo Lovergine Thu, 23 Sep 2004 13:12:35 +0200 + +rox (2.0.1-1) unstable; urgency=low + + [Marcin Juszkiewicz] + + * New upstream release + * This version contains various bugfixes backported from the current + developer series. + + [Francesco P. Lovergine] + + * New official maintainer, now in Debian + (closes: #120209) + * Maintainer set to ROX-in-Debian Project Team. + * Me added as uploader. + * Now using dpatch for patch-management. Rules and control changed + as consequence. + * Added a missing build-dep: libsm-dev + * Binary package rox renamed in rox-filer and changed things around to + work with the new name (scripts and patch too). + * Rules file revised in too many places to list them. + * Added DEBHELPER tag at the end of postinst. + * Changelog encoding set to UTF-8. + + -- Francesco Paolo Lovergine Thu, 29 Jul 2004 15:01:11 +0200 + +rox (2.0.0-1) unstable; urgency=low + + * New upstream release + * This version is released as STABLE and replace ROX-Filer 1.2.x so finally + I will package both versions - stable 2.0.x and development 2.1.x + * In nearest time I will probably rename ROX-Filer package - 'rox' will be + used for stable branch and other name for development. + + -- Marcin Juszkiewicz Mon, 2 Jun 2003 10:52:53 +0200 + +rox (1.3.10-1) unstable; urgency=low + + * New upstream release + + -- Marcin Juszkiewicz Thu, 29 May 2003 14:49:11 +0200 + +rox (1.3.9-1) unstable; urgency=low + + * New upstream Release + + -- Marcin Juszkiewicz Mon, 19 May 2003 11:46:34 +0200 + +rox (1.3.8-1) unstable; urgency=low + + * New upstream release + + -- Marcin Juszkiewicz Wed, 9 Apr 2003 18:21:52 +0200 + +rox (1.3.7-1) unstable; urgency=low + + * New upstream release + + -- Marcin Juszkiewicz Thu, 27 Feb 2003 21:11:26 +0100 + +rox (1.3.6-4) unstable; urgency=low + + * Forgot to add sharutils to Build-Depends (thanks go to Markus Metsala) + + -- Marcin Juszkiewicz Wed, 5 Feb 2003 19:25:47 +0100 + +rox (1.3.6-3) unstable; urgency=low + + * Debian building changes: + - DEB_BUILD_OPTIONS are checked when building as it is in policy + version 3.5.7 + - now it is properly packaged into diff.gz and orig.tar.gz as it should be. + - additional images are kept as uuencoded and decoded during install phase + + * Debian changes: + - ROX-Filer own .DirIcon used (before package used XPM one) + + -- Marcin Juszkiewicz Thu, 30 Jan 2003 18:58:08 +0100 + +rox (1.3.6-2) unstable; urgency=low + + * fixed link to documentation (patch was taken from rox-filer-hrw and not + edited) - reported by Klaus-M. Klingsporn + + -- Marcin Juszkiewicz Sat, 11 Jan 2003 18:51:24 +0100 + +rox (1.3.6-1) unstable; urgency=low + + * New upstream release + + * Debian changes: + - patches replaced by one big patch which do-it-all (taken from my + rox-filer-hrw package) + - removed menu icon - 24 colors is not enough for it + + -- Marcin Juszkiewicz Fri, 10 Jan 2003 19:56:53 +0100 + +rox (1.3.5-1) unstable; urgency=low + + * New upstream release + + * Debian changes: + - images/ cleanup - application.png was missing + - build system changed to the same as in rox-filer-hrw (but rox is still + 'vanilla' rox) + - First directory to write config is ~/.rox_choices - Thomas Leonard + reported that my package cannot create ~/.rox/Choices directory. But + ~/.rox/Choices is still used if you have it. + + -- Marcin Juszkiewicz Thu, 5 Dec 2002 15:31:35 +0100 + +rox (1.3.4-4) unstable; urgency=low + + * Added Norwegian translation (Sigve Indregard). + + -- Marcin Juszkiewicz Tue, 29 Oct 2002 20:05:43 +0100 + +rox (1.3.4-3) unstable; urgency=low + + * Added Swedish translation (Marcus Lundblad). + * Updated French manual translation (Arnaud Calvo). + * Updated French translation (Vincent Lefévre). + * Updated Polish translation (me :). + + -- Marcin Juszkiewicz Sun, 20 Oct 2002 23:34:52 +0200 + +rox (1.3.4-2) unstable; urgency=low + + * Finally I am ROX-Filer Debian package maintainer. Big thanks go to Jan + Wagemakers which started packaging rox. + * Fixed patches/30_helpdir.patch - it points to rox-cvs directory + + -- Marcin Juszkiewicz Mon, 14 Oct 2002 18:52:50 +0200 + +rox (1.3.4-1) unstable; urgency=low + + * New upstream release + + * Debian changes: + - hardcoded APP_DIR replacement (to /usr/share/rox) + - all files moved from /usr/apps/ROX-Filer to /usr/share/rox + - binary moved to /usr/bin/rox (removed from + /usr/apps/ROX-Filer/platform-arch) + - replaced rox script with rox binary (ROX-Filer himself) + - moved 'Choices' from ~/Choices to ~/.rox/Choices (as in package by + Filip Van Raemdonck) + - moved HTML help to /usr/share/doc/rox/html/ + - moved Readmes, Todo to /usr/share/doc/rox/ + - moved Changes to /usr/share/doc/rox/changelog + - moved all files to /usr/share/rox + - added Appicon.xpm for menu + + * building changes: + - debhelper V4 compatible + - lintian/linda friendly + - debian/README.Debian added + - debian/control - added shared-mime-info to Depends + - debian/control - added Build-Depends + - debian/control - me as maintainer + - debian/copyright - include info about my rox-cvs packages + - patching manuals to get correct links to styles and picture + - source depacking moved to build target + + -- Marcin Juszkiewicz Mon, 7 Oct 2002 19:16:20 +0200 + +rox (1.3.3-3) unstable; urgency=low + + * Added /etc/menu-methods/rox + + -- Jan Wagemakers Wed, 7 Aug 2002 23:58:46 +0200 + +rox (1.3.3-2) unstable; urgency=low + + * Added "Conflicts/Replaces: rox-base" to control + + -- Jan Wagemakers Wed, 7 Aug 2002 17:49:46 +0200 + +rox (1.3.3-1) unstable; urgency=low + + * New upstream release + + -- Jan Wagemakers Wed, 7 Aug 2002 08:12:21 +0200 + +rox (1.3.0-1) unstable; urgency=low + + * New upstream release + + -- Jan Wagemakers Sun, 21 Apr 2002 08:20:56 +0200 + +rox (1.2.0-1) unstable; urgency=low + + * New upstream release + + -- Jan Wagemakers Sat, 23 Feb 2002 11:19:34 +0100 + +rox (1.1.14-1) unstable; urgency=low + + * New upstream release + + -- Jan Wagemakers Sat, 16 Feb 2002 13:39:38 +0100 + +rox (1.1.13-1) unstable; urgency=low + + * New upstream release + + -- Jan Wagemakers Sat, 9 Feb 2002 10:36:49 +0100 + +rox (1.1.12-1) unstable; urgency=low + + * New upstream release + + -- Jan Wagemakers Sat, 26 Jan 2002 10:52:42 +0100 + +rox (1.1.11-1) unstable; urgency=low + + * New upstream release + + -- Jan Wagemakers Fri, 11 Jan 2002 09:56:27 +0100 + +rox (1.1.10-1) unstable; urgency=low + + * New upstream release + + -- Jan Wagemakers Mon, 31 Dec 2001 08:39:06 +0100 + +rox (1.1.9-2) unstable; urgency=low + + * ROX is now in the menu Apps/System instead of Apps/Misc + + -- Jan Wagemakers Sat, 15 Dec 2001 10:46:44 +0100 + +rox (1.1.9-1) unstable; urgency=low + + * New upstream release + + -- Jan Wagemakers Sat, 15 Dec 2001 09:49:55 +0100 + +rox (1.1.8-1) unstable; urgency=low + + * New upstream release + + -- Jan Wagemakers Wed, 31 Oct 2001 19:15:11 +0100 + +rox (1.1.7-1) unstable; urgency=low + + * New upstream release + + -- Jan Wagemakers Thu, 13 Sep 2001 09:17:03 +0200 + +rox (1.1.6-1) unstable; urgency=low + + * New upstream release + + -- Jan Wagemakers Sat, 21 Jul 2001 11:33:04 +0200 + +rox (1.1.3-1) unstable; urgency=low + + * New upstream release + + -- Jan Wagemakers Sat, 19 May 2001 19:18:31 +0200 + +rox (1.1.2-1) unstable; urgency=low + + * New upstream release + + -- Jan Wagemakers Sat, 7 Apr 2001 10:42:04 +0200 + +rox (1.1.1-1) unstable; urgency=low + + * New upstream release + + -- Jan Wagemakers Sat, 3 Mar 2001 12:28:44 +0100 + +rox (1.1.0-1) unstable; urgency=low + + * New upstream release + + -- Jan Wagemakers Thu, 25 Jan 2001 16:00:40 +0100 + +rox (1.0.0-2) unstable; urgency=low + + * Removed the 'src' directory. + * Title (menu) changed to ROX (RISC OS on X). + + -- Jan Wagemakers Wed, 27 Dec 2000 12:19:48 +0100 + +rox (1.0.0-1) unstable; urgency=low + + * Initial Release. + * This is my first Debian package. + + -- Jan Wagemakers Mon, 25 Dec 2000 12:25:01 +0100 + --- rox-2.4.orig/debian/rox-filer.dirs +++ rox-2.4/debian/rox-filer.dirs @@ -0,0 +1,7 @@ +etc/menu-methods +usr/bin +usr/share/doc/rox-filer/html +usr/share/rox/Choices +usr/share/rox/images +usr/share/mime/packages +usr/share/locale --- rox-2.4.orig/debian/manpages +++ rox-2.4/debian/manpages @@ -0,0 +1 @@ +rox.1 --- rox-2.4.orig/debian/compat +++ rox-2.4/debian/compat @@ -0,0 +1 @@ +4 --- rox-2.4.orig/debian/README.Debian +++ rox-2.4/debian/README.Debian @@ -0,0 +1,20 @@ +This version is based on a previous work of Marcin Juszkiewicz. + +This version is based on my rox 2.1 package but I added a few patches +which make ROX-Filer more Debian compliant: + - no APP_DIR variable, + - user settings in ~/.rox_choices, ~/.rox/choices or ~/.choice/ROXFiler + instead of ~/Choices. + - files in good directories (FHS friendly): + - all files in /usr/share/rox instead of /usr/apps/ROX-Filer + - HTML help in /usr/share/doc/rox-filer/html/ + - Readmes, TODO in /usr/share/doc/rox-filer/ + - Changes in /usr/share/doc/rox-filer/changelog + - binary from /usr/apps/ROX-Filer/PLATFORM-ARCH/ROX-Filer in /usr/bin/rox + +A few changes has been done in order to have the whole package better integrated +with Debian. Please refer to pkg-rox-devel@lists.alioth.debian.org for improvements +and proposals. + + -- Francesco Paolo Lovergine Thu, 29 Jul 2004 10:51:31 +0200 + --- rox-2.4.orig/debian/patches/mimeapps.dpatch +++ rox-2.4/debian/patches/mimeapps.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## mimeapps.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad rox-2.4~/Choices/MIME-types/text rox-2.4/Choices/MIME-types/text +--- rox-2.4~/Choices/MIME-types/text 2002-05-28 18:59:46.000000000 +0200 ++++ rox-2.4/Choices/MIME-types/text 2005-12-27 09:55:36.000000000 +0100 +@@ -1,2 +1,2 @@ + #!/bin/sh +-exec xterm -e vi "$@" ++exec x-terminal-emulator -e sensible-editor "$@" +diff -urNad rox-2.4~/Choices/MIME-types/text_html rox-2.4/Choices/MIME-types/text_html +--- rox-2.4~/Choices/MIME-types/text_html 2004-07-13 13:23:20.000000000 +0200 ++++ rox-2.4/Choices/MIME-types/text_html 2005-12-27 09:55:36.000000000 +0100 +@@ -1,13 +1,3 @@ + #!/bin/sh + +-for app in firefox mozilla-firefox firebird mozilla-firebird galeon mozilla netscape skipstone dillo konqueror amaya; do +- if [ -x "`which $app`" ]; then exec "$app" "$@"; fi +-done +- +-for app in w3m lynx links vim vi; do +- if [ -x "`which $app`" ]; then exec xterm -e "$app" "$@"; fi +-done +- +-echo "Can't find any web browser installed... last try..." >&2 +- +-exec netscape "$@" ++exec x-www-browser "$@" --- rox-2.4.orig/debian/patches/apprun.dpatch +++ rox-2.4/debian/patches/apprun.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## apprun.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad rox-2.4~/ROX-Filer/AppRun rox-2.4/ROX-Filer/AppRun +--- rox-2.4~/ROX-Filer/AppRun 2005-07-26 22:20:46.000000000 +0200 ++++ rox-2.4/ROX-Filer/AppRun 2005-12-27 09:56:06.000000000 +0100 +@@ -58,7 +58,7 @@ + echo "I cannot find an executable binary." >&2 + echo "Trying to compile..." >&2 + if [ -n "$DISPLAY" ]; then +- xterm -e "$0" --compile ++ x-terminal-emulator -e "$0" --compile + else + "$0" --compile + fi --- rox-2.4.orig/debian/patches/de.po.dpatch +++ rox-2.4/debian/patches/de.po.dpatch @@ -0,0 +1,77 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## de.po.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./ROX-Filer/src/po/de.po /tmp/dpep-work.z2n5iX/rox-2.2.0/ROX-Filer/src/po/de.po +--- ./ROX-Filer/src/po/de.po 2005-01-29 11:25:56.000000000 +0100 ++++ /tmp/dpep-work.z2n5iX/rox-2.2.0/ROX-Filer/src/po/de.po 2005-07-18 14:44:03.000000000 +0200 +@@ -210,7 +210,7 @@ + "\n" + msgstr "" + "Normalerweise ermittelt ROX-Filer then Dateityp\n" +-"über den Dateinamen. Um den Dateityp zu ändern,muss die Datei umbenannt " ++"über den Dateinamen. Um den Dateityp zu ändern, muss die Datei umbenannt " + "werden.\n" + "\n" + "Neuere Dateisysteme unterstützen sogenannte 'Erweiterte\n" +@@ -732,7 +732,7 @@ + #: bookmarks.c:301 + #, c-format + msgid "Can't bookmark non-local resource '%s'\n" +-msgstr "Lesezeichen für Netzwerkresource '%s' nicht anlegbar\n" ++msgstr "Lesezeichen für Netzwerkressource '%s' nicht anlegbar\n" + + #: bookmarks.c:309 bookmarks.c:605 + #, c-format +@@ -958,7 +958,7 @@ + #: dnd.c:844 + msgid "Sorry, can't display a menu of actions for a remote file / raw data." + msgstr "" +-"'tschuldigung, kann kein Aktionsmenü für eine Netwerkdatei / Rohdaten " ++"'tschuldigung, kann kein Aktionsmenü für eine Netzwerkdatei / Rohdaten " + "anzeigen." + + #: dnd.c:860 +@@ -2720,7 +2720,7 @@ + msgstr "" + "Anwendung/Applikation:\n" + "Dies ist ein Applikations-Verzeichnis - Sie können es als Programm starten " +-"oder öffnen (halten Sie Shift gedrückt, währen Sie es öffnen). Die meisten " ++"oder öffnen (halten Sie Shift gedrückt, während Sie es öffnen). Die meisten " + "Applikationen stellen ihre eigene Hilfe hier bereit, aber diese tut das " + "nicht." + +@@ -2947,7 +2947,7 @@ + "Bitte ändern Sie die Rechte jetzt (das Problem könnte durch eine alte " + "fehlerhafte Version des Dateimanagers verursacht sein).\n" + "\n" +-"Ein allgemeines Schreibrecht auf Startaktionen (ausser über Verknüpfung) " ++"Ein allgemeines Schreibrecht auf Startaktionen (außer über Verknüpfung) " + "bedeutet, dass jeder der Ihren Computer benutzt ihre Startaktionen durch " + "bösartigen Version ersetzen kann.\n" + "\n" +@@ -3091,10 +3091,10 @@ + msgstr "" + "Die Datenbank der Standard-MIME-Typen (Version 0.9 oder neuer) ist nicht " + "installiert. Der Dateimanager kann daher Dateien nicht dem richtigen Typ " +-"zuordnen. Installieren Sie das Packet 'shared-mime-info-0.9' von hier:\n" ++"zuordnen. Installieren Sie das Paket 'shared-mime-info-0.9' von hier:\n" + "http://www.freedesktop.org/standards/shared-mime-info.html\n" + "\n" +-"Sollte das Packet schon installiert sein, stellen Sie sicher, dass /usr/" ++"Sollte das Paket schon installiert sein, stellen Sie sicher, dass /usr/" + "local/share/mime/globs oder /usr/share/mime/globs mit Leserechten " + "ausgestattet sind." + +@@ -3457,7 +3457,7 @@ + + #: tips:46 + msgid "Double-click on background resizes" +-msgstr "Doppelklick auf Hintegrund ändert Fenstergröße" ++msgstr "Doppelklick auf Hintergrund ändert Fenstergröße" + + #: tips:47 tips:48 tips:49 tips:50 + msgid "" --- rox-2.4.orig/debian/patches/00list +++ rox-2.4/debian/patches/00list @@ -0,0 +1,12 @@ +# +# 'global' patch modifies configure stuff, so do run autoconf once +# to create a proper patch if you need to recreate it +# by dpatch-edit-patch. That's not needed for config.h.in. +# Also removing of possible .orig files is _mandatory_ +# +global +mimeapps +dnd +apprun +#de.po +listview_crash --- rox-2.4.orig/debian/patches/global.dpatch +++ rox-2.4/debian/patches/global.dpatch @@ -0,0 +1,265 @@ +#! /bin/sh -e +## global.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -lt 1 ]; then + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" + +case "$1" in + -patch) patch -p1 ${patch_opts} < $0;; + -unpatch) patch -R -p1 ${patch_opts} < $0;; + *) + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad rox-2.4~/ROX-Filer/src/choices.c rox-2.4/ROX-Filer/src/choices.c +--- rox-2.4~/ROX-Filer/src/choices.c 2005-05-20 22:03:33.000000000 +0200 ++++ rox-2.4/ROX-Filer/src/choices.c 2005-12-27 09:46:31.000000000 +0100 +@@ -98,12 +98,13 @@ + { + saving_disabled = FALSE; + +- dir_list = g_new(gchar *, 4); +- dir_list[0] = g_build_filename(g_get_home_dir(), "Choices", +- NULL); +- dir_list[1] = g_strdup("/usr/local/share/Choices"); +- dir_list[2] = g_strdup("/usr/share/Choices"); +- dir_list[3] = NULL; ++ dir_list = g_new(gchar *, 5); ++ dir_list[0] = g_strconcat(g_get_home_dir(),".choice", NULL); ++ dir_list[1] = g_strconcat(g_get_home_dir(),".rox/choices", NULL); ++ dir_list[2] = g_strconcat(g_get_home_dir(),".rox_choices", NULL); ++ dir_list[3] = g_strdup("/usr/share/rox/Choices"); ++ dir_list[4] = NULL; ++ + } + + /* Initialize new system */ +diff -urNad rox-2.4~/ROX-Filer/src/config.h.in rox-2.4/ROX-Filer/src/config.h.in +--- rox-2.4~/ROX-Filer/src/config.h.in 2005-07-15 22:18:22.000000000 +0200 ++++ rox-2.4/ROX-Filer/src/config.h.in 2005-12-27 09:46:31.000000000 +0100 +@@ -3,6 +3,9 @@ + #define PROJECT "ROX-Filer" + #define VERSION "Unknown" + #define GTK_VERSION "Unknown" ++#define APP_DIR "/usr/share/rox" ++#define HTMLHELP_DIR "/usr/share/doc/rox-filer" ++extern const char *htmlhelp_dir; + + #undef STDC_HEADERS + #undef HAVE_SYS_UCRED_H +diff -urNad rox-2.4~/ROX-Filer/src/i18n.c rox-2.4/ROX-Filer/src/i18n.c +--- rox-2.4~/ROX-Filer/src/i18n.c 2005-08-27 18:11:23.000000000 +0200 ++++ rox-2.4/ROX-Filer/src/i18n.c 2005-12-27 09:49:05.000000000 +0100 +@@ -210,7 +210,7 @@ + + current_lang = lang2; + +- path = g_strdup_printf("%s/Messages/%s.gmo", app_dir, current_lang); ++ path = g_strdup_printf("/usr/share/locale/%s/LC_MESSAGES/rox.mo", current_lang); + if (!file_exists(path) && strchr(current_lang, '_')) + { + /* Try again without the territory */ +diff -urNad rox-2.4~/ROX-Filer/src/i18n.c.rej rox-2.4/ROX-Filer/src/i18n.c.rej +--- rox-2.4~/ROX-Filer/src/i18n.c.rej 1970-01-01 01:00:00.000000000 +0100 ++++ rox-2.4/ROX-Filer/src/i18n.c.rej 2005-12-27 09:46:31.000000000 +0100 +@@ -0,0 +1,17 @@ ++*************** ++*** 200,206 **** ++ ++ current_lang = lang2 ? lang2 : g_strdup(lang); ++ ++- path = g_strdup_printf("%s/Messages/%s.gmo", app_dir, current_lang); ++ if (file_exists(path)) ++ rox_add_translations(path); ++ g_free(path); ++--- 200,206 ---- ++ ++ current_lang = lang2 ? lang2 : g_strdup(lang); ++ +++ path = g_strdup_printf("/usr/share/locale/%s/LC_MESSAGES/rox.mo", current_lang); ++ if (file_exists(path)) ++ rox_add_translations(path); ++ g_free(path); +diff -urNad rox-2.4~/ROX-Filer/src/main.c rox-2.4/ROX-Filer/src/main.c +--- rox-2.4~/ROX-Filer/src/main.c 2005-11-21 21:05:55.000000000 +0100 ++++ rox-2.4/ROX-Filer/src/main.c 2005-12-27 09:46:31.000000000 +0100 +@@ -87,7 +87,7 @@ + const gchar *show_user_message = NULL; + + int home_dir_len; +-const char *home_dir, *app_dir; ++const char *home_dir, *app_dir, *htmlhelp_dir; + + GtkTooltips *tooltips = NULL; + +@@ -101,10 +101,10 @@ + "see the file named COPYING.\n") + + #ifdef HAVE_GETOPT_LONG +-# define USAGE N_("Try `ROX-Filer/AppRun --help' for more information.\n") ++# define USAGE N_("Try `rox --help' for more information.\n") + # define SHORT_ONLY_WARNING "" + #else +-# define USAGE N_("Try `ROX-Filer/AppRun -h' for more information.\n") ++# define USAGE N_("Try `rox -h' for more information.\n") + # define SHORT_ONLY_WARNING \ + _("NOTE: Your system does not support long options - \n" \ + "you must use the short versions instead.\n\n") +@@ -112,7 +112,7 @@ + + #define BUGS_TO "" + +-#define HELP N_("Usage: ROX-Filer/AppRun [OPTION]... [FILE]...\n" \ ++#define HELP N_("Usage: rox [OPTION]... [FILE]...\n" \ + "Open each directory or file listed, or the current working\n" \ + "directory if no arguments are given.\n\n" \ + " -b, --border=PANEL open PANEL as a border panel\n" \ +@@ -274,7 +274,8 @@ + + home_dir = g_get_home_dir(); + home_dir_len = strlen(home_dir); +- app_dir = g_strdup(getenv("APP_DIR")); ++ app_dir = g_strdup(APP_DIR); ++ htmlhelp_dir = g_strdup(HTMLHELP_DIR); + + /* Get internationalisation up and running. This requires the + * choices system, to discover the user's preferred language. +@@ -284,20 +285,6 @@ + i18n_init(); + xattr_init(); + +- if (!app_dir) +- { +- g_warning("APP_DIR environment variable was unset!\n" +- "Use the AppRun script to invoke ROX-Filer...\n"); +- app_dir = g_get_current_dir(); +- } +-#ifdef HAVE_UNSETENV +- else +- { +- /* Don't pass it on to our child processes... */ +- unsetenv("APP_DIR"); +- } +-#endif +- + /* Sometimes we want to take special action when a child + * process exits. This hash table is used to convert the + * child's PID to the callback function. +diff -urNad rox-2.4~/ROX-Filer/src/menu.c rox-2.4/ROX-Filer/src/menu.c +--- rox-2.4~/ROX-Filer/src/menu.c 2005-11-29 21:24:49.000000000 +0100 ++++ rox-2.4/ROX-Filer/src/menu.c 2005-12-27 09:55:02.000000000 +0100 +@@ -1767,14 +1767,14 @@ + if (action == HELP_ABOUT) + infobox_new(app_dir); + else if (action == HELP_DIR) +- filer_opendir(make_path(app_dir, "Help"), NULL, NULL); ++ filer_opendir(make_path(htmlhelp_dir, "html"), NULL, NULL); + else if (action == HELP_MANUAL) + { + gchar *manual = NULL; + + if (current_lang) + { +- manual = g_strconcat(app_dir, "/Help/Manual-", ++ manual = g_strconcat(htmlhelp_dir, "/html/Manual-", + current_lang, ".html", NULL); + if (!file_exists(manual) && strchr(current_lang, '_')) + { +@@ -1786,8 +1786,8 @@ + } + + if (!manual) +- manual = g_strconcat(app_dir, +- "/Help/Manual.html", NULL); ++ manual = g_strconcat(htmlhelp_dir, ++ "/html/Manual.html", NULL); + + run_by_path(manual); + +diff -urNad rox-2.4~/ROX-Filer/src/menu.c.rej rox-2.4/ROX-Filer/src/menu.c.rej +--- rox-2.4~/ROX-Filer/src/menu.c.rej 1970-01-01 01:00:00.000000000 +0100 ++++ rox-2.4/ROX-Filer/src/menu.c.rej 2005-12-27 09:46:31.000000000 +0100 +@@ -0,0 +1,47 @@ ++*************** ++*** 1780,1801 **** ++ if (action == HELP_ABOUT) ++ infobox_new(app_dir); ++ else if (action == HELP_DIR) ++- filer_opendir(make_path(app_dir, "Help"), NULL, NULL); ++ else if (action == HELP_MANUAL) ++ { ++ gchar *manual = NULL; ++ ++ if (current_lang) ++ { ++- manual = g_strconcat(app_dir, "/Help/Manual-", ++ current_lang, ".html", NULL); ++ if (access(manual, F_OK)) ++ null_g_free(&manual); ++ } ++ ++ if (!manual) ++- manual = g_strconcat(app_dir, ++- "/Help/Manual.html", NULL); ++ ++ run_by_path(manual); ++ ++--- 1780,1801 ---- ++ if (action == HELP_ABOUT) ++ infobox_new(app_dir); ++ else if (action == HELP_DIR) +++ filer_opendir(make_path(htmlhelp_dir, "html"), NULL, NULL); ++ else if (action == HELP_MANUAL) ++ { ++ gchar *manual = NULL; ++ ++ if (current_lang) ++ { +++ manual = g_strconcat(htmlhelp_dir, "/html/Manual-", ++ current_lang, ".html", NULL); ++ if (access(manual, F_OK)) ++ null_g_free(&manual); ++ } ++ ++ if (!manual) +++ manual = g_strconcat(htmlhelp_dir, +++ "/html/Manual.html", NULL); ++ ++ run_by_path(manual); ++ +diff -urNad rox-2.4~/ROX-Filer/src/session.c rox-2.4/ROX-Filer/src/session.c +--- rox-2.4~/ROX-Filer/src/session.c 2005-01-16 17:48:03.000000000 +0100 ++++ rox-2.4/ROX-Filer/src/session.c 2005-12-27 09:46:31.000000000 +0100 +@@ -107,7 +107,7 @@ + return; + + pw = getpwuid(euid); +- bin_path = g_strconcat(app_dir, "/AppRun", NULL); ++ bin_path = g_strconcat("", "/rox", NULL); + clone_cmd[0] = bin_path, + clone_cmd[1] = "-n"; + +diff -urNad rox-2.4~/ROX-Filer/src/toolbar.c rox-2.4/ROX-Filer/src/toolbar.c +--- rox-2.4~/ROX-Filer/src/toolbar.c 2005-08-01 09:10:20.000000000 +0200 ++++ rox-2.4/ROX-Filer/src/toolbar.c 2005-12-27 09:46:31.000000000 +0100 +@@ -296,7 +296,7 @@ + ((GdkEventButton *) event)->button != 1) + menu_rox_help(NULL, HELP_MANUAL, NULL); + else +- filer_opendir(make_path(app_dir, "Help"), NULL, NULL); ++ filer_opendir(make_path(htmlhelp_dir, "html"), NULL, NULL); + gdk_event_free(event); + } + --- rox-2.4.orig/debian/patches/dnd.dpatch +++ rox-2.4/debian/patches/dnd.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## dnd.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad rox-2.4~/ROX-Filer/src/dnd.c rox-2.4/ROX-Filer/src/dnd.c +--- rox-2.4~/ROX-Filer/src/dnd.c 2005-08-01 09:10:18.000000000 +0200 ++++ rox-2.4/ROX-Filer/src/dnd.c 2005-12-27 09:55:53.000000000 +0100 +@@ -169,7 +169,7 @@ + option_add_int(&o_dnd_middle_menu, "dnd_middle_menu", TRUE); + + option_add_string(&o_dnd_uri_handler, "dnd_uri_handler", +- "xterm -e wget $1"); ++ "x-terminal-emulator -e wget $1"); + } + + /* SUPPORT FUNCTIONS */ --- rox-2.4.orig/debian/patches/listview_crash.dpatch +++ rox-2.4/debian/patches/listview_crash.dpatch @@ -0,0 +1,55 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## listview_crash.dpatch by Daniel T Chen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix rox-filer segfault on activation of list view + +@DPATCH@ + +diff -u -r1.371 -r1.372 +--- ./ROX-Filer/src/filer.c.orig 13 Nov 2005 11:24:41 -0000 1.371 ++++ ./ROX-Filer/src/filer.c 15 Dec 2005 18:39:54 -0000 1.372 +@@ -765,6 +765,8 @@ + */ + void filer_selection_changed(FilerWindow *filer_window, gint time) + { ++ g_return_if_fail(filer_window != NULL); ++ + toolbar_update_info(filer_window); + + if (window_with_primary == filer_window) +diff -u -r1.82 -r1.83 +--- ./ROX-Filer/src/toolbar.c.orig 1 Aug 2005 07:10:20 -0000 1.82 ++++ ./ROX-Filer/src/toolbar.c 15 Dec 2005 18:39:54 -0000 1.83 +@@ -184,6 +184,8 @@ + ViewIface *view; + int n_selected; + ++ g_return_if_fail(filer_window != NULL); ++ + if (o_toolbar.int_value == TOOLBAR_NONE || !o_toolbar_info.int_value) + return; /* Not showing info */ + +diff -u -r1.46 -r1.47 +--- ./ROX-Filer/src/view_details.c.orig 23 Mar 2005 19:16:55 -0000 1.46 ++++ ./ROX-Filer/src/view_details.c 15 Dec 2005 18:39:54 -0000 1.47 +@@ -990,14 +990,17 @@ + GTK_SELECTION_MULTIPLE); + gtk_tree_selection_set_select_function(view_details->selection, + test_can_change_selection, view_details, NULL); +- g_signal_connect(view_details->selection, "changed", +- G_CALLBACK(selection_changed), view_details); + + /* Sorting */ + view_details->sort_fn = NULL; + sortable_list = GTK_TREE_SORTABLE(object); + + gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(view_details)); ++ /* Do this after set_model, because that can generate this ++ * signal... ++ */ ++ g_signal_connect(view_details->selection, "changed", ++ G_CALLBACK(selection_changed), view_details); + + /* Icon */ + cell = cell_icon_new(view_details); --- rox-2.4.orig/debian/copyright +++ rox-2.4/debian/copyright @@ -0,0 +1,21 @@ +This package was debianized by Jan Wagemakers on +Mon, 25 Dec 2000 12:25:01 +0100. + +CVS version was build by Marcin Juszkiewicz on +Sat, 8 Jun 2002 22:46:20 +0200. + +This version was build by Marcin Juszkiewicz on +Mon, 7 Oct 2002 19:15:17 +0200 (based on rox-cvs package) + +Current version is under maintenance of the ROX-in-Debian Team +Please refer to the team site http://pkg-rox.alioth.debian.org and its mailing list. + +Upstream source was downloaded from http://rox.sf.net/ + +Upstream Author: Thomas Leonard + +Copyright (C) 2000 Thomas Leonard. +You may redistribute copies of ROX-Filer under the terms of +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 file.