--- dolphin-0.9.2.orig/po/Makefile.in +++ dolphin-0.9.2/po/Makefile.in @@ -290,8 +290,8 @@ xdg_menudir = @xdg_menudir@ #>- POFILES = AUTO #>+ 2 -POFILES = ru.po d3lphin.po he.po el.po de.po es.po fr.po it.po pl.po et.po -GMOFILES = ru.gmo d3lphin.gmo he.gmo el.gmo de.gmo es.gmo fr.gmo it.gmo pl.gmo et.gmo +POFILES = he.po pl.po et.po d3lphin.po fr.po es.po ru.po el.po it.po de.po +GMOFILES = he.gmo pl.gmo et.gmo d3lphin.gmo fr.gmo es.gmo ru.gmo el.gmo it.gmo de.gmo #>- all: all-am #>+ 1 all: all-nls docs-am all-am @@ -306,9 +306,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/Makefile +#>- $(AUTOMAKE) --foreign po/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -318,9 +318,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/Makefile + $(AUTOMAKE) --foreign po/Makefile cd $(top_srcdir) && perl admin/am_edit po/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -490,47 +490,47 @@ .NOEXPORT: #>+ 2 -KDE_DIST=d3lphin.gmo pl.gmo Makefile.in ru.po ru.gmo he.gmo it.gmo d3lphin.pot el.gmo pl.po de.po de.gmo es.po et.po fr.gmo es.gmo it.po fr.po Makefile.am el.po et.gmo he.po d3lphin.po +KDE_DIST=d3lphin.gmo pl.gmo Makefile.in ru.po ru.gmo he.gmo it.gmo el.gmo de.po de.gmo pl.po es.po et.po fr.gmo es.gmo it.po fr.po Makefile.am el.po et.gmo d3lphin.po he.po #>+ 31 -ru.gmo: ru.po - rm -f ru.gmo; $(GMSGFMT) -o ru.gmo $(srcdir)/ru.po - test ! -f ru.gmo || touch ru.gmo -d3lphin.gmo: d3lphin.po - rm -f d3lphin.gmo; $(GMSGFMT) -o d3lphin.gmo $(srcdir)/d3lphin.po - test ! -f d3lphin.gmo || touch d3lphin.gmo he.gmo: he.po rm -f he.gmo; $(GMSGFMT) -o he.gmo $(srcdir)/he.po test ! -f he.gmo || touch he.gmo -el.gmo: el.po - rm -f el.gmo; $(GMSGFMT) -o el.gmo $(srcdir)/el.po - test ! -f el.gmo || touch el.gmo -de.gmo: de.po - rm -f de.gmo; $(GMSGFMT) -o de.gmo $(srcdir)/de.po - test ! -f de.gmo || touch de.gmo -es.gmo: es.po - rm -f es.gmo; $(GMSGFMT) -o es.gmo $(srcdir)/es.po - test ! -f es.gmo || touch es.gmo -fr.gmo: fr.po - rm -f fr.gmo; $(GMSGFMT) -o fr.gmo $(srcdir)/fr.po - test ! -f fr.gmo || touch fr.gmo -it.gmo: it.po - rm -f it.gmo; $(GMSGFMT) -o it.gmo $(srcdir)/it.po - test ! -f it.gmo || touch it.gmo pl.gmo: pl.po rm -f pl.gmo; $(GMSGFMT) -o pl.gmo $(srcdir)/pl.po test ! -f pl.gmo || touch pl.gmo et.gmo: et.po rm -f et.gmo; $(GMSGFMT) -o et.gmo $(srcdir)/et.po test ! -f et.gmo || touch et.gmo +d3lphin.gmo: d3lphin.po + rm -f d3lphin.gmo; $(GMSGFMT) -o d3lphin.gmo $(srcdir)/d3lphin.po + test ! -f d3lphin.gmo || touch d3lphin.gmo +fr.gmo: fr.po + rm -f fr.gmo; $(GMSGFMT) -o fr.gmo $(srcdir)/fr.po + test ! -f fr.gmo || touch fr.gmo +es.gmo: es.po + rm -f es.gmo; $(GMSGFMT) -o es.gmo $(srcdir)/es.po + test ! -f es.gmo || touch es.gmo +ru.gmo: ru.po + rm -f ru.gmo; $(GMSGFMT) -o ru.gmo $(srcdir)/ru.po + test ! -f ru.gmo || touch ru.gmo +el.gmo: el.po + rm -f el.gmo; $(GMSGFMT) -o el.gmo $(srcdir)/el.po + test ! -f el.gmo || touch el.gmo +it.gmo: it.po + rm -f it.gmo; $(GMSGFMT) -o it.gmo $(srcdir)/it.po + test ! -f it.gmo || touch it.gmo +de.gmo: de.po + rm -f de.gmo; $(GMSGFMT) -o de.gmo $(srcdir)/de.po + test ! -f de.gmo || touch de.gmo #>+ 3 clean-nls: - -rm -f ru.gmo d3lphin.gmo he.gmo el.gmo de.gmo es.gmo fr.gmo it.gmo pl.gmo et.gmo + -rm -f he.gmo pl.gmo et.gmo d3lphin.gmo fr.gmo es.gmo ru.gmo el.gmo it.gmo de.gmo #>+ 10 install-nls: - @for base in ru d3lphin he el de es fr it pl et ; do \ + @for base in he pl et d3lphin fr es ru el it de ; do \ echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\ $(mkinstalldirs) $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES ; \ if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\ @@ -541,16 +541,16 @@ #>+ 12 uninstall-nls: - rm -f $(DESTDIR)$(kde_locale)/ru/LC_MESSAGES/$(PACKAGE).mo - rm -f $(DESTDIR)$(kde_locale)/d3lphin/LC_MESSAGES/$(PACKAGE).mo rm -f $(DESTDIR)$(kde_locale)/he/LC_MESSAGES/$(PACKAGE).mo - rm -f $(DESTDIR)$(kde_locale)/el/LC_MESSAGES/$(PACKAGE).mo - rm -f $(DESTDIR)$(kde_locale)/de/LC_MESSAGES/$(PACKAGE).mo - rm -f $(DESTDIR)$(kde_locale)/es/LC_MESSAGES/$(PACKAGE).mo - rm -f $(DESTDIR)$(kde_locale)/fr/LC_MESSAGES/$(PACKAGE).mo - rm -f $(DESTDIR)$(kde_locale)/it/LC_MESSAGES/$(PACKAGE).mo rm -f $(DESTDIR)$(kde_locale)/pl/LC_MESSAGES/$(PACKAGE).mo rm -f $(DESTDIR)$(kde_locale)/et/LC_MESSAGES/$(PACKAGE).mo + rm -f $(DESTDIR)$(kde_locale)/d3lphin/LC_MESSAGES/$(PACKAGE).mo + rm -f $(DESTDIR)$(kde_locale)/fr/LC_MESSAGES/$(PACKAGE).mo + rm -f $(DESTDIR)$(kde_locale)/es/LC_MESSAGES/$(PACKAGE).mo + rm -f $(DESTDIR)$(kde_locale)/ru/LC_MESSAGES/$(PACKAGE).mo + rm -f $(DESTDIR)$(kde_locale)/el/LC_MESSAGES/$(PACKAGE).mo + rm -f $(DESTDIR)$(kde_locale)/it/LC_MESSAGES/$(PACKAGE).mo + rm -f $(DESTDIR)$(kde_locale)/de/LC_MESSAGES/$(PACKAGE).mo #>+ 2 all-nls: $(GMOFILES) @@ -582,9 +582,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/Makefile + $(AUTOMAKE) --foreign po/Makefile cd $(top_srcdir) && perl admin/am_edit po/Makefile.in --- dolphin-0.9.2.orig/Makefile.in +++ dolphin-0.9.2/Makefile.in @@ -338,29 +338,29 @@ #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ -#>- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ -#>- cd $(srcdir) && $(AUTOMAKE) --gnu \ +#>- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ +#>- cd $(srcdir) && $(AUTOMAKE) --foreign \ #>- && exit 0; \ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu Makefile +#>- $(AUTOMAKE) --foreign Makefile #>+ 14 @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ ( \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ + cd $(srcdir) && $(AUTOMAKE) --foreign \ ) || exit 1; echo ' cd $(top_srcdir) && perl admin/am_edit '; cd $(top_srcdir) && perl admin/am_edit && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + $(AUTOMAKE) --foreign Makefile cd $(top_srcdir) && perl admin/am_edit Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -827,7 +827,7 @@ #>+ 7 force-reedit: \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ + cd $(srcdir) && $(AUTOMAKE) --foreign \ cd $(top_srcdir) && perl admin/am_edit Makefile.in --- dolphin-0.9.2.orig/src/Makefile.in +++ dolphin-0.9.2/src/Makefile.in @@ -414,7 +414,7 @@ d3lphin_LDFLAGS = $(KDE_RPATH) $(all_libraries) # the libraries to link against. -d3lphin_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) +d3lphin_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) -lkonq # which sources should be compiled for d3lphin d3lphin_SOURCES = bookmarkselector.cpp bookmarkssettingspage.cpp \ @@ -471,9 +471,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu src/Makefile +#>- $(AUTOMAKE) --foreign src/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -483,9 +483,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + $(AUTOMAKE) --foreign src/Makefile cd $(top_srcdir) && perl admin/am_edit src/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -1044,18 +1044,18 @@ mocs: dolphin.moc #>+ 3 -dolphindetailsview.moc: $(srcdir)/dolphindetailsview.h - $(MOC) $(srcdir)/dolphindetailsview.h -o dolphindetailsview.moc +bookmarkssidebarpage.moc.cpp: $(srcdir)/bookmarkssidebarpage.h + $(MOC) $(srcdir)/bookmarkssidebarpage.h -o bookmarkssidebarpage.moc.cpp #>+ 2 -mocs: dolphindetailsview.moc +mocs: bookmarkssidebarpage.moc.cpp #>+ 3 -bookmarkssidebarpage.moc.cpp: $(srcdir)/bookmarkssidebarpage.h - $(MOC) $(srcdir)/bookmarkssidebarpage.h -o bookmarkssidebarpage.moc.cpp +dolphindetailsview.moc: $(srcdir)/dolphindetailsview.h + $(MOC) $(srcdir)/dolphindetailsview.h -o dolphindetailsview.moc #>+ 2 -mocs: bookmarkssidebarpage.moc.cpp +mocs: dolphindetailsview.moc #>+ 3 filterbar.moc: $(srcdir)/filterbar.h @@ -1086,18 +1086,18 @@ mocs: urlnavigatorbutton.moc.cpp #>+ 3 -undomanager.moc: $(srcdir)/undomanager.h - $(MOC) $(srcdir)/undomanager.h -o undomanager.moc +sidebarpage.moc.cpp: $(srcdir)/sidebarpage.h + $(MOC) $(srcdir)/sidebarpage.h -o sidebarpage.moc.cpp #>+ 2 -mocs: undomanager.moc +mocs: sidebarpage.moc.cpp #>+ 3 -sidebarpage.moc.cpp: $(srcdir)/sidebarpage.h - $(MOC) $(srcdir)/sidebarpage.h -o sidebarpage.moc.cpp +undomanager.moc: $(srcdir)/undomanager.h + $(MOC) $(srcdir)/undomanager.h -o undomanager.moc #>+ 2 -mocs: sidebarpage.moc.cpp +mocs: undomanager.moc #>+ 3 statusbarmessagelabel.moc.cpp: $(srcdir)/statusbarmessagelabel.h @@ -1150,7 +1150,7 @@ #>+ 3 clean-metasources: - -rm -f dolphiniconsview.moc settingspagebase.moc urlbutton.moc.cpp editbookmarkdialog.moc viewpropertiesdialog.moc bookmarkssettingspage.moc statusbarspaceinfo.moc renamedialog.moc dolphinsettingsdialog.moc viewsettingspage.moc generalsettingspage.moc urlnavigator.moc iconsviewsettingspage.moc dolphin.moc dolphindetailsview.moc bookmarkssidebarpage.moc.cpp filterbar.moc dolphinview.moc infosidebarpage.moc.cpp urlnavigatorbutton.moc.cpp undomanager.moc sidebarpage.moc.cpp statusbarmessagelabel.moc.cpp dolphindirlister.moc bookmarkselector.moc pixmapviewer.moc detailsviewsettingspage.moc sidebars.moc.cpp dolphinstatusbar.moc + -rm -f dolphiniconsview.moc settingspagebase.moc urlbutton.moc.cpp editbookmarkdialog.moc viewpropertiesdialog.moc bookmarkssettingspage.moc statusbarspaceinfo.moc renamedialog.moc dolphinsettingsdialog.moc viewsettingspage.moc generalsettingspage.moc urlnavigator.moc iconsviewsettingspage.moc dolphin.moc bookmarkssidebarpage.moc.cpp dolphindetailsview.moc filterbar.moc dolphinview.moc infosidebarpage.moc.cpp urlnavigatorbutton.moc.cpp sidebarpage.moc.cpp undomanager.moc statusbarmessagelabel.moc.cpp dolphindirlister.moc bookmarkselector.moc pixmapviewer.moc detailsviewsettingspage.moc sidebars.moc.cpp dolphinstatusbar.moc #>+ 2 KDE_DIST=sidebarssettings.h d3lphin.desktop dolphin.lsm d3lphinui.rc hi16-app-d3lphin.png hi32-app-d3lphin.png hi64-app-d3lphin.png progressindicator.h hi128-app-d3lphin.png hi22-app-d3lphin.png Makefile.in hi48-app-d3lphin.png Makefile.am @@ -1160,26 +1160,26 @@ #>+ 22 install-kde-icons: - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps - $(INSTALL_DATA) $(srcdir)/hi128-app-d3lphin.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/d3lphin.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps - $(INSTALL_DATA) $(srcdir)/hi22-app-d3lphin.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/d3lphin.png $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps $(INSTALL_DATA) $(srcdir)/hi64-app-d3lphin.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/d3lphin.png $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps $(INSTALL_DATA) $(srcdir)/hi48-app-d3lphin.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/d3lphin.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps - $(INSTALL_DATA) $(srcdir)/hi32-app-d3lphin.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/d3lphin.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps + $(INSTALL_DATA) $(srcdir)/hi22-app-d3lphin.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/d3lphin.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps + $(INSTALL_DATA) $(srcdir)/hi128-app-d3lphin.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/d3lphin.png $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps $(INSTALL_DATA) $(srcdir)/hi16-app-d3lphin.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/d3lphin.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps + $(INSTALL_DATA) $(srcdir)/hi32-app-d3lphin.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/d3lphin.png uninstall-kde-icons: - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/d3lphin.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/d3lphin.png -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/d3lphin.png -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/d3lphin.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/d3lphin.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/d3lphin.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/d3lphin.png -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/d3lphin.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/d3lphin.png #>+ 15 force-reedit: @@ -1191,9 +1191,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + $(AUTOMAKE) --foreign src/Makefile cd $(top_srcdir) && perl admin/am_edit src/Makefile.in --- dolphin-0.9.2.orig/src/pics/16x16/Makefile.in +++ dolphin-0.9.2/src/pics/16x16/Makefile.in @@ -312,9 +312,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/16x16/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/16x16/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu src/pics/16x16/Makefile +#>- $(AUTOMAKE) --foreign src/pics/16x16/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -324,9 +324,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/16x16/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/16x16/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/pics/16x16/Makefile + $(AUTOMAKE) --foreign src/pics/16x16/Makefile cd $(top_srcdir) && perl admin/am_edit src/pics/16x16/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -524,9 +524,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/16x16/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/16x16/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/pics/16x16/Makefile + $(AUTOMAKE) --foreign src/pics/16x16/Makefile cd $(top_srcdir) && perl admin/am_edit src/pics/16x16/Makefile.in --- dolphin-0.9.2.orig/src/pics/Makefile.in +++ dolphin-0.9.2/src/pics/Makefile.in @@ -321,9 +321,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu src/pics/Makefile +#>- $(AUTOMAKE) --foreign src/pics/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -333,9 +333,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/pics/Makefile + $(AUTOMAKE) --foreign src/pics/Makefile cd $(top_srcdir) && perl admin/am_edit src/pics/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -659,9 +659,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/pics/Makefile + $(AUTOMAKE) --foreign src/pics/Makefile cd $(top_srcdir) && perl admin/am_edit src/pics/Makefile.in --- dolphin-0.9.2.orig/src/pics/128x128/Makefile.in +++ dolphin-0.9.2/src/pics/128x128/Makefile.in @@ -312,9 +312,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/128x128/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/128x128/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu src/pics/128x128/Makefile +#>- $(AUTOMAKE) --foreign src/pics/128x128/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -324,9 +324,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/128x128/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/128x128/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/pics/128x128/Makefile + $(AUTOMAKE) --foreign src/pics/128x128/Makefile cd $(top_srcdir) && perl admin/am_edit src/pics/128x128/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -524,9 +524,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/128x128/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/128x128/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/pics/128x128/Makefile + $(AUTOMAKE) --foreign src/pics/128x128/Makefile cd $(top_srcdir) && perl admin/am_edit src/pics/128x128/Makefile.in --- dolphin-0.9.2.orig/src/pics/48x48/Makefile.in +++ dolphin-0.9.2/src/pics/48x48/Makefile.in @@ -312,9 +312,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/48x48/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/48x48/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu src/pics/48x48/Makefile +#>- $(AUTOMAKE) --foreign src/pics/48x48/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -324,9 +324,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/48x48/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/48x48/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/pics/48x48/Makefile + $(AUTOMAKE) --foreign src/pics/48x48/Makefile cd $(top_srcdir) && perl admin/am_edit src/pics/48x48/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -524,9 +524,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/48x48/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/48x48/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/pics/48x48/Makefile + $(AUTOMAKE) --foreign src/pics/48x48/Makefile cd $(top_srcdir) && perl admin/am_edit src/pics/48x48/Makefile.in --- dolphin-0.9.2.orig/src/pics/32x32/Makefile.in +++ dolphin-0.9.2/src/pics/32x32/Makefile.in @@ -312,9 +312,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/32x32/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/32x32/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu src/pics/32x32/Makefile +#>- $(AUTOMAKE) --foreign src/pics/32x32/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -324,9 +324,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/32x32/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/32x32/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/pics/32x32/Makefile + $(AUTOMAKE) --foreign src/pics/32x32/Makefile cd $(top_srcdir) && perl admin/am_edit src/pics/32x32/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -524,9 +524,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/32x32/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/32x32/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/pics/32x32/Makefile + $(AUTOMAKE) --foreign src/pics/32x32/Makefile cd $(top_srcdir) && perl admin/am_edit src/pics/32x32/Makefile.in --- dolphin-0.9.2.orig/src/pics/22x22/Makefile.in +++ dolphin-0.9.2/src/pics/22x22/Makefile.in @@ -312,9 +312,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/22x22/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/22x22/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu src/pics/22x22/Makefile +#>- $(AUTOMAKE) --foreign src/pics/22x22/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -324,9 +324,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/22x22/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/22x22/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/pics/22x22/Makefile + $(AUTOMAKE) --foreign src/pics/22x22/Makefile cd $(top_srcdir) && perl admin/am_edit src/pics/22x22/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -524,9 +524,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/22x22/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/22x22/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/pics/22x22/Makefile + $(AUTOMAKE) --foreign src/pics/22x22/Makefile cd $(top_srcdir) && perl admin/am_edit src/pics/22x22/Makefile.in --- dolphin-0.9.2.orig/src/pics/64x64/Makefile.in +++ dolphin-0.9.2/src/pics/64x64/Makefile.in @@ -312,9 +312,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/64x64/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/64x64/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu src/pics/64x64/Makefile +#>- $(AUTOMAKE) --foreign src/pics/64x64/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -324,9 +324,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/64x64/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/64x64/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/pics/64x64/Makefile + $(AUTOMAKE) --foreign src/pics/64x64/Makefile cd $(top_srcdir) && perl admin/am_edit src/pics/64x64/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -524,9 +524,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pics/64x64/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pics/64x64/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/pics/64x64/Makefile + $(AUTOMAKE) --foreign src/pics/64x64/Makefile cd $(top_srcdir) && perl admin/am_edit src/pics/64x64/Makefile.in --- dolphin-0.9.2.orig/src/servicemenus/Makefile.in +++ dolphin-0.9.2/src/servicemenus/Makefile.in @@ -297,7 +297,7 @@ xdg_directorydir = @xdg_directorydir@ xdg_menudir = @xdg_menudir@ servicemenusdir = $(kde_datadir)/d3lphin/servicemenus -servicemenus_DATA = amarok_addaspodcast.desktop amarok_append.desktop \ +servicemenus_DATA = compress.desktop amarok_addaspodcast.desktop amarok_append.desktop \ amarok_play_audiocd.desktop ark_compress.desktop ark_extract.desktop ark_extract_subdir.desktop \ d3lphin_su.desktop edit_as_root.desktop encryptfile.desktop encryptfolder.desktop \ floppy_format.desktop imageconverter.desktop installfont.desktop jpegorient.desktop \ @@ -328,9 +328,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/servicemenus/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/servicemenus/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu src/servicemenus/Makefile +#>- $(AUTOMAKE) --foreign src/servicemenus/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -340,9 +340,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/servicemenus/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/servicemenus/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/servicemenus/Makefile + $(AUTOMAKE) --foreign src/servicemenus/Makefile cd $(top_srcdir) && perl admin/am_edit src/servicemenus/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -526,7 +526,7 @@ .NOEXPORT: #>+ 2 -KDE_DIST=k3b_write_iso_image.desktop text-perl-print.desktop imageconverter.desktop text-diff-print.desktop amarok_addaspodcast.desktop text-python-print.desktop run_as_root.desktop kdesktopSetAsBackground.desktop text-c++h-print.desktop k3b_handle_empty_cd.desktop ark_extract.desktop k3b_audiocd_rip.desktop k3b_create_audio_cd.desktop k3b_videodvd_rip.desktop k3b_write_bin_image.desktop media_safelyremove.desktop encryptfolder.desktop encryptfile.desktop ark_compress.desktop jpegorient.desktop isoservice.desktop mail_as_attachment.desktop k3b_cd_copy.desktop floppy_format.desktop edit_as_root.desktop amarok_append.desktop d3lphin_su.desktop media_unmount.desktop ark_extract_subdir.desktop installfont.desktop text-c++-print.desktop text-pas-print.desktop text-xml-print.desktop text-xslt-print.desktop k3b_dvd_copy.desktop text-makefile-print.desktop amarok_play_audiocd.desktop k3b_create_video_cd.desktop media_realfolder.desktop text-css-print.desktop text-ada-print.desktop Makefile.in smb2rdc.desktop k3b_handle_empty_dvd.desktop text-tex-print.desktop media_eject.desktop text-tcl-print.desktop text-log-print.desktop konqgwenview.desktop text-ch-print.desktop open_in_digikam.desktop konsolehere.desktop text-print.desktop media_mount.desktop text-html-print.desktop Makefile.am text-java-print.desktop +KDE_DIST=isoservice.desktop k3b_write_iso_image.desktop mail_as_attachment.desktop k3b_cd_copy.desktop floppy_format.desktop text-perl-print.desktop imageconverter.desktop edit_as_root.desktop amarok_append.desktop d3lphin_su.desktop text-diff-print.desktop media_unmount.desktop installfont.desktop ark_extract_subdir.desktop text-c++-print.desktop text-pas-print.desktop compress.desktop text-xml-print.desktop amarok_addaspodcast.desktop text-xslt-print.desktop run_as_root.desktop k3b_dvd_copy.desktop text-makefile-print.desktop text-python-print.desktop amarok_play_audiocd.desktop Makefile.am.new kdesktopSetAsBackground.desktop k3b_create_video_cd.desktop text-c++h-print.desktop k3b_handle_empty_cd.desktop ark_extract.desktop media_realfolder.desktop text-css-print.desktop k3b_audiocd_rip.desktop text-ada-print.desktop k3b_create_audio_cd.desktop Makefile.in k3b_videodvd_rip.desktop k3b_write_bin_image.desktop k3b_handle_empty_dvd.desktop text-tex-print.desktop smb2rdc.desktop media_safelyremove.desktop encryptfolder.desktop media_eject.desktop text-tcl-print.desktop encryptfile.desktop text-ch-print.desktop konqgwenview.desktop text-log-print.desktop open_in_digikam.desktop konsolehere.desktop ark_compress.desktop text-print.desktop media_mount.desktop text-html-print.desktop jpegorient.desktop Makefile.am text-java-print.desktop #>+ 2 docs-am: @@ -541,9 +541,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/servicemenus/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/servicemenus/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/servicemenus/Makefile + $(AUTOMAKE) --foreign src/servicemenus/Makefile cd $(top_srcdir) && perl admin/am_edit src/servicemenus/Makefile.in --- dolphin-0.9.2.orig/src/servicemenus/Makefile.am.new +++ dolphin-0.9.2/src/servicemenus/Makefile.am.new @@ -0,0 +1,18 @@ +servicemenusdir = $(kde_datadir)/d3lphin/servicemenus +servicemenus_DATA = compress.desktop amarok_addaspodcast.desktop amarok_append.desktop \ + amarok_play_audiocd.desktop ark_compress.desktop ark_extract.desktop ark_extract_subdir.desktop \ + d3lphin_su.desktop edit_as_root.desktop encryptfile.desktop encryptfolder.desktop \ + floppy_format.desktop imageconverter.desktop installfont.desktop jpegorient.desktop \ + k3b_audiocd_rip.desktop k3b_cd_copy.desktop k3b_create_audio_cd.desktop \ + k3b_create_video_cd.desktop k3b_dvd_copy.desktop k3b_handle_empty_cd.desktop \ + k3b_handle_empty_dvd.desktop k3b_videodvd_rip.desktop k3b_write_bin_image.desktop \ + k3b_write_iso_image.desktop kdesktopSetAsBackground.desktop konqgwenview.desktop \ + konsolehere.desktop mail_as_attachment.desktop media_eject.desktop media_mount.desktop \ + media_realfolder.desktop media_safelyremove.desktop media_unmount.desktop \ + open_in_digikam.desktop run_as_root.desktop smb2rdc.desktop text-ada-print.desktop \ + text-c++-print.desktop text-c++h-print.desktop text-ch-print.desktop text-css-print.desktop \ + text-diff-print.desktop text-html-print.desktop text-java-print.desktop text-log-print.desktop \ + text-makefile-print.desktop text-pas-print.desktop text-perl-print.desktop text-print.desktop \ + text-python-print.desktop text-tcl-print.desktop text-tex-print.desktop text-xml-print.desktop \ + text-xslt-print.desktop + --- dolphin-0.9.2.orig/src/servicemenus/compress.desktop +++ dolphin-0.9.2/src/servicemenus/compress.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +ServiceTypes=all/allfiles +Actions=CompressTarGz;CompressTarBz2 +X-KDE-Priority=TopLevel +X-KDE-Submenu=Compress + +[Desktop Action CompressTarGz] +Name=Gzipped Tar Archive +Icon=ark +Exec=ark --add-to %U Archive.tar.gz + +[Desktop Action CompressTarBz2] +Name=Bzip2-ed Tar Archive +Icon=ark +Exec=ark --add-to %U Archive.tar.bz2 + --- dolphin-0.9.2.orig/debian/rules +++ dolphin-0.9.2/debian/rules @@ -0,0 +1,9 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/kde.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +binary-install/dolphin:: + mkdir -p debian/dolphin/usr/bin + ln -s /usr/bin/d3lphin debian/dolphin/usr/bin/dolphin --- dolphin-0.9.2.orig/debian/patches/kubuntu_02_change_name_to_dolphin.patch +++ dolphin-0.9.2/debian/patches/kubuntu_02_change_name_to_dolphin.patch @@ -0,0 +1,57 @@ +diff -Nur d3lphin-0.9.2/src/main.cpp d3lphin-0.9.2.new/src/main.cpp +--- d3lphin-0.9.2/src/main.cpp 2007-07-01 00:09:28.000000000 +0200 ++++ d3lphin-0.9.2.new/src/main.cpp 2007-07-04 17:27:43.000000000 +0200 +@@ -35,8 +35,8 @@ + + int main(int argc, char **argv) + { +- KAboutData about("d3lphin", +- I18N_NOOP("D3lphin"), ++ KAboutData about("d3lphin", ++ I18N_NOOP("Dolphin"), + "0.9.2", + I18N_NOOP("File Manager") + I18N_NOOP(", D3lphin Branch"), + KAboutData::License_GPL, +--- d3lphin/src/d3lphin.desktop 2007-08-31 12:12:32.000000000 +0100 ++++ d3lphin/src/d3lphin.desktop 2007-08-31 12:29:52.000000000 +0100 +@@ -1,11 +1,37 @@ + [Desktop Entry] + Encoding=UTF-8 +-Name=D3lphin +-Exec=d3lphin %i %m -caption "%c" ++Name=Dolphin ++Name[pa]=ਡਾਲਫਿਨ ++Name[sr]=Делфин ++Name[sr@latin]=Делфин ++Name[uk]=Дельфін ++Exec=d3lphin %i %m -caption "%c" %u + Icon=d3lphin + Type=Application + DocPath=d3lphin/d3lphin.html + Categories=System;FileManager; + GenericName=File Manager +-GenericName[de]=Datei Manager ++GenericName[be]=Кіраўнік файлаў ++GenericName[bg]=Файлов браузър ++GenericName[csb]=Menadżer lopków ++GenericName[de]=Dateimanager ++GenericName[el]=Διαχειριστής αρχείων ++GenericName[es]=Gestor de ficheros ++GenericName[fa]=مدیر پرونده ++GenericName[ga]=Bainisteoir Comhad ++GenericName[ja]=ファイルマネージャ ++GenericName[nds]=Dateipleger ++GenericName[nl]=Bestandsbeheerder ++GenericName[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ++GenericName[pt]=Gestor de Ficheiros ++GenericName[pt_BR]=Gerenciador de Arquivos ++GenericName[sr]=Менаџер фајлова ++GenericName[sr@latin]=Менаџер фајлова ++GenericName[sv]=Filhanterare ++GenericName[th]=เครื่องมือจัดการแฟ้ม ++GenericName[uk]=Менеджер файлів ++GenericName[x-test]=xxFile Managerxx ++GenericName[zh_TW]=檔案管理程式 + Terminal=false ++MimeType=inode/directory; ++ --- dolphin-0.9.2.orig/debian/patches/kubuntu_05_trash_contextmenu.diff +++ dolphin-0.9.2/debian/patches/kubuntu_05_trash_contextmenu.diff @@ -0,0 +1,99 @@ +diff -ruN dolphin-0.9.1/src/dolphincontextmenu.cpp dolphin/src/dolphincontextmenu.cpp +--- dolphin-0.9.1/src/dolphincontextmenu.cpp 2007-07-01 06:09:27.000000000 +0800 ++++ dolphin/src/dolphincontextmenu.cpp 2007-09-05 17:40:38.000000000 +0800 +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include "dolphin.h" + #include "dolphinview.h" +@@ -118,7 +119,15 @@ + // + //createNewMenu->insertItem(i18n("Link to Device"), linkToDeviceMenu); + +- popup->insertItem(SmallIcon("filenew"), i18n("Create New"), createNewMenu); ++ const KURL& url = dolphin.activeView()->url(); ++ if (url.protocol() == "trash") ++ { ++ popup->insertItem(i18n("Empty Deleted Items Folder"), emptyID); ++ } ++ else ++ { ++ popup->insertItem(SmallIcon("filenew"), i18n("Create New"), createNewMenu); ++ } + popup->insertSeparator(); + + KAction* pasteAction = dolphin.actionCollection()->action(KStdAction::stdName(KStdAction::Paste)); +@@ -145,7 +154,10 @@ + popup->insertItem(i18n("Properties..."), propertiesID); + + int id = popup->exec(m_pos); +- if (id == propertiesID) { ++ if (id == emptyID) { ++ KonqOperations::emptyTrash(); ++ } ++ else if (id == propertiesID) { + new KPropertiesDialog(dolphin.activeView()->url()); + } + else if (id == bookmarkID) { +@@ -178,6 +190,12 @@ + Dolphin& dolphin = Dolphin::mainWin(); + const KURL::List urls = m_dolphinView->selectedURLs(); + ++ const KURL& url = dolphin.activeView()->url(); ++ if (url.protocol() == "trash") ++ { ++ popup->insertItem(i18n("&Restore"), restoreID); ++ } ++ + // insert 'Cut', 'Copy' and 'Paste' + const KStdAction::StdAction actionNames[] = { KStdAction::Cut, KStdAction::Copy, KStdAction::Paste }; + const int count = sizeof(actionNames) / sizeof(KStdAction::StdAction); +@@ -194,7 +212,6 @@ + renameAction->plug(popup); + + // insert 'Move to Trash' for local URLs, otherwise insert 'Delete' +- const KURL& url = dolphin.activeView()->url(); + if (url.isLocalFile()) { + KAction* moveToTrashAction = dolphin.actionCollection()->action("move_to_trash"); + moveToTrashAction->plug(popup); +@@ -227,8 +244,11 @@ + propertiesAction->plug(popup); + + int id = popup->exec(m_pos); +- +- if (id == bookmarkID) { ++ ++ if (id == restoreID ) { ++ KonqOperations::restoreTrashedItems(urls); ++ } ++ else if (id == bookmarkID) { + const KURL selectedURL(m_fileInfo->url()); + KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"), + selectedURL.filename(), +diff -ruN dolphin-0.9.1/src/dolphincontextmenu.h dolphin/src/dolphincontextmenu.h +--- dolphin-0.9.1/src/dolphincontextmenu.h 2007-07-01 06:09:28.000000000 +0800 ++++ dolphin/src/dolphincontextmenu.h 2007-09-05 17:35:23.000000000 +0800 +@@ -105,6 +105,8 @@ + const QString& entryName) const; + + enum { ++ restoreID = 80, ++ emptyID = 85, + submenuID = 90, + bookmarkID = 91, + openWithIDStart = 100, +diff -ruN dolphin-0.9.1/src/Makefile.am dolphin/src/Makefile.am +--- dolphin-0.9.1/src/Makefile.am 2007-07-01 06:09:28.000000000 +0800 ++++ dolphin/src/Makefile.am 2007-09-05 17:23:10.000000000 +0800 +@@ -13,7 +13,7 @@ + d3lphin_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + # the libraries to link against. +-d3lphin_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) ++d3lphin_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) -lkonq + + # which sources should be compiled for d3lphin + d3lphin_SOURCES = bookmarkselector.cpp bookmarkssettingspage.cpp \ --- dolphin-0.9.2.orig/debian/patches/kubuntu_06_edit_category.diff +++ dolphin-0.9.2/debian/patches/kubuntu_06_edit_category.diff @@ -0,0 +1,12 @@ +diff -Nur dolphin-0.9.2/src/d3lphin.desktop dolphin-0.9.2.new/src/d3lphin.desktop +--- dolphin-0.9.2/src/d3lphin.desktop 2007-10-10 17:59:02.000000000 +0300 ++++ dolphin-0.9.2.new/src/d3lphin.desktop 2007-10-10 17:59:29.000000000 +0300 +@@ -9,7 +9,7 @@ + Icon=d3lphin + Type=Application + DocPath=d3lphin/d3lphin.html +-Categories=System;FileManager; ++Categories=Qt;KDE;System;FileManager; + GenericName=File Manager + GenericName[be]=Кіраўнік файлаў + GenericName[bg]=Файлов браузър --- dolphin-0.9.2.orig/debian/patches/kubuntu_07_ark_contextmenu.diff +++ dolphin-0.9.2/debian/patches/kubuntu_07_ark_contextmenu.diff @@ -0,0 +1,61 @@ +diff -Nur dolphin-0.9.2/src/servicemenus/ark_compress.desktop dolphin/src/servicemenus/ark_compress.desktop +--- dolphin-0.9.2/src/servicemenus/ark_compress.desktop 2007-07-24 13:11:22.000000000 -0500 ++++ dolphin/src/servicemenus/ark_compress.desktop 2007-12-01 06:21:05.000000000 -0600 +@@ -1,12 +1,21 @@ + [Desktop Entry] +-X-SuSE-translate=true +-Encoding=UTF-8 + ServiceTypes=inode/directory +-Actions=compressHere ++Actions=CompressZip;CompressTarGz;CompressTarBz2 ++X-KDE-Priority=TopLevel ++X-KDE-Submenu=Compress + +-[Desktop Action compressHere] +-Name=Compress Here +-Name[de]=Hierher komprimieren +-Name[ru]=Сжать эту папку ++[Desktop Action CompressZip] ++Name=Zip Archive ++Icon=ark ++Exec=ark --add-to %u %u.zip ++ ++[Desktop Action CompressTarGz] ++Name=Gzipped Tar Archive ++Icon=ark + Exec=ark --add-to %u %u.tar.gz ++ ++[Desktop Action CompressTarBz2] ++Name=Bzip2 Tar Archive + Icon=ark ++Exec=ark --add-to %u %u.tar.bz2 ++ +diff -Nur dolphin-0.9.2/src/servicemenus/compress.desktop dolphin/src/servicemenus/compress.desktop +--- dolphin-0.9.2/src/servicemenus/compress.desktop 2007-12-01 06:18:07.000000000 -0600 ++++ dolphin/src/servicemenus/compress.desktop 2007-12-01 06:21:09.000000000 -0600 +@@ -1,16 +1,21 @@ + [Desktop Entry] + ServiceTypes=all/allfiles +-Actions=CompressTarGz;CompressTarBz2 ++Actions=CompressZip;CompressTarGz;CompressTarBz2 + X-KDE-Priority=TopLevel + X-KDE-Submenu=Compress + ++[Desktop Action CompressZip] ++Name=Zip Archive ++Icon=ark ++Exec=ark --add-to %u %u.zip ++ + [Desktop Action CompressTarGz] + Name=Gzipped Tar Archive + Icon=ark +-Exec=ark --add-to %U Archive.tar.gz ++Exec=ark --add-to %u %u.tar.gz + + [Desktop Action CompressTarBz2] +-Name=Bzip2-ed Tar Archive ++Name=Bzip2 Tar Archive + Icon=ark +-Exec=ark --add-to %U Archive.tar.bz2 ++Exec=ark --add-to %u %u.tar.bz2 + --- dolphin-0.9.2.orig/debian/patches/kubuntu_04_add_system_bookmark.diff +++ dolphin-0.9.2/debian/patches/kubuntu_04_add_system_bookmark.diff @@ -0,0 +1,15 @@ +diff -Nur d3lphin-0.9.2/src/dolphin.cpp d3lphin-0.9.2.new/src/dolphin.cpp +--- dolphin.cpp 2007-08-31 13:22:39.000000000 +0100 ++++ dolphin-0.9.2/src/dolphin.cpp 2007-08-31 13:29:45.000000000 +0100 +@@ -1104,8 +1104,10 @@ + KBookmarkGroup root = manager->root(); + if (root.first().isNull()) { + root.addBookmark(manager, i18n("Home"), settings.homeURL(), "folder_home"); +- root.addBookmark(manager, i18n("Storage Media"), KURL("media:/"), "blockdevice"); ++ root.addBookmark(manager, i18n("System"), KURL("system:/"), "system"); ++ root.addBookmark(manager, i18n("Storage Media"), KURL("system:/media"), "blockdevice"); + root.addBookmark(manager, i18n("Network"), KURL("remote:/"), "network_local"); ++ root.addBookmark(manager, i18n("Users' Folders"), KURL("system:/users"), "folder_home2"); + root.addBookmark(manager, i18n("Root"), KURL("/"), "folder_red"); + root.addBookmark(manager, i18n("Trash"), KURL("trash:/"), "trashcan_full"); + } --- dolphin-0.9.2.orig/debian/patches/kubuntu_03_enable_compress.diff +++ dolphin-0.9.2/debian/patches/kubuntu_03_enable_compress.diff @@ -0,0 +1,9 @@ +--- dolphin-0.9.2/src/servicemenus/Makefile.am 2007-09-06 00:17:30.000000000 +0200 ++++ dolphin-0.9.2/src/servicemenus/Makefile.am.new 2007-09-06 00:10:29.000000000 +0200 +@@ -1,5 +1,5 @@ + servicemenusdir = $(kde_datadir)/d3lphin/servicemenus +-servicemenus_DATA = amarok_addaspodcast.desktop amarok_append.desktop \ ++servicemenus_DATA = compress.desktop amarok_addaspodcast.desktop amarok_append.desktop \ + amarok_play_audiocd.desktop ark_compress.desktop ark_extract.desktop ark_extract_subdir.desktop \ + d3lphin_su.desktop edit_as_root.desktop encryptfile.desktop encryptfolder.desktop \ + floppy_format.desktop imageconverter.desktop installfont.desktop jpegorient.desktop \ --- dolphin-0.9.2.orig/debian/patches/kubuntu_00_automake10.diff +++ dolphin-0.9.2/debian/patches/kubuntu_00_automake10.diff @@ -0,0 +1,11 @@ +--- a/admin/cvs.sh 2007-09-05 16:23:06.000000000 +0100 ++++ b/admin/cvs.sh 2007-09-05 16:24:29.000000000 +0100 +@@ -68,7 +68,7 @@ + echo "*** KDE requires automake $required_automake_version" + exit 1 + ;; +- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) ++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*| automake*1.10*) + echo "*** $AUTOMAKE_STRING found." + UNSERMAKE=no + ;; --- dolphin-0.9.2.orig/debian/patches/kubuntu_01_kdepot.patch +++ dolphin-0.9.2/debian/patches/kubuntu_01_kdepot.patch @@ -0,0 +1,12 @@ +diff -Nur d3lphin-0.9.2/admin/cvs.sh d3lphin-0.9.2.new/admin/cvs.sh +--- d3lphin-0.9.2/admin/cvs.sh 2007-07-01 00:09:27.000000000 +0200 ++++ d3lphin-0.9.2.new/admin/cvs.sh 2007-07-04 17:26:01.000000000 +0200 +@@ -562,7 +562,7 @@ + fi + perl -e '$mes=0; while () { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile + +- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++ kdepotpath=/usr/include/kde/kde.pot + + $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ + XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages --- dolphin-0.9.2.orig/debian/copyright +++ dolphin-0.9.2/debian/copyright @@ -0,0 +1,485 @@ +This package was debianized by Varun Hiremath on +Sun, 27 Aug 2006 20:23:52 +0530. + +It was downloaded from http://enzosworld.gmxhome.de/download.html + +Upstream Authors: + +Peter Penz , +Stefan Monov , +Cvetoslav Ludmiloff + +Parts of the code is based on work by: + +Aaron J. Seigo , +Gregor Kalinik , +Carsten Pfeiffer , +Torben Weis , +David Faure , +Holger Freyther , +Christoph Cullmann , +Joseph Wenninger , +Anders Lund , +Janos Farkas , +Stephan Kulow , +Patrice Tremblay + +Copyright: + +(C) 2006 Peter Penz , +(C) 2006 Stefan Monov , +(C) 2006 Cvetoslav Ludmiloff , +(C) 2006 Aaron J. Seigo , +(C) 2006 Gregor Kalinik , +(C) 2002 Carsten Pfeiffer , +(C) 1998,1999 Torben Weis , +(C) 1998-2000 David Faure , +(C) 2001 Holger Freyther , +(C) 2001 Christoph Cullmann , +(C) 2001 Joseph Wenninger , +(C) 2001 Anders Lund , +(C) 1997 Janos Farkas , +(C) 1997-1999 Stephan Kulow , +(C) 2006 Patrice Tremblay + +License: + +Dolphin's main program is licensed under the GPL: + + 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. + +On Debian systems, you can find the GPL license in: +/usr/share/common-licenses/GPL + +------ + +The Dolphin Handbook included in this package is licensed +under the terms of the GNU Free Documentation License: + +Documentation copyright: + +(c) 2005 Peter Penz +(c) 2006 Orville Bennett +(c) 2006 Michael Austin + +License: + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.1 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. + + A copy of the GNU Free Documentation License (Version 1.2) is + included below: + + + GNU Free Documentation License + Version 1.2, November 2002 + + + Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + 0. PREAMBLE + + The purpose of this License is to make a manual, textbook, or other + functional and useful document "free" in the sense of freedom: to + assure everyone the effective freedom to copy and redistribute it, + with or without modifying it, either commercially or noncommercially. + Secondarily, this License preserves for the author and publisher a way + to get credit for their work, while not being considered responsible + for modifications made by others. + + This License is a kind of "copyleft", which means that derivative + works of the document must themselves be free in the same sense. It + complements the GNU General Public License, which is a copyleft + license designed for free software. + + We have designed this License in order to use it for manuals for free + software, because free software needs free documentation: a free + program should come with manuals providing the same freedoms that the + software does. But this License is not limited to software manuals; + it can be used for any textual work, regardless of subject matter or + whether it is published as a printed book. We recommend this License + principally for works whose purpose is instruction or reference. + + + 1. APPLICABILITY AND DEFINITIONS + + This License applies to any manual or other work, in any medium, that + contains a notice placed by the copyright holder saying it can be + distributed under the terms of this License. Such a notice grants a + world-wide, royalty-free license, unlimited in duration, to use that + work under the conditions stated herein. The "Document", below, + refers to any such manual or work. Any member of the public is a + licensee, and is addressed as "you". You accept the license if you + copy, modify or distribute the work in a way requiring permission + under copyright law. + + A "Modified Version" of the Document means any work containing the + Document or a portion of it, either copied verbatim, or with + modifications and/or translated into another language. + + A "Secondary Section" is a named appendix or a front-matter section of + the Document that deals exclusively with the relationship of the + publishers or authors of the Document to the Document's overall subject + (or to related matters) and contains nothing that could fall directly + within that overall subject. (Thus, if the Document is in part a + textbook of mathematics, a Secondary Section may not explain any + mathematics.) The relationship could be a matter of historical + connection with the subject or with related matters, or of legal, + commercial, philosophical, ethical or political position regarding + them. + + The "Invariant Sections" are certain Secondary Sections whose titles + are designated, as being those of Invariant Sections, in the notice + that says that the Document is released under this License. If a + section does not fit the above definition of Secondary then it is not + allowed to be designated as Invariant. The Document may contain zero + Invariant Sections. If the Document does not identify any Invariant + Sections then there are none. + + The "Cover Texts" are certain short passages of text that are listed, + as Front-Cover Texts or Back-Cover Texts, in the notice that says that + the Document is released under this License. A Front-Cover Text may + be at most 5 words, and a Back-Cover Text may be at most 25 words. + + A "Transparent" copy of the Document means a machine-readable copy, + represented in a format whose specification is available to the + general public, that is suitable for revising the document + straightforwardly with generic text editors or (for images composed of + pixels) generic paint programs or (for drawings) some widely available + drawing editor, and that is suitable for input to text formatters or + for automatic translation to a variety of formats suitable for input + to text formatters. A copy made in an otherwise Transparent file + format whose markup, or absence of markup, has been arranged to thwart + or discourage subsequent modification by readers is not Transparent. + An image format is not Transparent if used for any substantial amount + of text. A copy that is not "Transparent" is called "Opaque". + + Examples of suitable formats for Transparent copies include plain + ASCII without markup, Texinfo input format, LaTeX input format, SGML + or XML using a publicly available DTD, and standard-conforming simple + HTML, PostScript or PDF designed for human modification. Examples of + transparent image formats include PNG, XCF and JPG. Opaque formats + include proprietary formats that can be read and edited only by + proprietary word processors, SGML or XML for which the DTD and/or + processing tools are not generally available, and the + machine-generated HTML, PostScript or PDF produced by some word + processors for output purposes only. + + The "Title Page" means, for a printed book, the title page itself, + plus such following pages as are needed to hold, legibly, the material + this License requires to appear in the title page. For works in + formats which do not have any title page as such, "Title Page" means + the text near the most prominent appearance of the work's title, + preceding the beginning of the body of the text. + + A section "Entitled XYZ" means a named subunit of the Document whose + title either is precisely XYZ or contains XYZ in parentheses following + text that translates XYZ in another language. (Here XYZ stands for a + specific section name mentioned below, such as "Acknowledgements", + "Dedications", "Endorsements", or "History".) To "Preserve the Title" + of such a section when you modify the Document means that it remains a + section "Entitled XYZ" according to this definition. + + The Document may include Warranty Disclaimers next to the notice which + states that this License applies to the Document. These Warranty + Disclaimers are considered to be included by reference in this + License, but only as regards disclaiming warranties: any other + implication that these Warranty Disclaimers may have is void and has + no effect on the meaning of this License. + + + 2. VERBATIM COPYING + + You may copy and distribute the Document in any medium, either + commercially or noncommercially, provided that this License, the + copyright notices, and the license notice saying this License applies + to the Document are reproduced in all copies, and that you add no other + conditions whatsoever to those of this License. You may not use + technical measures to obstruct or control the reading or further + copying of the copies you make or distribute. However, you may accept + compensation in exchange for copies. If you distribute a large enough + number of copies you must also follow the conditions in section 3. + + You may also lend copies, under the same conditions stated above, and + you may publicly display copies. + + + 3. COPYING IN QUANTITY + + If you publish printed copies (or copies in media that commonly have + printed covers) of the Document, numbering more than 100, and the + Document's license notice requires Cover Texts, you must enclose the + copies in covers that carry, clearly and legibly, all these Cover + Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on + the back cover. Both covers must also clearly and legibly identify + you as the publisher of these copies. The front cover must present + the full title with all words of the title equally prominent and + visible. You may add other material on the covers in addition. + Copying with changes limited to the covers, as long as they preserve + the title of the Document and satisfy these conditions, can be treated + as verbatim copying in other respects. + + If the required texts for either cover are too voluminous to fit + legibly, you should put the first ones listed (as many as fit + reasonably) on the actual cover, and continue the rest onto adjacent + pages. + + If you publish or distribute Opaque copies of the Document numbering + more than 100, you must either include a machine-readable Transparent + copy along with each Opaque copy, or state in or with each Opaque copy + a computer-network location from which the general network-using + public has access to download using public-standard network protocols + a complete Transparent copy of the Document, free of added material. + If you use the latter option, you must take reasonably prudent steps, + when you begin distribution of Opaque copies in quantity, to ensure + that this Transparent copy will remain thus accessible at the stated + location until at least one year after the last time you distribute an + Opaque copy (directly or through your agents or retailers) of that + edition to the public. + + It is requested, but not required, that you contact the authors of the + Document well before redistributing any large number of copies, to give + them a chance to provide you with an updated version of the Document. + + + 4. MODIFICATIONS + + You may copy and distribute a Modified Version of the Document under + the conditions of sections 2 and 3 above, provided that you release + the Modified Version under precisely this License, with the Modified + Version filling the role of the Document, thus licensing distribution + and modification of the Modified Version to whoever possesses a copy + of it. In addition, you must do these things in the Modified Version: + + A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission. + B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has fewer than five), + unless they release you from this requirement. + C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. + D. Preserve all the copyright notices of the Document. + E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. + F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below. + G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice. + H. Include an unaltered copy of this License. + I. Preserve the section Entitled "History", Preserve its Title, and add + to it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section Entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence. + J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission. + K. For any section Entitled "Acknowledgements" or "Dedications", + Preserve the Title of the section, and preserve in the section all + the substance and tone of each of the contributor acknowledgements + and/or dedications given therein. + L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles. + M. Delete any section Entitled "Endorsements". Such a section + may not be included in the Modified Version. + N. Do not retitle any existing section to be Entitled "Endorsements" + or to conflict in title with any Invariant Section. + O. Preserve any Warranty Disclaimers. + + If the Modified Version includes new front-matter sections or + appendices that qualify as Secondary Sections and contain no material + copied from the Document, you may at your option designate some or all + of these sections as invariant. To do this, add their titles to the + list of Invariant Sections in the Modified Version's license notice. + These titles must be distinct from any other section titles. + + You may add a section Entitled "Endorsements", provided it contains + nothing but endorsements of your Modified Version by various + parties--for example, statements of peer review or that the text has + been approved by an organization as the authoritative definition of a + standard. + + You may add a passage of up to five words as a Front-Cover Text, and a + passage of up to 25 words as a Back-Cover Text, to the end of the list + of Cover Texts in the Modified Version. Only one passage of + Front-Cover Text and one of Back-Cover Text may be added by (or + through arrangements made by) any one entity. If the Document already + includes a cover text for the same cover, previously added by you or + by arrangement made by the same entity you are acting on behalf of, + you may not add another; but you may replace the old one, on explicit + permission from the previous publisher that added the old one. + + The author(s) and publisher(s) of the Document do not by this License + give permission to use their names for publicity for or to assert or + imply endorsement of any Modified Version. + + + 5. COMBINING DOCUMENTS + + You may combine the Document with other documents released under this + License, under the terms defined in section 4 above for modified + versions, provided that you include in the combination all of the + Invariant Sections of all of the original documents, unmodified, and + list them all as Invariant Sections of your combined work in its + license notice, and that you preserve all their Warranty Disclaimers. + + The combined work need only contain one copy of this License, and + multiple identical Invariant Sections may be replaced with a single + copy. If there are multiple Invariant Sections with the same name but + different contents, make the title of each such section unique by + adding at the end of it, in parentheses, the name of the original + author or publisher of that section if known, or else a unique number. + Make the same adjustment to the section titles in the list of + Invariant Sections in the license notice of the combined work. + + In the combination, you must combine any sections Entitled "History" + in the various original documents, forming one section Entitled + "History"; likewise combine any sections Entitled "Acknowledgements", + and any sections Entitled "Dedications". You must delete all sections + Entitled "Endorsements". + + + 6. COLLECTIONS OF DOCUMENTS + + You may make a collection consisting of the Document and other documents + released under this License, and replace the individual copies of this + License in the various documents with a single copy that is included in + the collection, provided that you follow the rules of this License for + verbatim copying of each of the documents in all other respects. + + You may extract a single document from such a collection, and distribute + it individually under this License, provided you insert a copy of this + License into the extracted document, and follow this License in all + other respects regarding verbatim copying of that document. + + + 7. AGGREGATION WITH INDEPENDENT WORKS + + A compilation of the Document or its derivatives with other separate + and independent documents or works, in or on a volume of a storage or + distribution medium, is called an "aggregate" if the copyright + resulting from the compilation is not used to limit the legal rights + of the compilation's users beyond what the individual works permit. + When the Document is included in an aggregate, this License does not + apply to the other works in the aggregate which are not themselves + derivative works of the Document. + + If the Cover Text requirement of section 3 is applicable to these + copies of the Document, then if the Document is less than one half of + the entire aggregate, the Document's Cover Texts may be placed on + covers that bracket the Document within the aggregate, or the + electronic equivalent of covers if the Document is in electronic form. + Otherwise they must appear on printed covers that bracket the whole + aggregate. + + + 8. TRANSLATION + + Translation is considered a kind of modification, so you may + distribute translations of the Document under the terms of section 4. + Replacing Invariant Sections with translations requires special + permission from their copyright holders, but you may include + translations of some or all Invariant Sections in addition to the + original versions of these Invariant Sections. You may include a + translation of this License, and all the license notices in the + Document, and any Warranty Disclaimers, provided that you also include + the original English version of this License and the original versions + of those notices and disclaimers. In case of a disagreement between + the translation and the original version of this License or a notice + or disclaimer, the original version will prevail. + + If a section in the Document is Entitled "Acknowledgements", + "Dedications", or "History", the requirement (section 4) to Preserve + its Title (section 1) will typically require changing the actual + title. + + + 9. TERMINATION + + You may not copy, modify, sublicense, or distribute the Document except + as expressly provided for under this License. Any other attempt to + copy, modify, sublicense or distribute the Document is void, and will + automatically terminate your rights under this License. However, + parties who have received copies, or rights, from you under this + License will not have their licenses terminated so long as such + parties remain in full compliance. + + + 10. FUTURE REVISIONS OF THIS LICENSE + + The Free Software Foundation may publish new, revised versions + of the GNU Free Documentation License from time to time. Such new + versions will be similar in spirit to the present version, but may + differ in detail to address new problems or concerns. See + http://www.gnu.org/copyleft/. + + Each version of the License is given a distinguishing version number. + If the Document specifies that a particular numbered version of this + License "or any later version" applies to it, you have the option of + following the terms and conditions either of that specified version or + of any later version that has been published (not as a draft) by the + Free Software Foundation. If the Document does not specify a version + number of this License, you may choose any version ever published (not + as a draft) by the Free Software Foundation. + + + ADDENDUM: How to use this License for your documents + + To use this License in a document you have written, include a copy of + the License in the document and put the following copyright and + license notices just after the title page: + + Copyright (c) YEAR YOUR NAME. + 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, no Front-Cover Texts, and no Back-Cover + Texts. A copy of the license is included in the section entitled + "GNU Free Documentation License". + + If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, + replace the "with...Texts." line with this: + + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + + If you have Invariant Sections without Cover Texts, or some other + combination of the three, merge those two alternatives to suit the + situation. + + If your document contains nontrivial examples of program code, we + recommend releasing these examples in parallel under your choice of + free software license, such as the GNU General Public License, + to permit their use in free software. + +The Debian packaging is (C) 2006, Varun Hiremath and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- dolphin-0.9.2.orig/debian/manpages +++ dolphin-0.9.2/debian/manpages @@ -0,0 +1 @@ +debian/dolphin.1 --- dolphin-0.9.2.orig/debian/compat +++ dolphin-0.9.2/debian/compat @@ -0,0 +1 @@ +5 --- dolphin-0.9.2.orig/debian/dolphin.1 +++ dolphin-0.9.2/debian/dolphin.1 @@ -0,0 +1,62 @@ +.TH dolphin 1 "December 7, 2006" +.SH NAME +dolphin \- File manager for KDE focusing on usability +.SH SYNOPSIS +.B dolphin +.RI [Qt-options] [KDE-options] [URL] +.SH DESCRIPTION + dolphin is not intended to be a competitor to Konqueror, the default KDE + file manager: Konqueror acts as universal viewer being able to show HTML + pages, text documents, directories and a lot more, whereas dolphin focuses + on being only a file manager. This approach allows to optimize the user + interface for the task of file management. +.PP +.SH FEATURES +.PP +* Navigation bar (breadcrumbs) +.PP +* View properties remembered for each folder +.PP +* Split views +.PP +* Network transparency +.PP +* Undo/redo functionality +.PP +* Renaming of a variable number of selected items in one step. +.PP +.SH OPTIONS +.SS +.SS Generic Options: +.TP +.B --help +Show help about options +.TP +.B --help-qt +Show Qt specific options +.TP +.B --help-kde +Show KDE specific options +.TP +.B --help-all +Show all options +.TP +.B --author +Show author information +.TP +.B -v, --version +Show version information +.TP +.B --license +Show license information +.SS +.SS Arguments: +.TP +.B URL +Document to open +.PP +.SH HOMEPAGE +Homepage: http://enzosworld.gmxhome.de/ +.SH AUTHOR +This manual page was written by Varun Hiremath , +for the Debian project (but may be used by others). --- dolphin-0.9.2.orig/debian/changelog +++ dolphin-0.9.2/debian/changelog @@ -0,0 +1,185 @@ +dolphin (0.9.2-0ubuntu3) hardy; urgency=low + + * added kubuntu_07_ark_contextmenu.diff + fixes file compression for files and folders + also adds .zip file support + + -- Brandon Holtsclaw Sat, 01 Dec 2007 06:23:46 -0600 + +dolphin (0.9.2-0ubuntu2) gutsy; urgency=low + + * debian/patches/kubuntu_06_edit_category.diff: fix Category, so it + doesn't show up on GNOME System Tools -menu. (LP: #151306) + + -- Timo Aaltonen Wed, 10 Oct 2007 17:59:46 +0300 + +dolphin (0.9.2-0ubuntu1) gutsy; urgency=low + + * New upstream version. + isoservice patch dropped, and compress.desktop servicemenu added. + + -- Stefan Skotte Wed, 05 Sep 2007 23:59:58 +0200 + +dolphin (0.9.1-0ubuntu6) gutsy; urgency=low + + [ Juan Carlos G. Torres ] + * Added kubuntu_05_trash_contextmenu.diff + - Allows items from Trash folder to be restored and for Trash folder to be emptied + + [ Jonathan Riddell ] + * Add kubuntu_00_automake10.diff for automake 1.10 support + + -- Juan Carlos G. Torres Wed, 05 Sep 2007 17:44:01 +0800 + +dolphin (0.9.1-0ubuntu5) gutsy; urgency=low + + * Add users' folders to kubuntu_04_add_system_bookmark.diff + + -- Jonathan Riddell Fri, 31 Aug 2007 13:33:19 +0100 + +dolphin (0.9.1-0ubuntu4) gutsy; urgency=low + + * Add more transations to kubuntu_02_change_name_to_dolphin.patch + and make it set the mimetype and open with URL (%u) for system + menu support + * Add kubuntu_04_add_system_bookmark.diff to add bookmarks for + system and system:/media, given these URLs nice icons + + -- Jonathan Riddell Fri, 31 Aug 2007 12:57:39 +0100 + +dolphin (0.9.1-0ubuntu3) gutsy; urgency=low + + * Disable broken isoservice servicemenu entry. + + -- Frode M. Døving Mon, 30 Jul 2007 19:49:11 +0200 + +dolphin (0.9.1-0ubuntu2) gutsy; urgency=low + + * Fix typo in file name of kubuntu_01_kdepot.patch + * Don't change internal name in kubuntu_02_change_name_to_dolphin.patch + + -- Jonathan Riddell Mon, 16 Jul 2007 13:16:21 +0100 + +dolphin (0.9.1-0ubuntu1) gutsy; urgency=low + + * New upstream release + + -- Anthony Mercatante Thu, 14 May 2007 11:00:13 +0000 + +dolphin (0.8.2-2ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + + Add kubuntu_02_clean_desktop_file.patch + - If set as default, Dolphin will not complain when opening + URLs like remote:/ trash:/ ... + - Dolphin supports inode/directory mimetype + - Add French GenericName + * debian/control: + - Added Ubuntu Maintainer, moved old one to XSBC-Original-Maintainer + + -- Stephan Hermann Fri, 25 May 2007 11:00:13 +0000 + +dolphin (0.8.2-2) unstable; urgency=low + + * debian/rules: remove /usr/share/locale/dolphin (Closes: #418644) + + -- Varun Hiremath Thu, 12 Apr 2007 22:22:11 +0530 + +dolphin (0.8.2-1) unstable; urgency=low + + * New upstream release + + -- Varun Hiremath Fri, 26 Jan 2007 22:41:23 +0530 + +dolphin (0.8.1-1) experimental; urgency=low + + * New upstream release + + -- Varun Hiremath Sun, 7 Jan 2007 23:15:34 +0530 + +dolphin (0.8.1-0ubuntu2) feisty; urgency=low + + * Add kubuntu_02_clean_desktop_file.patch + - If set as default, Dolphin will not complain when opening + URLs like remote:/ trash:/ ... + - Dolphin supports inode/directory mimetype + - Add French GenericName + + -- Anthony Mercatante Fri, 06 Apr 2007 14:15:32 +1100 + +dolphin (0.8.1-0ubuntu1) feisty; urgency=low + + * New Upstream Version + + -- Sarah Hobbs Thu, 11 Jan 2007 00:41:38 +1100 + +dolphin (0.8.0-1) experimental; urgency=low + + [ Varun Hiremath ] + * New upstream release + + [ Torsten Werner ] + * Upload to experimental + + -- Torsten Werner Thu, 28 Dec 2006 10:24:17 +0100 + +dolphin (0.7.0-2) unstable; urgency=low + + * debian/control: Improve the description. + * debian/copyright: Change the download from url. + * Improve the manpage debian/dolphin.1 + + -- Varun Hiremath Thu, 7 Dec 2006 01:56:18 +0530 + +dolphin (0.7.0-1) unstable; urgency=low + + * Initial upload (Closes: #373291) + * New upstream release + * Add debian/watch file + * Add Homepage to debian/control file + * Add XS-X-Vcs-Svn header in debian/control. + * debian/copyright: + + Include the full text of the GFDL, since the Dolphin handbook is + licensed under the terms of the GFDL. + + -- Varun Hiremath Fri, 3 Nov 2006 18:33:35 +0530 + +dolphin (0.7.0-0ubuntu2) feisty; urgency=low + + * Applied patch from Michael Biebl to remove duplicate desktop file + (Closes Ubuntu: #78647) + + -- Emmet Hikory Wed, 10 Jan 2007 21:54:50 +0900 + +dolphin (0.7.0-0ubuntu1) feisty; urgency=low + + * New upstream release + * Add kubuntu_01_kdepot.patch for pot file extraction to rosetta + + -- Anthony Mercatante Tue, 5 Dec 2006 01:08:13 +0100 + +dolphin (0.6.2-1) unstable; urgency=low + + * New upstream release + * remove doc/en/index.docbook from upstream tarball because of license issues + + -- Varun Hiremath Fri, 6 Oct 2006 01:50:59 +0530 + +dolphin (0.6.1-1) unstable; urgency=low + + * Initial release + + -- Varun Hiremath Sun, 27 Aug 2006 20:23:52 +0530 + +dolphin (0.6.0-0ubuntu1) edgy; urgency=low + + * New upstream release + + -- Robert Stoffers Mon, 24 Jul 2006 17:18:30 +1000 + +dolphin (0.5.2-0ubuntu1) edgy; urgency=low + + * Initial release + + -- Robert Stoffers Thu, 22 Jun 2006 06:31:46 +1000 + --- dolphin-0.9.2.orig/debian/control +++ dolphin-0.9.2/debian/control @@ -0,0 +1,33 @@ +Source: dolphin +Section: kde +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Anthony Mercatante +Build-Depends: debhelper (>= 5), cdbs, kdelibs4-dev, libkonq4-dev, autotools-dev, docbook2x, docbook-xml +Standards-Version: 3.7.2 + +Package: dolphin +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: amarok, ark, k3b, kmail, digikam +Suggests: kfloppy +Description: File manager for KDE focusing on usability + Dolphin is not intended to be a competitor to Konqueror, the default KDE + file manager: Konqueror acts as universal viewer being able to show HTML + pages, text documents, directories and a lot more, whereas Dolphin focuses + on being only a file manager. This approach allows to optimize the user + interface for the task of file management. + . + Features include: + Sidebar + Navigation bar (breadcrumbs) + View properties remembered for each folder + Split views + Network transparency + Undo/redo functionality + Renaming of a variable number of selected items in one step. + . + This is the D3lphin fork of Dolphin, intended to keep development of + the KDE 3 version of Dolphin active. + . + Homepage: https://marrat.homelinux.org/D3lphin --- dolphin-0.9.2.orig/admin/cvs.sh +++ dolphin-0.9.2/admin/cvs.sh @@ -68,7 +68,7 @@ echo "*** KDE requires automake $required_automake_version" exit 1 ;; - automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) + automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) echo "*** $AUTOMAKE_STRING found." UNSERMAKE=no ;; --- dolphin-0.9.2.orig/doc/Makefile.in +++ dolphin-0.9.2/doc/Makefile.in @@ -328,9 +328,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/Makefile +#>- $(AUTOMAKE) --foreign doc/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -340,9 +340,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile + $(AUTOMAKE) --foreign doc/Makefile cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -666,9 +666,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile + $(AUTOMAKE) --foreign doc/Makefile cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in --- dolphin-0.9.2.orig/doc/en/Makefile.in +++ dolphin-0.9.2/doc/en/Makefile.in @@ -302,9 +302,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/en/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/en/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/en/Makefile +#>- $(AUTOMAKE) --foreign doc/en/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -314,9 +314,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/en/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/en/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/en/Makefile + $(AUTOMAKE) --foreign doc/en/Makefile cd $(top_srcdir) && perl admin/am_edit doc/en/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -484,10 +484,10 @@ .NOEXPORT: #>+ 2 -KDE_DIST=configurationwindow.png browsebutton.png Makefile.in workspacebuttons.png systemmediadirectory.png toolbarbuttons.png informationsidebar.png configurationwindow2.png dolphin.png bookmarkbutton.png bookmarksidebar.png directorypath.png breadcrumb.png configurationwindow3.png index.docbook hiddenfolder.png Makefile.am split.png +KDE_DIST=configurationwindow.png browsebutton.png Makefile.in workspacebuttons.png systemmediadirectory.png informationsidebar.png toolbarbuttons.png configurationwindow2.png bookmarkbutton.png dolphin.png bookmarksidebar.png directorypath.png breadcrumb.png configurationwindow3.png index.docbook hiddenfolder.png Makefile.am split.png #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) split.png breadcrumb.png directorypath.png systemmediadirectory.png hiddenfolder.png configurationwindow3.png browsebutton.png bookmarkbutton.png configurationwindow.png informationsidebar.png configurationwindow2.png dolphin.png bookmarksidebar.png workspacebuttons.png toolbarbuttons.png index.docbook +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) bookmarksidebar.png directorypath.png toolbarbuttons.png split.png configurationwindow3.png dolphin.png configurationwindow2.png configurationwindow.png hiddenfolder.png informationsidebar.png browsebutton.png systemmediadirectory.png index.docbook workspacebuttons.png breadcrumb.png bookmarkbutton.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -514,20 +514,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/d3lphin - @for base in split.png breadcrumb.png directorypath.png systemmediadirectory.png hiddenfolder.png configurationwindow3.png browsebutton.png bookmarkbutton.png configurationwindow.png informationsidebar.png configurationwindow2.png dolphin.png bookmarksidebar.png workspacebuttons.png toolbarbuttons.png index.docbook ; do \ + @for base in bookmarksidebar.png directorypath.png toolbarbuttons.png split.png configurationwindow3.png dolphin.png configurationwindow2.png configurationwindow.png hiddenfolder.png informationsidebar.png browsebutton.png systemmediadirectory.png index.docbook workspacebuttons.png breadcrumb.png bookmarkbutton.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/d3lphin/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/d3lphin/$$base ;\ done uninstall-nls: - for base in split.png breadcrumb.png directorypath.png systemmediadirectory.png hiddenfolder.png configurationwindow3.png browsebutton.png bookmarkbutton.png configurationwindow.png informationsidebar.png configurationwindow2.png dolphin.png bookmarksidebar.png workspacebuttons.png toolbarbuttons.png index.docbook ; do \ + for base in bookmarksidebar.png directorypath.png toolbarbuttons.png split.png configurationwindow3.png dolphin.png configurationwindow2.png configurationwindow.png hiddenfolder.png informationsidebar.png browsebutton.png systemmediadirectory.png index.docbook workspacebuttons.png breadcrumb.png bookmarkbutton.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/d3lphin/$$base ;\ done #>+ 5 distdir-nls: - for file in split.png breadcrumb.png directorypath.png systemmediadirectory.png hiddenfolder.png configurationwindow3.png browsebutton.png bookmarkbutton.png configurationwindow.png informationsidebar.png configurationwindow2.png dolphin.png bookmarksidebar.png workspacebuttons.png toolbarbuttons.png index.docbook ; do \ + for file in bookmarksidebar.png directorypath.png toolbarbuttons.png split.png configurationwindow3.png dolphin.png configurationwindow2.png configurationwindow.png hiddenfolder.png informationsidebar.png browsebutton.png systemmediadirectory.png index.docbook workspacebuttons.png breadcrumb.png bookmarkbutton.png ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -541,9 +541,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/en/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/en/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/en/Makefile + $(AUTOMAKE) --foreign doc/en/Makefile cd $(top_srcdir) && perl admin/am_edit doc/en/Makefile.in