diff -Nru kremotecontrol-4.7.90/CMakeLists.txt kremotecontrol-4.7.95/CMakeLists.txt --- kremotecontrol-4.7.90/CMakeLists.txt 2011-08-22 13:26:13.000000000 +0000 +++ kremotecontrol-4.7.95/CMakeLists.txt 2011-12-20 19:15:23.000000000 +0000 @@ -21,11 +21,9 @@ set(STUFF_REQUIRED FALSE) endif() -find_package( KDE4Workspace ) -macro_log_feature( KDE4Workspace_FOUND "KDE4Workspace" "KDE Workspace library, part of kdebase-workspace" "http://www.kde.org" ${STUFF_REQUIRED} "" "Required to build kremotecontrol." ) macro_log_feature( QT_QTXMLPATTERNS_FOUND "QtXmlPatterns" "Qt support for XPath, XQuery, XSLT and XML Schema validation" "http://doc.trolltech.com/latest/qtxmlpatterns.html" ${STUFF_REQUIRED} "" "Required to build kremotecontrol." ) -if(NOT KDE4Workspace_FOUND OR NOT QT_QTXMLPATTERNS_FOUND) +if(NOT QT_QTXMLPATTERNS_FOUND) if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) macro_display_feature_log() else() diff -Nru kremotecontrol-4.7.90/dataengine/CMakeLists.txt kremotecontrol-4.7.95/dataengine/CMakeLists.txt --- kremotecontrol-4.7.90/dataengine/CMakeLists.txt 2011-08-22 13:26:13.000000000 +0000 +++ kremotecontrol-4.7.95/dataengine/CMakeLists.txt 2011-12-20 19:15:23.000000000 +0000 @@ -8,7 +8,6 @@ ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${PLASMA_INCLUDE_DIR} - ${KDE4WORKSPACE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../libkremotecontrol ) diff -Nru kremotecontrol-4.7.90/debian/changelog kremotecontrol-4.7.95/debian/changelog --- kremotecontrol-4.7.90/debian/changelog 2011-12-20 23:52:45.000000000 +0000 +++ kremotecontrol-4.7.95/debian/changelog 2011-12-27 20:59:04.000000000 +0000 @@ -1,3 +1,10 @@ +kremotecontrol (4:4.7.95-0ubuntu1) precise; urgency=low + + * New upstream release candidate + - drop remove_workspace.patch, applied upstream + + -- Philip Muškovac Sat, 24 Dec 2011 23:21:50 +0100 + kremotecontrol (4:4.7.90-0ubuntu1) precise; urgency=low * Initial package diff -Nru kremotecontrol-4.7.90/debian/control kremotecontrol-4.7.95/debian/control --- kremotecontrol-4.7.90/debian/control 2011-12-16 16:57:19.000000000 +0000 +++ kremotecontrol-4.7.95/debian/control 2011-12-27 20:26:04.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Kubuntu Developers XSBC-Original-Maintainer: Jonathan Riddell -Build-Depends: kde-sc-dev-latest (>= 4:4.7.2), +Build-Depends: kde-sc-dev-latest (>= 4:4.7.95), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), kdelibs5-dev (>= 4:4.7), libxtst-dev Standards-Version: 3.9.2 diff -Nru kremotecontrol-4.7.90/debian/patches/remove_workspace.patch kremotecontrol-4.7.95/debian/patches/remove_workspace.patch --- kremotecontrol-4.7.90/debian/patches/remove_workspace.patch 2011-12-16 16:09:31.000000000 +0000 +++ kremotecontrol-4.7.95/debian/patches/remove_workspace.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -Author: Pino Toscano -Description: remove extra kdebase-workspace dependency -Last-Update: 2011-10-11 -Forwarded: no ---- kremotecontrol/CMakeLists.txt -+++ kremotecontrol/CMakeLists.txt -@@ -21,11 +21,9 @@ else() - set(STUFF_REQUIRED FALSE) - endif() - --find_package( KDE4Workspace ) --macro_log_feature( KDE4Workspace_FOUND "KDE4Workspace" "KDE Workspace library, part of kdebase-workspace" "http://www.kde.org" ${STUFF_REQUIRED} "" "Required to build kremotecontrol." ) - macro_log_feature( QT_QTXMLPATTERNS_FOUND "QtXmlPatterns" "Qt support for XPath, XQuery, XSLT and XML Schema validation" "http://doc.trolltech.com/latest/qtxmlpatterns.html" ${STUFF_REQUIRED} "" "Required to build kremotecontrol." ) - --if(NOT KDE4Workspace_FOUND OR NOT QT_QTXMLPATTERNS_FOUND) -+if(NOT QT_QTXMLPATTERNS_FOUND) - if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) - macro_display_feature_log() - else() ---- kremotecontrol/libkremotecontrol/CMakeLists.txt -+++ kremotecontrol/libkremotecontrol/CMakeLists.txt -@@ -4,7 +4,6 @@ include_directories( - ${KDE4_INCLUDES} - ${QT_INCLUDES} - ${X11_INCLUDE_DIR} --# ${KDE4WORKSPACE_INCLUDE_DIR} - ) - - ---- kremotecontrol/krcdnotifieritem/CMakeLists.txt -+++ kremotecontrol/krcdnotifieritem/CMakeLists.txt -@@ -6,7 +6,7 @@ include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${KDE4_INCLUDES} - ${QT_INCLUDES} -- ${KDE4WORKSPACE_INCLUDE_DIR} ) -+) - - set(krcdnotifieritem_SRCS - main.cpp ---- kremotecontrol/dataengine/CMakeLists.txt -+++ kremotecontrol/dataengine/CMakeLists.txt -@@ -8,7 +8,6 @@ include_directories( - ${CMAKE_BINARY_DIR} - ${KDE4_INCLUDES} - ${PLASMA_INCLUDE_DIR} -- ${KDE4WORKSPACE_INCLUDE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../libkremotecontrol - ) - ---- kremotecontrol/kcmremotecontrol/CMakeLists.txt -+++ kremotecontrol/kcmremotecontrol/CMakeLists.txt -@@ -7,7 +7,7 @@ include_directories( - ${CMAKE_CURRENT_BINARY_DIR}/../libkremotecontrol - ${KDE4_INCLUDES} - ${QT_INCLUDES} -- ${KDE4WORKSPACE_INCLUDE_DIR} ) -+) - - ########### next target ############### - ---- kremotecontrol/kded/CMakeLists.txt -+++ kremotecontrol/kded/CMakeLists.txt -@@ -1,7 +1,6 @@ - - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../libkremotecontrol -- ${KDE4WORKSPACE_INCLUDE_DIR} - ) - - set(kded_kremotecontroldaemon_SRCS diff -Nru kremotecontrol-4.7.90/debian/patches/series kremotecontrol-4.7.95/debian/patches/series --- kremotecontrol-4.7.90/debian/patches/series 2011-12-16 16:02:57.000000000 +0000 +++ kremotecontrol-4.7.95/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -remove_workspace.patch Binary files /tmp/zrQtACQQBe/kremotecontrol-4.7.90/doc/index.cache.bz2 and /tmp/hZwbqXye54/kremotecontrol-4.7.95/doc/index.cache.bz2 differ diff -Nru kremotecontrol-4.7.90/kcmremotecontrol/CMakeLists.txt kremotecontrol-4.7.95/kcmremotecontrol/CMakeLists.txt --- kremotecontrol-4.7.90/kcmremotecontrol/CMakeLists.txt 2011-08-22 13:26:13.000000000 +0000 +++ kremotecontrol-4.7.95/kcmremotecontrol/CMakeLists.txt 2011-12-20 19:15:23.000000000 +0000 @@ -7,7 +7,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/../libkremotecontrol ${KDE4_INCLUDES} ${QT_INCLUDES} - ${KDE4WORKSPACE_INCLUDE_DIR} ) +) ########### next target ############### diff -Nru kremotecontrol-4.7.90/kcmremotecontrol/kcm_remotecontrol.desktop kremotecontrol-4.7.95/kcmremotecontrol/kcm_remotecontrol.desktop --- kremotecontrol-4.7.90/kcmremotecontrol/kcm_remotecontrol.desktop 2011-09-26 09:46:44.000000000 +0000 +++ kremotecontrol-4.7.95/kcmremotecontrol/kcm_remotecontrol.desktop 2011-12-20 19:15:23.000000000 +0000 @@ -12,11 +12,19 @@ Categories=Qt;KDE;X-KDE-settings-system; X-KDE-Keywords=KCMRemoteControl,remote control -X-KDE-Keywords[nl]=kcmlirc,linux infrarood,infrarood,afstandsbediening -X-KDE-Keywords[pl]=KCMLirc,kcmlirc,piloty,podczerwień -X-KDE-Keywords[ta]= KCMLirc,kcmlirc -X-KDE-Keywords[uz]=KCMLirc,kcmlirc,инфрақизил нур -X-KDE-Keywords[x-test]=xxKCMLirc,kcmlircxx +X-KDE-Keywords[ca]=KCMRemoteControl,comandament a distància +X-KDE-Keywords[cs]=KRemoteControl,dálkové ovládání +X-KDE-Keywords[es]=KCMRemoteControl,mando a distancia +X-KDE-Keywords[hu]=KRemoteControl,távirányító +X-KDE-Keywords[kk]=KCMRemoteControl,remote control +X-KDE-Keywords[nds]=KCM-Feernbedenen,Feernbedenen +X-KDE-Keywords[nl]=KCMRemoteControl,besturing op afstand +X-KDE-Keywords[pt]=KCMRemoteControl,comando à distância +X-KDE-Keywords[pt_BR]=KCMRemoteControl,controle remoto +X-KDE-Keywords[sv]=KCMRemoteControl,fjärrkontroll +X-KDE-Keywords[uk]=KCMRemoteControl,віддалене керування,пульт,керування +X-KDE-Keywords[x-test]=xxKCMRemoteControl,remote controlxx +X-KDE-Keywords[zh_TW]=KCMRemoteControl,remote control Name=Remote Controls diff -Nru kremotecontrol-4.7.90/kded/CMakeLists.txt kremotecontrol-4.7.95/kded/CMakeLists.txt --- kremotecontrol-4.7.90/kded/CMakeLists.txt 2011-08-22 13:26:13.000000000 +0000 +++ kremotecontrol-4.7.95/kded/CMakeLists.txt 2011-12-20 19:15:23.000000000 +0000 @@ -1,7 +1,6 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../libkremotecontrol - ${KDE4WORKSPACE_INCLUDE_DIR} ) set(kded_kremotecontroldaemon_SRCS diff -Nru kremotecontrol-4.7.90/krcdnotifieritem/CMakeLists.txt kremotecontrol-4.7.95/krcdnotifieritem/CMakeLists.txt --- kremotecontrol-4.7.90/krcdnotifieritem/CMakeLists.txt 2011-08-22 13:26:13.000000000 +0000 +++ kremotecontrol-4.7.95/krcdnotifieritem/CMakeLists.txt 2011-12-20 19:15:23.000000000 +0000 @@ -6,7 +6,7 @@ ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} ${QT_INCLUDES} - ${KDE4WORKSPACE_INCLUDE_DIR} ) +) set(krcdnotifieritem_SRCS main.cpp diff -Nru kremotecontrol-4.7.90/libkremotecontrol/backends/lirc/kremotecontrol_lirc.desktop kremotecontrol-4.7.95/libkremotecontrol/backends/lirc/kremotecontrol_lirc.desktop --- kremotecontrol-4.7.90/libkremotecontrol/backends/lirc/kremotecontrol_lirc.desktop 2011-12-02 21:32:24.000000000 +0000 +++ kremotecontrol-4.7.95/libkremotecontrol/backends/lirc/kremotecontrol_lirc.desktop 2011-12-20 19:15:23.000000000 +0000 @@ -18,6 +18,7 @@ Name[fr]=Lirc Name[hr]=Lirc Name[hu]=Lirc +Name[it]=Lirc Name[kk]=Lirc Name[km]=Lirc Name[ko]=Lirc @@ -55,6 +56,7 @@ Comment[fr]=Contrôle à distance infrarouge pour Linux Comment[hr]=Linuxovo infracrveno daljinsko upravljanje Comment[hu]=Linux Infrared Remote Control +Comment[it]=Telecomandi ad infrarosso per Linux Comment[kk]=Linux инфрақызыл қашықтан басқаруы Comment[km]=វត្ថុ​បញ្ជា​ពីចម្ងាយអាំងហ្វ្រា​របស់​លីនុច Comment[ko]=리눅스 리모콘 제어 diff -Nru kremotecontrol-4.7.90/libkremotecontrol/CMakeLists.txt kremotecontrol-4.7.95/libkremotecontrol/CMakeLists.txt --- kremotecontrol-4.7.90/libkremotecontrol/CMakeLists.txt 2011-09-26 09:46:44.000000000 +0000 +++ kremotecontrol-4.7.95/libkremotecontrol/CMakeLists.txt 2011-12-20 19:15:23.000000000 +0000 @@ -4,7 +4,6 @@ ${KDE4_INCLUDES} ${QT_INCLUDES} ${X11_INCLUDE_DIR} -# ${KDE4WORKSPACE_INCLUDE_DIR} ) diff -Nru kremotecontrol-4.7.90/libkremotecontrol/kremotecontrolmanager.desktop kremotecontrol-4.7.95/libkremotecontrol/kremotecontrolmanager.desktop --- kremotecontrol-4.7.90/libkremotecontrol/kremotecontrolmanager.desktop 2011-12-02 21:32:24.000000000 +0000 +++ kremotecontrol-4.7.95/libkremotecontrol/kremotecontrolmanager.desktop 2011-12-20 19:15:23.000000000 +0000 @@ -3,7 +3,7 @@ X-KDE-ServiceType=KRemoteControlManager Comment=Remote Control Management Backend Comment[bs]=Pozadina daljinskih upravljača -Comment[ca]=Dorsal de gestió de control remot +Comment[ca]=Dorsal de gestió del comandament a distància Comment[ca@valencia]=Dorsal de gestió de control remot Comment[cs]=Podpůrná vrstva pro vzdálenou správu Comment[da]=Motor til håndtering af fjernbetjening @@ -15,6 +15,7 @@ Comment[fr]=Moteur de gestion du contrôle à distance Comment[hr]=Podrška za upravljanje na daljinu Comment[hu]=Távirányító-kezelő modul +Comment[it]=Backend telecomandi Comment[kk]=Қашықтан басқарғыштың басқару тетігі Comment[km]=កម្មវិធី​ផ្នែក​ខាង​ក្រោយ​គ្រប់គ្រង​ការ​បញ្ជា​ពី​ចម្ងាយ Comment[ko]=리모콘 관리 백엔드