diff -Nru khtml-5.8.0/CMakeLists.txt khtml-5.9.0/CMakeLists.txt --- khtml-5.8.0/CMakeLists.txt 2015-03-07 14:43:34.000000000 +0000 +++ khtml-5.9.0/CMakeLists.txt 2015-04-04 12:05:35.000000000 +0000 @@ -2,7 +2,7 @@ project(KHtml) -find_package(ECM 1.8.0 REQUIRED NO_MODULE) +find_package(ECM 5.9.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(FeatureSummary) include(GenerateExportHeader) @@ -16,8 +16,8 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "5.8.0") # handled by release scripts -set(KF5_DEP_VERSION "5.8.0") # handled by release scripts +set(KF5_VERSION "5.9.0") # handled by release scripts +set(KF5_DEP_VERSION "5.9.0") # handled by release scripts find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Codecs ${KF5_DEP_VERSION} REQUIRED) find_package(KF5GlobalAccel ${KF5_DEP_VERSION} REQUIRED) diff -Nru khtml-5.8.0/debian/changelog khtml-5.9.0/debian/changelog --- khtml-5.8.0/debian/changelog 2015-03-20 13:23:07.000000000 +0000 +++ khtml-5.9.0/debian/changelog 2015-04-13 21:21:22.000000000 +0000 @@ -1,3 +1,9 @@ +khtml (5.9.0-0ubuntu1) vivid; urgency=medium + + * New upstream release + + -- Scarlett Clark Mon, 13 Apr 2015 23:21:22 +0200 + khtml (5.8.0-0ubuntu2) vivid; urgency=medium * Update symbols diff -Nru khtml-5.8.0/debian/control khtml-5.9.0/debian/control --- khtml-5.8.0/debian/control 2015-03-17 14:47:38.000000000 +0000 +++ khtml-5.9.0/debian/control 2015-04-13 21:21:22.000000000 +0000 @@ -6,38 +6,38 @@ Build-Depends: cmake, debhelper (>= 9.0.0), extra-cmake-modules (>= 1.8.0), - kinit-dev (>= 5.8.0), - kio-dev (>= 5.8.0), + kinit-dev (>= 5.9.0), + kio-dev (>= 5.9.0), libgif-dev, libjpeg-dev, - libkf5archive-dev (>= 5.8.0), - libkf5attica-dev (>= 5.8.0), - libkf5auth-dev (>= 5.8.0), - libkf5bookmarks-dev (>= 5.8.0), - libkf5codecs-dev (>= 5.8.0), - libkf5completion-dev (>= 5.8.0), - libkf5config-dev (>= 5.8.0), - libkf5configwidgets-dev (>= 5.8.0), - libkf5coreaddons-dev (>= 5.8.0), - libkf5crash-dev (>= 5.8.0), - libkf5dbusaddons-dev (>= 5.8.0), - libkf5globalaccel-dev (>= 5.8.0), - libkf5guiaddons-dev (>= 5.8.0), - libkf5i18n-dev (>= 5.8.0), - libkf5iconthemes-dev (>= 5.8.0), - libkf5itemviews-dev (>= 5.8.0), - libkf5jobwidgets-dev (>= 5.8.0), - libkf5kjs-dev (>= 5.8.0), - libkf5notifications-dev (>= 5.8.0), - libkf5parts-dev (>= 5.8.0), - libkf5service-dev (>= 5.8.0), - libkf5solid-dev (>= 5.8.0), - libkf5sonnet-dev (>= 5.8.0), - libkf5textwidgets-dev (>= 5.8.0), - libkf5wallet-dev (>= 5.8.0), - libkf5widgetsaddons-dev (>= 5.8.0), - libkf5windowsystem-dev (>= 5.8.0), - libkf5xmlgui-dev (>= 5.8.0), + libkf5archive-dev (>= 5.9.0), + libkf5attica-dev (>= 5.9.0), + libkf5auth-dev (>= 5.9.0), + libkf5bookmarks-dev (>= 5.9.0), + libkf5codecs-dev (>= 5.9.0), + libkf5completion-dev (>= 5.9.0), + libkf5config-dev (>= 5.9.0), + libkf5configwidgets-dev (>= 5.9.0), + libkf5coreaddons-dev (>= 5.9.0), + libkf5crash-dev (>= 5.9.0), + libkf5dbusaddons-dev (>= 5.9.0), + libkf5globalaccel-dev (>= 5.9.0), + libkf5guiaddons-dev (>= 5.9.0), + libkf5i18n-dev (>= 5.9.0), + libkf5iconthemes-dev (>= 5.9.0), + libkf5itemviews-dev (>= 5.9.0), + libkf5jobwidgets-dev (>= 5.9.0), + libkf5kjs-dev (>= 5.9.0), + libkf5notifications-dev (>= 5.9.0), + libkf5parts-dev (>= 5.9.0), + libkf5service-dev (>= 5.9.0), + libkf5solid-dev (>= 5.9.0), + libkf5sonnet-dev (>= 5.9.0), + libkf5textwidgets-dev (>= 5.9.0), + libkf5wallet-dev (>= 5.9.0), + libkf5widgetsaddons-dev (>= 5.9.0), + libkf5windowsystem-dev (>= 5.9.0), + libkf5xmlgui-dev (>= 5.9.0), libphonon4qt5-dev, libphonon4qt5experimental-dev, libpng12-dev, diff -Nru khtml-5.8.0/po/gl/khtml5.po khtml-5.9.0/po/gl/khtml5.po --- khtml-5.8.0/po/gl/khtml5.po 2015-03-07 14:43:34.000000000 +0000 +++ khtml-5.9.0/po/gl/khtml5.po 2015-04-04 12:05:35.000000000 +0000 @@ -9,13 +9,14 @@ # Marce Villarino , 2009, 2010, 2011, 2012. # Xosé , 2010. # Marce Villarino , 2011, 2012, 2013, 2014. +# Adrián Chaves Fernández , 2015. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2015-03-07 08:35+0000\n" -"PO-Revision-Date: 2014-05-13 22:38+0200\n" -"Last-Translator: Marce Villarino \n" +"PO-Revision-Date: 2015-03-14 06:30+0100\n" +"Last-Translator: Adrián Chaves Fernández \n" "Language-Team: Galician \n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -1378,10 +1379,8 @@ msgstr "Compoñente integrábel para multipart/mixed" #: kmultipart/kmultipart.cpp:44 -#, fuzzy -#| msgid "Copyright 2001-2011, David Faure faure@kde.org" msgid "Copyright 2001-2011, David Faure " -msgstr "Copyright 2001-2011, David Faure faure@kde.org" +msgstr "© 2001-2011 David Faure " #: kmultipart/kmultipart.cpp:337 #, kde-format diff -Nru khtml-5.8.0/po/sr/khtml5.po khtml-5.9.0/po/sr/khtml5.po --- khtml-5.8.0/po/sr/khtml5.po 2015-03-07 14:43:34.000000000 +0000 +++ khtml-5.9.0/po/sr/khtml5.po 2015-04-04 12:05:35.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-01-07 07:51+0000\n" +"POT-Creation-Date: 2015-03-07 08:35+0000\n" "PO-Revision-Date: 2014-08-30 19:03+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -1389,72 +1389,72 @@ msgid "No handler found for %1." msgstr "Није нађен руковалац за %1." -#: misc/kencodingdetector.cpp:1119 misc/kencodingdetector.cpp:1220 +#: misc/kencodingdetector.cpp:1123 misc/kencodingdetector.cpp:1224 msgctxt "@item Text character set" msgid "Unicode" msgstr "уникод" -#: misc/kencodingdetector.cpp:1121 misc/kencodingdetector.cpp:1190 +#: misc/kencodingdetector.cpp:1125 misc/kencodingdetector.cpp:1194 msgctxt "@item Text character set" msgid "Cyrillic" msgstr "ћирилички" -#: misc/kencodingdetector.cpp:1123 misc/kencodingdetector.cpp:1205 +#: misc/kencodingdetector.cpp:1127 misc/kencodingdetector.cpp:1209 msgctxt "@item Text character set" msgid "Western European" msgstr "западноевропски" -#: misc/kencodingdetector.cpp:1125 misc/kencodingdetector.cpp:1187 +#: misc/kencodingdetector.cpp:1129 misc/kencodingdetector.cpp:1191 msgctxt "@item Text character set" msgid "Central European" msgstr "средњеевропски" -#: misc/kencodingdetector.cpp:1127 misc/kencodingdetector.cpp:1193 +#: misc/kencodingdetector.cpp:1131 misc/kencodingdetector.cpp:1197 msgctxt "@item Text character set" msgid "Greek" msgstr "грчки" -#: misc/kencodingdetector.cpp:1129 misc/kencodingdetector.cpp:1196 +#: misc/kencodingdetector.cpp:1133 misc/kencodingdetector.cpp:1200 msgctxt "@item Text character set" msgid "Hebrew" msgstr "хебрејски" -#: misc/kencodingdetector.cpp:1131 misc/kencodingdetector.cpp:1202 +#: misc/kencodingdetector.cpp:1135 misc/kencodingdetector.cpp:1206 msgctxt "@item Text character set" msgid "Turkish" msgstr "турски" -#: misc/kencodingdetector.cpp:1133 misc/kencodingdetector.cpp:1199 +#: misc/kencodingdetector.cpp:1137 misc/kencodingdetector.cpp:1203 msgctxt "@item Text character set" msgid "Japanese" msgstr "јапански" -#: misc/kencodingdetector.cpp:1135 misc/kencodingdetector.cpp:1184 +#: misc/kencodingdetector.cpp:1139 misc/kencodingdetector.cpp:1188 msgctxt "@item Text character set" msgid "Baltic" msgstr "балтички" -#: misc/kencodingdetector.cpp:1137 misc/kencodingdetector.cpp:1181 +#: misc/kencodingdetector.cpp:1141 misc/kencodingdetector.cpp:1185 msgctxt "@item Text character set" msgid "Arabic" msgstr "арапски" -#: misc/kencodingdetector.cpp:1208 +#: misc/kencodingdetector.cpp:1212 msgctxt "@item Text character set" msgid "Chinese Traditional" msgstr "кинески традиционални" -#: misc/kencodingdetector.cpp:1211 +#: misc/kencodingdetector.cpp:1215 msgctxt "@item Text character set" msgid "Chinese Simplified" msgstr "кинески поједностављени" -#: misc/kencodingdetector.cpp:1214 +#: misc/kencodingdetector.cpp:1218 msgctxt "@item Text character set" msgid "Korean" msgstr "корејски" -#: misc/kencodingdetector.cpp:1217 +#: misc/kencodingdetector.cpp:1221 msgctxt "@item Text character set" msgid "Thai" msgstr "тајландски" diff -Nru khtml-5.8.0/po/sr@ijekavian/khtml5.po khtml-5.9.0/po/sr@ijekavian/khtml5.po --- khtml-5.8.0/po/sr@ijekavian/khtml5.po 2015-03-07 14:43:34.000000000 +0000 +++ khtml-5.9.0/po/sr@ijekavian/khtml5.po 2015-04-04 12:05:35.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-01-07 07:51+0000\n" +"POT-Creation-Date: 2015-03-07 08:35+0000\n" "PO-Revision-Date: 2014-08-30 19:03+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -1389,72 +1389,72 @@ msgid "No handler found for %1." msgstr "Није нађен руковалац за %1." -#: misc/kencodingdetector.cpp:1119 misc/kencodingdetector.cpp:1220 +#: misc/kencodingdetector.cpp:1123 misc/kencodingdetector.cpp:1224 msgctxt "@item Text character set" msgid "Unicode" msgstr "уникод" -#: misc/kencodingdetector.cpp:1121 misc/kencodingdetector.cpp:1190 +#: misc/kencodingdetector.cpp:1125 misc/kencodingdetector.cpp:1194 msgctxt "@item Text character set" msgid "Cyrillic" msgstr "ћирилички" -#: misc/kencodingdetector.cpp:1123 misc/kencodingdetector.cpp:1205 +#: misc/kencodingdetector.cpp:1127 misc/kencodingdetector.cpp:1209 msgctxt "@item Text character set" msgid "Western European" msgstr "западноевропски" -#: misc/kencodingdetector.cpp:1125 misc/kencodingdetector.cpp:1187 +#: misc/kencodingdetector.cpp:1129 misc/kencodingdetector.cpp:1191 msgctxt "@item Text character set" msgid "Central European" msgstr "средњеевропски" -#: misc/kencodingdetector.cpp:1127 misc/kencodingdetector.cpp:1193 +#: misc/kencodingdetector.cpp:1131 misc/kencodingdetector.cpp:1197 msgctxt "@item Text character set" msgid "Greek" msgstr "грчки" -#: misc/kencodingdetector.cpp:1129 misc/kencodingdetector.cpp:1196 +#: misc/kencodingdetector.cpp:1133 misc/kencodingdetector.cpp:1200 msgctxt "@item Text character set" msgid "Hebrew" msgstr "хебрејски" -#: misc/kencodingdetector.cpp:1131 misc/kencodingdetector.cpp:1202 +#: misc/kencodingdetector.cpp:1135 misc/kencodingdetector.cpp:1206 msgctxt "@item Text character set" msgid "Turkish" msgstr "турски" -#: misc/kencodingdetector.cpp:1133 misc/kencodingdetector.cpp:1199 +#: misc/kencodingdetector.cpp:1137 misc/kencodingdetector.cpp:1203 msgctxt "@item Text character set" msgid "Japanese" msgstr "јапански" -#: misc/kencodingdetector.cpp:1135 misc/kencodingdetector.cpp:1184 +#: misc/kencodingdetector.cpp:1139 misc/kencodingdetector.cpp:1188 msgctxt "@item Text character set" msgid "Baltic" msgstr "балтички" -#: misc/kencodingdetector.cpp:1137 misc/kencodingdetector.cpp:1181 +#: misc/kencodingdetector.cpp:1141 misc/kencodingdetector.cpp:1185 msgctxt "@item Text character set" msgid "Arabic" msgstr "арапски" -#: misc/kencodingdetector.cpp:1208 +#: misc/kencodingdetector.cpp:1212 msgctxt "@item Text character set" msgid "Chinese Traditional" msgstr "кинески традиционални" -#: misc/kencodingdetector.cpp:1211 +#: misc/kencodingdetector.cpp:1215 msgctxt "@item Text character set" msgid "Chinese Simplified" msgstr "кинески поједностављени" -#: misc/kencodingdetector.cpp:1214 +#: misc/kencodingdetector.cpp:1218 msgctxt "@item Text character set" msgid "Korean" msgstr "корејски" -#: misc/kencodingdetector.cpp:1217 +#: misc/kencodingdetector.cpp:1221 msgctxt "@item Text character set" msgid "Thai" msgstr "тајландски" diff -Nru khtml-5.8.0/po/sr@ijekavianlatin/khtml5.po khtml-5.9.0/po/sr@ijekavianlatin/khtml5.po --- khtml-5.8.0/po/sr@ijekavianlatin/khtml5.po 2015-03-07 14:43:34.000000000 +0000 +++ khtml-5.9.0/po/sr@ijekavianlatin/khtml5.po 2015-04-04 12:05:35.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-01-07 07:51+0000\n" +"POT-Creation-Date: 2015-03-07 08:35+0000\n" "PO-Revision-Date: 2014-08-30 19:03+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -1390,72 +1390,72 @@ msgid "No handler found for %1." msgstr "Nije nađen rukovalac za %1." -#: misc/kencodingdetector.cpp:1119 misc/kencodingdetector.cpp:1220 +#: misc/kencodingdetector.cpp:1123 misc/kencodingdetector.cpp:1224 msgctxt "@item Text character set" msgid "Unicode" msgstr "Unicode" -#: misc/kencodingdetector.cpp:1121 misc/kencodingdetector.cpp:1190 +#: misc/kencodingdetector.cpp:1125 misc/kencodingdetector.cpp:1194 msgctxt "@item Text character set" msgid "Cyrillic" msgstr "ćirilički" -#: misc/kencodingdetector.cpp:1123 misc/kencodingdetector.cpp:1205 +#: misc/kencodingdetector.cpp:1127 misc/kencodingdetector.cpp:1209 msgctxt "@item Text character set" msgid "Western European" msgstr "zapadnoevropski" -#: misc/kencodingdetector.cpp:1125 misc/kencodingdetector.cpp:1187 +#: misc/kencodingdetector.cpp:1129 misc/kencodingdetector.cpp:1191 msgctxt "@item Text character set" msgid "Central European" msgstr "srednjeevropski" -#: misc/kencodingdetector.cpp:1127 misc/kencodingdetector.cpp:1193 +#: misc/kencodingdetector.cpp:1131 misc/kencodingdetector.cpp:1197 msgctxt "@item Text character set" msgid "Greek" msgstr "grčki" -#: misc/kencodingdetector.cpp:1129 misc/kencodingdetector.cpp:1196 +#: misc/kencodingdetector.cpp:1133 misc/kencodingdetector.cpp:1200 msgctxt "@item Text character set" msgid "Hebrew" msgstr "hebrejski" -#: misc/kencodingdetector.cpp:1131 misc/kencodingdetector.cpp:1202 +#: misc/kencodingdetector.cpp:1135 misc/kencodingdetector.cpp:1206 msgctxt "@item Text character set" msgid "Turkish" msgstr "turski" -#: misc/kencodingdetector.cpp:1133 misc/kencodingdetector.cpp:1199 +#: misc/kencodingdetector.cpp:1137 misc/kencodingdetector.cpp:1203 msgctxt "@item Text character set" msgid "Japanese" msgstr "japanski" -#: misc/kencodingdetector.cpp:1135 misc/kencodingdetector.cpp:1184 +#: misc/kencodingdetector.cpp:1139 misc/kencodingdetector.cpp:1188 msgctxt "@item Text character set" msgid "Baltic" msgstr "baltički" -#: misc/kencodingdetector.cpp:1137 misc/kencodingdetector.cpp:1181 +#: misc/kencodingdetector.cpp:1141 misc/kencodingdetector.cpp:1185 msgctxt "@item Text character set" msgid "Arabic" msgstr "arapski" -#: misc/kencodingdetector.cpp:1208 +#: misc/kencodingdetector.cpp:1212 msgctxt "@item Text character set" msgid "Chinese Traditional" msgstr "kineski tradicionalni" -#: misc/kencodingdetector.cpp:1211 +#: misc/kencodingdetector.cpp:1215 msgctxt "@item Text character set" msgid "Chinese Simplified" msgstr "kineski pojednostavljeni" -#: misc/kencodingdetector.cpp:1214 +#: misc/kencodingdetector.cpp:1218 msgctxt "@item Text character set" msgid "Korean" msgstr "korejski" -#: misc/kencodingdetector.cpp:1217 +#: misc/kencodingdetector.cpp:1221 msgctxt "@item Text character set" msgid "Thai" msgstr "tajlandski" diff -Nru khtml-5.8.0/po/sr@latin/khtml5.po khtml-5.9.0/po/sr@latin/khtml5.po --- khtml-5.8.0/po/sr@latin/khtml5.po 2015-03-07 14:43:34.000000000 +0000 +++ khtml-5.9.0/po/sr@latin/khtml5.po 2015-04-04 12:05:35.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-01-07 07:51+0000\n" +"POT-Creation-Date: 2015-03-07 08:35+0000\n" "PO-Revision-Date: 2014-08-30 19:03+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -1389,72 +1389,72 @@ msgid "No handler found for %1." msgstr "Nije nađen rukovalac za %1." -#: misc/kencodingdetector.cpp:1119 misc/kencodingdetector.cpp:1220 +#: misc/kencodingdetector.cpp:1123 misc/kencodingdetector.cpp:1224 msgctxt "@item Text character set" msgid "Unicode" msgstr "Unicode" -#: misc/kencodingdetector.cpp:1121 misc/kencodingdetector.cpp:1190 +#: misc/kencodingdetector.cpp:1125 misc/kencodingdetector.cpp:1194 msgctxt "@item Text character set" msgid "Cyrillic" msgstr "ćirilički" -#: misc/kencodingdetector.cpp:1123 misc/kencodingdetector.cpp:1205 +#: misc/kencodingdetector.cpp:1127 misc/kencodingdetector.cpp:1209 msgctxt "@item Text character set" msgid "Western European" msgstr "zapadnoevropski" -#: misc/kencodingdetector.cpp:1125 misc/kencodingdetector.cpp:1187 +#: misc/kencodingdetector.cpp:1129 misc/kencodingdetector.cpp:1191 msgctxt "@item Text character set" msgid "Central European" msgstr "srednjeevropski" -#: misc/kencodingdetector.cpp:1127 misc/kencodingdetector.cpp:1193 +#: misc/kencodingdetector.cpp:1131 misc/kencodingdetector.cpp:1197 msgctxt "@item Text character set" msgid "Greek" msgstr "grčki" -#: misc/kencodingdetector.cpp:1129 misc/kencodingdetector.cpp:1196 +#: misc/kencodingdetector.cpp:1133 misc/kencodingdetector.cpp:1200 msgctxt "@item Text character set" msgid "Hebrew" msgstr "hebrejski" -#: misc/kencodingdetector.cpp:1131 misc/kencodingdetector.cpp:1202 +#: misc/kencodingdetector.cpp:1135 misc/kencodingdetector.cpp:1206 msgctxt "@item Text character set" msgid "Turkish" msgstr "turski" -#: misc/kencodingdetector.cpp:1133 misc/kencodingdetector.cpp:1199 +#: misc/kencodingdetector.cpp:1137 misc/kencodingdetector.cpp:1203 msgctxt "@item Text character set" msgid "Japanese" msgstr "japanski" -#: misc/kencodingdetector.cpp:1135 misc/kencodingdetector.cpp:1184 +#: misc/kencodingdetector.cpp:1139 misc/kencodingdetector.cpp:1188 msgctxt "@item Text character set" msgid "Baltic" msgstr "baltički" -#: misc/kencodingdetector.cpp:1137 misc/kencodingdetector.cpp:1181 +#: misc/kencodingdetector.cpp:1141 misc/kencodingdetector.cpp:1185 msgctxt "@item Text character set" msgid "Arabic" msgstr "arapski" -#: misc/kencodingdetector.cpp:1208 +#: misc/kencodingdetector.cpp:1212 msgctxt "@item Text character set" msgid "Chinese Traditional" msgstr "kineski tradicionalni" -#: misc/kencodingdetector.cpp:1211 +#: misc/kencodingdetector.cpp:1215 msgctxt "@item Text character set" msgid "Chinese Simplified" msgstr "kineski pojednostavljeni" -#: misc/kencodingdetector.cpp:1214 +#: misc/kencodingdetector.cpp:1218 msgctxt "@item Text character set" msgid "Korean" msgstr "korejski" -#: misc/kencodingdetector.cpp:1217 +#: misc/kencodingdetector.cpp:1221 msgctxt "@item Text character set" msgid "Thai" msgstr "tajlandski"