Merge lp://staging/~smartboyhw/ubuntu/raring/rekonq/2.2-0ubuntu1-1st-version into lp://staging/ubuntu/raring/rekonq
Proposed by
Howard Chan
| Status: | Merged |
|---|---|
| Merge reported by: | Philip Muškovac |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~smartboyhw/ubuntu/raring/rekonq/2.2-0ubuntu1-1st-version |
| Merge into: | lp://staging/ubuntu/raring/rekonq |
| Diff against target: |
52634 lines (+17694/-12527) 111 files modified
.pc/.quilt_patches (+0/-1) .pc/.quilt_series (+0/-1) .pc/.version (+0/-1) .pc/applied-patches (+0/-5) .pc/kubuntu_adblock.diff/src/data/adblockrc (+0/-187) .pc/kubuntu_default_homepages.diff/src/rekonq.kcfg (+0/-282) .pc/kubuntu_initial_preference.diff/src/data/rekonq.desktop (+0/-93) .pc/kubuntu_no_default_bookmarks.diff/src/data/defaultbookmarks.xbel (+0/-19) .pc/kubuntu_restricted_install.diff/src/application.cpp (+0/-870) CMakeLists.txt (+10/-10) INSTALL (+1/-1) config-nepomuk.h.cmake (+0/-1) debian/changelog (+9/-0) debian/control (+1/-2) debian/patches/kubuntu_default_homepages.diff (+3/-3) debian/patches/kubuntu_initial_preference.diff (+3/-3) debian/patches/kubuntu_no_default_bookmarks.diff (+2/-2) doc/en_US/index.docbook (+1/-1) doc/es/index.docbook (+1536/-148) doc/pt/index.docbook (+26/-26) po/CMakeLists.txt (+2/-1) po/cs/rekonq.po (+261/-213) po/da/rekonq.po (+260/-218) po/de/rekonq.po (+257/-222) po/el/rekonq.po (+259/-237) po/es/rekonq.po (+542/-532) po/et/rekonq.po (+260/-218) po/fi/rekonq.po (+525/-486) po/fr/rekonq.po (+264/-211) po/hu/rekonq.po (+541/-499) po/ia/rekonq.po (+275/-256) po/it/rekonq.po (+263/-221) po/km/rekonq.po (+259/-205) po/lt/CMakeLists.txt (+0/-2) po/lt/rekonq.po (+0/-2938) po/mr/CMakeLists.txt (+2/-0) po/mr/rekonq.po (+2702/-0) po/nb/rekonq.po (+432/-333) po/nl/rekonq.po (+253/-219) po/pl/rekonq.po (+260/-218) po/pt/rekonq.po (+255/-206) po/pt_BR/rekonq.po (+254/-206) po/sk/rekonq.po (+266/-235) po/sl/rekonq.po (+577/-543) po/sr/rekonq.po (+245/-195) po/sr@ijekavian/rekonq.po (+245/-195) po/sr@ijekavianlatin/rekonq.po (+245/-195) po/sr@latin/rekonq.po (+245/-195) po/sv/rekonq.po (+254/-206) po/tr/CMakeLists.txt (+2/-0) po/tr/rekonq.po (+3285/-0) po/uk/rekonq.po (+254/-206) po/zh_CN/rekonq.po (+459/-444) po/zh_TW/rekonq.po (+253/-221) src/CMakeLists.txt (+13/-9) src/adblock/adblockmanager.cpp (+63/-3) src/adblock/adblockmanager.h (+5/-1) src/adblock/adblockrule.cpp (+1/-1) src/adblock/adblockrulefallbackimpl.cpp (+56/-29) src/adblock/adblockrulefallbackimpl.h (+2/-0) src/adblock/adblockruletextmatchimpl.cpp (+4/-0) src/adblock/adblockruletextmatchimpl.h (+1/-0) src/application.cpp (+6/-14) src/bookmarks/bookmarkmanager.cpp (+18/-2) src/bookmarks/bookmarkmanager.h (+3/-1) src/bookmarks/bookmarkowner.cpp (+7/-7) src/bookmarks/bookmarkowner.h (+0/-3) src/bookmarks/bookmarkscontextmenu.cpp (+0/-3) src/bookmarks/bookmarksmenu.cpp (+159/-0) src/bookmarks/bookmarksmenu.h (+70/-0) src/bookmarks/bookmarkstoolbar.cpp (+4/-103) src/bookmarks/bookmarkstoolbar.h (+5/-38) src/data/adblockrc (+2/-2) src/data/defaultbookmarks.xbel (+15/-0) src/data/rekonq.desktop (+7/-1) src/download/downloadmanager.cpp (+20/-44) src/download/downloadmanager.h (+0/-1) src/main.cpp (+5/-0) src/nepomuk/utils/nepomukutils_export.h (+40/-0) src/nepomuk/utils/resourcemodel.cpp (+230/-0) src/nepomuk/utils/resourcemodel.h (+177/-0) src/nepomuk/utils/simpleresourcemodel.cpp (+170/-0) src/nepomuk/utils/simpleresourcemodel.h (+144/-0) src/rekonq.kcfg (+9/-3) src/rekonqpage/newtabpage.cpp (+64/-105) src/searchengine.cpp (+15/-10) src/sessionmanager.cpp (+23/-13) src/sessionmanager.h (+1/-1) src/settings/settings_tabs.ui (+12/-0) src/settings/settings_webkit.ui (+7/-0) src/tabwindow/tabwindow.cpp (+82/-11) src/tabwindow/tabwindow.h (+7/-1) src/urlbar/bookmarkwidget.cpp (+9/-9) src/urlbar/bookmarkwidget.h (+5/-8) src/urlbar/newresourcedialog.cpp (+15/-15) src/urlbar/newresourcedialog.h (+5/-5) src/urlbar/resourcelinkdialog.cpp (+83/-79) src/urlbar/resourcelinkdialog.h (+2/-2) src/urlbar/urlbar.cpp (+3/-3) src/webtab/networkaccessmanager.cpp (+3/-3) src/webtab/networkaccessmanager.h (+2/-2) src/webtab/protocolhandler.cpp (+3/-0) src/webtab/webpage.cpp (+5/-2) src/webtab/webtab.cpp (+3/-0) src/webtab/webview.cpp (+11/-7) src/webwindow/findbar.cpp (+3/-3) src/webwindow/findbar.h (+1/-0) src/webwindow/maintoolbar.cpp (+14/-18) src/webwindow/rekonqui.rc (+3/-10) src/webwindow/webwindow.cpp (+27/-23) src/webwindow/webwindow.h (+2/-0) |
| To merge this branch: | bzr merge lp://staging/~smartboyhw/ubuntu/raring/rekonq/2.2-0ubuntu1-1st-version |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Philip Muškovac (community) | Approve | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
New upstream release 2.2.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Uploaded with 2 changes:
* The patch refreshes were not needed so I reverted them
* You missed a build-dep:
-- ----- Optional Features
--
-- Nepomuk Libraries.
-- Rekonq will be compiled WITHOUT support for bookmarks tagging
that needed nepomuk-core-dev added to Build-Depends.
Please carefully inspect the build log for such things next time.