diff -Nru gcdemu-3.0.3/cmake/FindIntlTool.cmake gcdemu-3.1.0/cmake/FindIntlTool.cmake --- gcdemu-3.0.3/cmake/FindIntlTool.cmake 2016-10-11 09:47:29.000000000 +0000 +++ gcdemu-3.1.0/cmake/FindIntlTool.cmake 2017-06-10 21:29:17.000000000 +0000 @@ -21,7 +21,7 @@ if (INTLTOOL_UPDATE_EXECUTABLE) execute_process ( COMMAND ${INTLTOOL_UPDATE_EXECUTABLE} --version - COMMAND head --lines=1 + COMMAND head -n 1 COMMAND cut -d " " -f 3 OUTPUT_VARIABLE INTLTOOL_VERSION ) @@ -73,21 +73,21 @@ if (${no_translations} EQUAL -1) add_custom_command ( OUTPUT ${out_filename} - COMMAND ${INTLTOOL_MERGE_EXECUTABLE} ${options} -u ${PROJECT_SOURCE_DIR}/${po_dir} - ${PROJECT_SOURCE_DIR}/${in_filename} ${out_filename} + COMMAND ${INTLTOOL_MERGE_EXECUTABLE} ${options} -q -u ${po_dir} + ${in_filename} ${out_filename} DEPENDS ${in_filename} ) else () # The --no-translations version should not be given the po dir add_custom_command ( OUTPUT ${out_filename} - COMMAND ${INTLTOOL_MERGE_EXECUTABLE} ${options} -u - ${PROJECT_SOURCE_DIR}/${in_filename} ${out_filename} + COMMAND ${INTLTOOL_MERGE_EXECUTABLE} ${options} -q -u + ${in_filename} ${out_filename} DEPENDS ${in_filename} ) endif () - set (intltool-merge-target "intltool-merge-${out_filename}") - add_custom_target (${intltool-merge-target} ALL DEPENDS ${out_filename}) + get_filename_component (out_name ${out_filename} NAME) + add_custom_target (intltool-merge-${out_name} ALL DEPENDS ${out_filename}) endfunction () diff -Nru gcdemu-3.0.3/CMakeLists.txt gcdemu-3.1.0/CMakeLists.txt --- gcdemu-3.0.3/CMakeLists.txt 2016-10-11 09:47:29.000000000 +0000 +++ gcdemu-3.1.0/CMakeLists.txt 2017-06-10 21:29:17.000000000 +0000 @@ -30,7 +30,7 @@ DESTINATION ${CMAKE_INSTALL_BINDIR} ) -intltool_merge("-x --no-translations" po data/net.sf.cdemu.gcdemu.gschema.xml.in net.sf.cdemu.gcdemu.gschema.xml) +intltool_merge("-x --no-translations" ${PROJECT_SOURCE_DIR}/po ${PROJECT_SOURCE_DIR}/data/net.sf.cdemu.gcdemu.gschema.xml.in net.sf.cdemu.gcdemu.gschema.xml) install ( FILES ${PROJECT_BINARY_DIR}/net.sf.cdemu.gcdemu.gschema.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas @@ -41,7 +41,7 @@ ) endif () -intltool_merge ("-d" po data/gcdemu.desktop.in gcdemu.desktop) +intltool_merge ("-d" ${PROJECT_SOURCE_DIR}/po ${PROJECT_SOURCE_DIR}/data/gcdemu.desktop.in gcdemu.desktop) install ( FILES ${PROJECT_BINARY_DIR}/gcdemu.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications diff -Nru gcdemu-3.0.3/debian/changelog gcdemu-3.1.0/debian/changelog --- gcdemu-3.0.3/debian/changelog 2016-10-11 16:54:13.000000000 +0000 +++ gcdemu-3.1.0/debian/changelog 2017-06-10 22:52:16.000000000 +0000 @@ -1,3 +1,7 @@ +gcdemu (3.1.0-1ubuntu1~vivid1~ppa1) vivid; urgency=low + * Updated to 3.1.0 + -- Rok Mandeljc Sat, 10 Jun 2017 12:00:00 +0100 + gcdemu (3.0.3-1ubuntu1~vivid1~ppa1) vivid; urgency=low * Updated to 3.0.3 -- Rok Mandeljc Tue, 11 Oct 2016 12:00:00 +0100 diff -Nru gcdemu-3.0.3/debian/control gcdemu-3.1.0/debian/control --- gcdemu-3.0.3/debian/control 2016-10-11 09:47:29.000000000 +0000 +++ gcdemu-3.1.0/debian/control 2017-06-10 21:29:17.000000000 +0000 @@ -4,14 +4,14 @@ Homepage: http://cdemu.sourceforge.net/ Maintainer: Henrik Stokseth Build-Depends: debhelper (>= 9) -Build-Depends-Indep: python (>= 2.6.6-3), libglib2.0-bin, intltool, cmake (>= 2.8.5) +Build-Depends-Indep: python (>= 2.6.6-3), libglib2.0-bin, intltool, cmake (>= 2.8.5), dh-python X-Python-Version: >= 2.6.6 Standards-Version: 3.9.7 Package: gcdemu Architecture: all -Depends: python (>= 2.6.6-3), python-gi (>= 3.0.0), gir1.2-glib-2.0, +Depends: python (>= 2.6.6-3), python-gi (>= 3.0.0), gir1.2-glib-2.0, gir1.2-gtk-3.0, gir1.2-appindicator3-0.1, gir1.2-notify-0.7, cdemu-daemon (>= 3.0.0), librsvg2-2, ${python:Depends}, ${misc:Depends} Recommends: cdemu-client (>= 3.0.0) @@ -20,7 +20,7 @@ the CDEmu suite, a free, GPL CD/DVD-ROM device emulator for Linux. . It provides a graphic interface that allows performing the key tasks related to - controlling the CDEmu daemon, such as loading and unloading devices, displaying + controlling the CDEmu daemon, such as loading and unloading devices, displaying devices' status and retrieving/setting devices' debug masks. . In addition, the application listens to the signals emitted by CDEmu daemon and diff -Nru gcdemu-3.0.3/po/ru.po gcdemu-3.1.0/po/ru.po --- gcdemu-3.0.3/po/ru.po 2016-10-11 09:47:29.000000000 +0000 +++ gcdemu-3.1.0/po/ru.po 2017-06-10 21:29:17.000000000 +0000 @@ -3,7 +3,6 @@ # This file is distributed under the same license as the gCDEmu package. # Grigorii Chirkov , 2006-2015. # -# msgid "" msgstr "" "Project-Id-Version: gCDEmu 3.0.0\n" @@ -224,7 +223,7 @@ "Failed to set daemon debug mask for device #%02d to 0x%X:\n" "%s" msgstr "" -"Не удалось установить отладочную маску демона для накопителя #%02d в " +"Не удалось установить отладочную маску демона для накопителя #%02d в " "значение 0x%X:\n" "%s" @@ -561,7 +560,7 @@ #: ../src/gcdemu:1776 msgid "translator-credits" -msgstr "Grigorii Chirkov " +msgstr "Grigorii Chirkov" #: ../src/gcdemu:1783 msgid "Devices" @@ -577,7 +576,7 @@ #: ../src/gcdemu:1814 msgid "About" -msgstr "О программе..." +msgstr "О программе" #: ../src/gcdemu:1822 msgid "Quit" diff -Nru gcdemu-3.0.3/README gcdemu-3.1.0/README --- gcdemu-3.0.3/README 2016-10-11 09:47:29.000000000 +0000 +++ gcdemu-3.1.0/README 2017-06-10 21:29:17.000000000 +0000 @@ -1,5 +1,5 @@ gCDEmu -3.0.3 +3.1.0 ~~~~~ Table of Contents: diff -Nru gcdemu-3.0.3/src/gcdemu gcdemu-3.1.0/src/gcdemu --- gcdemu-3.0.3/src/gcdemu 2016-10-11 09:47:29.000000000 +0000 +++ gcdemu-3.1.0/src/gcdemu 2017-06-10 21:29:17.000000000 +0000 @@ -27,8 +27,7 @@ import weakref # gettext -from gettext import gettext as _ -from gettext import bindtextdomain, textdomain +import gettext # Gtk, GObject, Notify, etc. import gi @@ -56,12 +55,15 @@ # *** Globals *** app_name = "gcdemu" -app_version = "3.0.3" +app_version = "3.1.0" supported_daemon_interface_version = [ 7, 0 ] # I18n -bindtextdomain(app_name) -textdomain(app_name) +if sys.version_info[0] < 3: + # Prior to python3, we need to explicitly enable unicode strings + gettext.install(app_name, unicode=True) +else: + gettext.install(app_name) # Set process name