« back to all changes in this revision
Viewing changes to konqueror/settings/konqhtml/pluginopts.h
- Committer: Package Import Robot
- Date: 2012-05-25 17:26:17 UTC
- mfrom: (1.1.12)
- Revision ID: package-import@ubuntu.com-20120525172617-xr9bzhlugldbflvq
* Merge with debian git, remainging changes:
- keep breaks/replaces
- keep symbol files
- keep kubuntu patches
- dolphin suggests and not recommends ruby
- add kfind, konsole and kompare to dolphin suggests
* konq-plugins breaks/replaces kde-baseapps-data << 4:4.8.80
* Drop squence numbers from kubuntu patches
* New upstream beta release
- refresh kubuntu_fix_systemsettings_about_me.diff
- add new doc images to {konqueror,dolphin}.install
- keep breaks/replaces
- keep symbol files
- keep kubuntu patches
- dolphin suggests and not recommends ruby
- add kfind, konsole and kompare to dolphin suggests
* konq-plugins breaks/replaces kde-baseapps-data << 4:4.8.80
* Drop squence numbers from kubuntu patches
* New upstream beta release
- refresh kubuntu_fix_systemsettings_about_me.diff
- add new doc images to {konqueror,dolphin}.install
- files added:
- .pc/kubuntu_fix_systemsettings_about_me.diff
- .pc/kubuntu_fix_systemsettings_about_me.diff/kdepasswd
- .pc/kubuntu_fix_systemsettings_about_me.diff/kdepasswd/kcm
- .pc/kubuntu_folderview_livecd_directory.diff
- .pc/kubuntu_folderview_livecd_directory.diff/plasma
- .pc/kubuntu_folderview_livecd_directory.diff/plasma/applets
- .pc/kubuntu_folderview_livecd_directory.diff/plasma/applets/folderview
- .pc/kubuntu_folderwidget_drawing.diff
- .pc/kubuntu_folderwidget_drawing.diff/plasma
- .pc/kubuntu_folderwidget_drawing.diff/plasma/applets
- .pc/kubuntu_folderwidget_drawing.diff/plasma/applets/folderview
- .pc/kubuntu_install_flash.diff
- .pc/kubuntu_install_flash.diff/konqueror
- .pc/kubuntu_install_flash.diff/konqueror/src
- .pc/kubuntu_konq_scans_nsplugins_at_startup.diff
- .pc/kubuntu_konq_scans_nsplugins_at_startup.diff/konqueror
- .pc/kubuntu_konq_scans_nsplugins_at_startup.diff/konqueror/src
- dolphin/src/kitemviews/private
- dolphin/src/kitemviews/private/nepomuk
- files removed:
- .pc/kubuntu_10_konq_scans_nsplugins_at_startup.diff
- .pc/kubuntu_10_konq_scans_nsplugins_at_startup.diff/konqueror
- .pc/kubuntu_10_konq_scans_nsplugins_at_startup.diff/konqueror/src
- .pc/kubuntu_18_fix_systemsettings_about_me.diff
- .pc/kubuntu_18_fix_systemsettings_about_me.diff/kdepasswd
- .pc/kubuntu_18_fix_systemsettings_about_me.diff/kdepasswd/kcm
- .pc/kubuntu_19_install_flash.diff
- .pc/kubuntu_19_install_flash.diff/konqueror
- .pc/kubuntu_19_install_flash.diff/konqueror/src
- .pc/kubuntu_24_folderview_livecd_directory.diff
- .pc/kubuntu_24_folderview_livecd_directory.diff/plasma
- .pc/kubuntu_24_folderview_livecd_directory.diff/plasma/applets
- .pc/kubuntu_24_folderview_livecd_directory.diff/plasma/applets/folderview
- .pc/kubuntu_26_folderwidget_drawing.diff
- .pc/kubuntu_26_folderwidget_drawing.diff/plasma
- .pc/kubuntu_26_folderwidget_drawing.diff/plasma/applets
- .pc/kubuntu_26_folderwidget_drawing.diff/plasma/applets/folderview
- dolphin/src/panels/search
- files modified:
- .pc/applied-patches
- dolphin/src/dolphin.desktop *
- kdepasswd/kdepasswd.desktop *
- keditbookmarks/keditbookmarks.desktop *
- kfind/kfind.desktop *
- konqueror/Home.desktop *
- konqueror/kfmclient.desktop *
- konqueror/kfmclient_dir.desktop *
- konqueror/kfmclient_html.desktop *
- konqueror/kfmclient_war.desktop *
- konqueror/konqbrowser.desktop *
- konqueror/konquerorsu.desktop *
added
removed
konqueror/settings/konqhtml/pluginopts.h
