Hello community, here is the log from the commit of package rednotebook for openSUSE:Factory checked in at 2016-07-01 10:00:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rednotebook (Old) and /work/SRC/openSUSE:Factory/.rednotebook.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rednotebook" Changes: -------- --- /work/SRC/openSUSE:Factory/rednotebook/rednotebook.changes 2016-04-22 16:25:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rednotebook.new/rednotebook.changes 2016-07-01 10:00:56.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Jun 27 18:08:24 UTC 2016 - zai...@opensuse.org + +- Update to version 1.13: + + When selecting a journal directory, show all journal + directories by default. + + Allow ampersands in e-mail addresses (lp#1570476). + + python-gtkspell has been renamed to python-gtkspellcheck. + Update docs and debian/control accordingly. + +------------------------------------------------------------------- Old: ---- rednotebook-1.12.tar.gz New: ---- rednotebook-1.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rednotebook.spec ++++++ --- /var/tmp/diff_new_pack.6KZLQ6/_old 2016-07-01 10:00:57.000000000 +0200 +++ /var/tmp/diff_new_pack.6KZLQ6/_new 2016-07-01 10:00:57.000000000 +0200 @@ -17,7 +17,7 @@ Name: rednotebook -Version: 1.12 +Version: 1.13 Release: 0 Summary: Graphical diary and journal License: GPL-3.0+ ++++++ rednotebook-1.12.tar.gz -> rednotebook-1.13.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.12/CHANGELOG new/rednotebook-1.13/CHANGELOG --- old/rednotebook-1.12/CHANGELOG 2016-03-28 20:56:20.000000000 +0200 +++ new/rednotebook-1.13/CHANGELOG 2016-06-17 20:15:31.000000000 +0200 @@ -1,3 +1,8 @@ +== 1.13 (2016-06-17) == +* When selecting a journal directory, show all journal directories by default (thanks Paul Jackson). +* Allow ampersands in e-mail addresses (lp:1570476, thanks pdofak). +* python-gtkspell has been renamed to python-gtkspellcheck. Update docs and debian/control accordingly. + == 1.12 (2016-03-28) == * Add option to hide right-hand tags pane (thanks Ron Brown, Jr.). * Never overwrite externally changed month files (thanks Felix Zörgiebel). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.12/PKG-INFO new/rednotebook-1.13/PKG-INFO --- old/rednotebook-1.12/PKG-INFO 2016-03-28 20:56:20.000000000 +0200 +++ new/rednotebook-1.13/PKG-INFO 2016-06-17 20:15:31.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: rednotebook -Version: 1.12 +Version: 1.13 Summary: Graphical daily journal with calendar, templates and keyword searching Home-page: http://rednotebook.sourceforge.net Author: Jendrik Seipp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.12/README.md new/rednotebook-1.13/README.md --- old/rednotebook-1.12/README.md 2016-03-28 19:09:55.000000000 +0200 +++ new/rednotebook-1.13/README.md 2016-05-09 10:07:23.000000000 +0200 @@ -5,13 +5,10 @@ templates, spell check your notes, and export to plain text, HTML, Latex or PDF. -# Run under Linux +# Run under Linux (without installation) $ ./run -Installs all dependencies, translates the application and runs -RedNotebook without installation. - # Run under Windows Install Python 2.7 (32-bit version), change into the `win` directory, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.12/po/oc.po new/rednotebook-1.13/po/oc.po --- old/rednotebook-1.12/po/oc.po 2016-03-28 20:54:32.000000000 +0200 +++ new/rednotebook-1.13/po/oc.po 2016-06-17 20:15:16.000000000 +0200 @@ -8,14 +8,14 @@ "Project-Id-Version: rednotebook\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2015-10-15 23:25+0200\n" -"PO-Revision-Date: 2015-11-01 21:13+0000\n" +"PO-Revision-Date: 2016-04-25 14:58+0000\n" "Last-Translator: Cédric VALMARY (Tot en òc) <cvalm...@yahoo.fr>\n" "Language-Team: Occitan (post 1500) <o...@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-11-02 05:08+0000\n" -"X-Generator: Launchpad (build 17838)\n" +"X-Launchpad-Export-Date: 2016-04-26 05:42+0000\n" +"X-Generator: Launchpad (build 17995)\n" #: ../rednotebook/backup.py:55 msgid "It has been a while since you made your last backup." @@ -47,7 +47,7 @@ #: ../rednotebook/gui/main_window.py:477 msgid "No directory selected." -msgstr "" +msgstr "Cap de dorsièr pas seleccionat." #: ../rednotebook/gui/main_window.py:569 #: ../rednotebook/gui/customwidgets.py:363 @@ -73,7 +73,7 @@ #: ../rednotebook/gui/format_menu.py:110 msgid "Monospace" -msgstr "" +msgstr "Monospace" #: ../rednotebook/gui/format_menu.py:112 msgid "Underline" @@ -90,7 +90,7 @@ #. Translators: Noun #: ../rednotebook/gui/format_menu.py:119 msgid "_Format" -msgstr "" +msgstr "_Format" #. Translators: Noun #: ../rednotebook/gui/format_menu.py:135 ../rednotebook/gui/exports.py:394 @@ -107,7 +107,7 @@ #: ../rednotebook/gui/customwidgets.py:366 msgid "Save and insert" -msgstr "" +msgstr "Enregistrar e inserir" #: ../rednotebook/gui/clouds.py:79 msgid "filter, these, comma, separated, words, and, #tags" @@ -115,7 +115,7 @@ #: ../rednotebook/gui/clouds.py:84 msgid "mtv, spam, work, job, play" -msgstr "" +msgstr "tf1, nòta, viste, job, jòc" #: ../rednotebook/gui/clouds.py:191 ../rednotebook/gui/categories.py:52 #: ../rednotebook/info.py:97 ../rednotebook/util/markup.py:136 @@ -138,7 +138,7 @@ #: ../rednotebook/gui/exports.py:47 msgid "Export currently visible day" -msgstr "" +msgstr "Exportar lo jorn actualament visible" #: ../rednotebook/gui/exports.py:50 msgid "Export days in the selected time range" @@ -154,7 +154,7 @@ #: ../rednotebook/gui/exports.py:108 msgid "Export currently selected text" -msgstr "" +msgstr "Exportar lo tèxte seleccionat" #: ../rednotebook/gui/exports.py:117 msgid "(Only available when text is selected in edit mode)" @@ -170,19 +170,19 @@ #: ../rednotebook/gui/exports.py:137 msgid "Export text and tags" -msgstr "" +msgstr "Exportar lo tèxte e las etiquetas" #: ../rednotebook/gui/exports.py:138 msgid "Export text only" -msgstr "" +msgstr "Exportar unicament lo tèxte" #: ../rednotebook/gui/exports.py:140 msgid "Export tags only" -msgstr "" +msgstr "Exportar unicament las etiquetas" #: ../rednotebook/gui/exports.py:142 msgid "Filter days by tags" -msgstr "" +msgstr "Filtrar los jorns per etiqueta" #: ../rednotebook/gui/exports.py:151 msgid "Available tags" @@ -252,7 +252,7 @@ #: ../rednotebook/gui/exports.py:401 msgid "Export selected text only" -msgstr "" +msgstr "Exportar unicament lo tèxte seleccionat" #: ../rednotebook/gui/exports.py:404 msgid "Start date" @@ -264,15 +264,15 @@ #: ../rednotebook/gui/exports.py:409 msgid "Include text" -msgstr "" +msgstr "Inclure lo tèxte" #: ../rednotebook/gui/exports.py:410 msgid "Include tags" -msgstr "" +msgstr "Inclure las etiquetas" #: ../rednotebook/gui/exports.py:412 msgid "Filtered by tags" -msgstr "" +msgstr "Flitrar per etiquetas" #: ../rednotebook/gui/exports.py:413 msgid "Export path" @@ -293,7 +293,7 @@ #: ../rednotebook/gui/exports.py:520 msgid "Plain Text" -msgstr "" +msgstr "Tèxte brut" #: ../rednotebook/gui/exports.py:547 msgid "requires pywebkitgtk" @@ -405,7 +405,7 @@ #: ../rednotebook/gui/menu.py:172 msgid "Wrong directory" -msgstr "" +msgstr "Marrit repertòri" #: ../rednotebook/gui/menu.py:175 ../rednotebook/journal.py:204 msgid "You cannot use this directory for your journal:" @@ -486,7 +486,7 @@ #: ../rednotebook/gui/options.py:188 msgid "Choose font" -msgstr "" +msgstr "Causissètz la poliça" #: ../rednotebook/gui/options.py:271 msgid "Close to system tray" @@ -620,7 +620,7 @@ #: ../rednotebook/gui/insert_menu.py:130 msgid "_Insert" -msgstr "" +msgstr "_Insercion" #: ../rednotebook/gui/insert_menu.py:152 msgid "Insert" @@ -636,7 +636,7 @@ #: ../rednotebook/gui/insert_menu.py:197 msgid "pixels" -msgstr "" +msgstr "pixèls" #: ../rednotebook/gui/insert_menu.py:217 msgid "Width must be an integer." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.12/rednotebook/configuration.py new/rednotebook-1.13/rednotebook/configuration.py --- old/rednotebook-1.12/rednotebook/configuration.py 2016-03-26 11:41:43.000000000 +0100 +++ new/rednotebook-1.13/rednotebook/configuration.py 2016-03-28 21:29:53.000000000 +0200 @@ -34,6 +34,7 @@ # mingliu and MS Mincho are required for displaying Asian fonts # in preview mode on Windows. 'previewFont': 'Ubuntu, mingliu, MS Mincho, sans-serif', + 'autoSwitchMode': 1, 'closeToTray': 0, 'checkForNewVersion': 0, 'showTagsPane': 1, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.12/rednotebook/external/txt2tags.py new/rednotebook-1.13/rednotebook/external/txt2tags.py --- old/rednotebook-1.12/rednotebook/external/txt2tags.py 2015-10-17 14:36:09.000000000 +0200 +++ new/rednotebook-1.13/rednotebook/external/txt2tags.py 2016-04-22 20:42:55.000000000 +0200 @@ -1925,10 +1925,11 @@ # Also works : scheme://user:pass@domain/path#anchor?query=foo # TODO form: !'(): ## JS: Add support for irc protocol. + ## JS: Allow ampersands in e-mail addresses. urlskel = { 'proto' : r'(https?|ftp|news|telnet|gopher|wais|irc[6s]?)://', 'guess' : r'(www[23]?|ftp)\.', # w/out proto, try to guess - 'login' : r'A-Za-z0-9_.-', # for ftp://lo...@domain.com + 'login' : r'A-Za-z0-9_.\-&', # for ftp://lo...@domain.com 'pass' : r'[^ @]*', # for ftp://login:p...@dom.com 'chars' : r'A-Za-z0-9%._/~:,=$@&+-', # %20(space), :80(port), D&D 'anchor': r'A-Za-z0-9%._-', # %nn(encoded) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.12/rednotebook/gui/browser.py new/rednotebook-1.13/rednotebook/gui/browser.py --- old/rednotebook-1.12/rednotebook/gui/browser.py 2015-10-17 14:40:18.000000000 +0200 +++ new/rednotebook-1.13/rednotebook/gui/browser.py 2016-05-09 09:56:44.000000000 +0200 @@ -30,8 +30,7 @@ import webkit except ImportError as err: logging.error( - 'Webkit was not found. It can be found in a package with the ' - 'name python-webkit or pywebkitgtk: %s' % err) + 'pywebkitgtk not found. Please install it (python-webkit): %s' % err) sys.exit(1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.12/rednotebook/gui/editor.py new/rednotebook-1.13/rednotebook/gui/editor.py --- old/rednotebook-1.12/rednotebook/gui/editor.py 2015-11-07 15:00:10.000000000 +0100 +++ new/rednotebook-1.13/rednotebook/gui/editor.py 2016-05-09 09:59:04.000000000 +0200 @@ -28,6 +28,8 @@ try: import gtkspell except ImportError: + logging.warning( + 'For spell checking, please install pygtkspellcheck (python-gtkspellcheck).') gtkspell = None from rednotebook.gui import t2t_highlight diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.12/rednotebook/gui/main_window.py new/rednotebook-1.13/rednotebook/gui/main_window.py --- old/rednotebook-1.12/rednotebook/gui/main_window.py 2016-03-27 18:44:13.000000000 +0200 +++ new/rednotebook-1.13/rednotebook/gui/main_window.py 2016-04-22 19:59:46.000000000 +0200 @@ -472,7 +472,7 @@ label = self.builder.get_object('dir_chooser_label') label.set_markup('<b>' + message + '</b>') - dir_chooser.set_current_folder(self.journal.dirs.data_dir) + dir_chooser.set_current_folder(os.path.dirname(self.journal.dirs.data_dir)) response = dir_chooser.run() # Retrieve the dir now, because it will be cleared by the call to hide(). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.12/rednotebook/gui/options.py new/rednotebook-1.13/rednotebook/gui/options.py --- old/rednotebook-1.12/rednotebook/gui/options.py 2016-03-27 18:44:35.000000000 +0200 +++ new/rednotebook-1.13/rednotebook/gui/options.py 2016-03-28 21:43:27.000000000 +0200 @@ -54,18 +54,21 @@ class TickOption(Option): - def __init__(self, text, name, value=None, default=0, tooltip=''): + def __init__(self, text, name, value=None, tooltip=''): Option.__init__(self, '', name, tooltip=tooltip) self.check_button = gtk.CheckButton(text) - if value is None: - self.check_button.set_active(Option.config.read(name, default) == 1) + self.check_button.set_active(Option.config.read(name) == 1) else: self.check_button.set_active(value) - + self.check_button.connect('clicked', self.on_check_button_clicked) self.pack_start(self.check_button, False) + def on_check_button_clicked(self, widget): + pass + # TODO: Apply corresponding actions. + def get_value(self): return self.check_button.get_active() @@ -78,12 +81,11 @@ class AutostartOption(TickOption): def __init__(self): - home_dir = os.path.expanduser('~') - autostart_dir = os.path.join(home_dir, '.config/autostart/') - self.autostart_file = os.path.join(autostart_dir, 'rednotebook.desktop') + self.autostart_file = os.path.expanduser( + '~.config/autostart/rednotebook.desktop') autostart_file_exists = os.path.exists(self.autostart_file) - TickOption.__init__(self, _('Load RedNotebook at startup'), None, - value=autostart_file_exists) + TickOption.__init__( + self, _('Load RedNotebook at startup'), None, value=autostart_file_exists) def get_value(self): return self.check_button.get_active() @@ -268,18 +270,24 @@ # closed. The option can still be activated in the configuration file. if filesystem.has_system_tray(): self.options.append(TickOption( - _('Close to system tray'), 'closeToTray', + _('Close to system tray'), + 'closeToTray', tooltip=_('Closing the window will send RedNotebook to the tray'))) # Automatic switching between preview and edit mode. - self.options.append(TickOption(_('Switch between edit and preview mode automatically'), - 'autoSwitchMode', default=0)) + self.options.append(TickOption( + _('Switch between edit and preview mode automatically'), + 'autoSwitchMode')) # Check for new version - check_version_option = TickOption(_('Check for new version at startup'), 'checkForNewVersion') + check_version_option = TickOption( + _('Check for new version at startup'), + 'checkForNewVersion') # Enable/Disable right-hand pane - self.options.append(TickOption(_('Show right-side tags pane'), 'showTagsPane')) + self.options.append(TickOption( + _('Show right-side tags pane'), + 'showTagsPane')) def check_version_action(widget): utils.check_new_version(self.main_window.journal, info.version) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.12/rednotebook/info.py new/rednotebook-1.13/rednotebook/info.py --- old/rednotebook-1.12/rednotebook/info.py 2016-03-28 20:54:32.000000000 +0200 +++ new/rednotebook-1.13/rednotebook/info.py 2016-06-17 20:15:16.000000000 +0200 @@ -26,7 +26,7 @@ return string -version = '1.12' +version = '1.13' author = 'Jendrik Seipp' author_mail = 'jendrikse...@web.de' url = 'http://rednotebook.sourceforge.net' @@ -295,13 +295,13 @@ == Spellcheck == -RedNotebook supports spellchecking your entries. On Linux this feature -needs the package ``python-gtkspell``. The feature can be turned on and -off by toggling the item under the "Edit" menu. - -Since gtkspell 2.0.15, you can select the spellchecking language by -right-clicking on the main text area (in edit mode) and choosing it -from the submenu "Languages". +RedNotebook supports spellchecking your entries. This feature needs the +pygtkspellcheck library (``python-gtkspellcheck`` on Ubuntu, +``gnome-python2-gtkspell`` on Fedora). Spellchecking can be turned on +and off by toggling the menu item in the "Edit" menu. + +You can select the spellchecking language by right-clicking on the main +text area (in edit mode) and choosing it from the submenu "Languages". === Adding custom dictionaries under Windows === diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.12/rednotebook/journal.py new/rednotebook-1.13/rednotebook/journal.py --- old/rednotebook-1.12/rednotebook/journal.py 2015-11-08 09:57:23.000000000 +0100 +++ new/rednotebook-1.13/rednotebook/journal.py 2016-05-09 09:55:19.000000000 +0200 @@ -135,7 +135,7 @@ if not sys.platform == 'win32': pygtk.require("2.0") except ImportError: - logging.error('pygtk not found. Please install PyGTK (python-gtk2)') + logging.error('PyGTK not found. Please install it (python-gtk2).') sys.exit(1) try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.12/rednotebook/storage.py new/rednotebook-1.13/rednotebook/storage.py --- old/rednotebook-1.12/rednotebook/storage.py 2016-03-26 11:41:43.000000000 +0100 +++ new/rednotebook-1.13/rednotebook/storage.py 2016-05-09 09:55:43.000000000 +0200 @@ -29,7 +29,7 @@ try: import yaml except ImportError: - logging.error('PyYAML not found. Please install python-yaml or PyYAML') + logging.error('PyYAML not found. Please install it (python-yaml).') sys.exit(1) # The presence of the yaml module has been checked diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rednotebook-1.12/run new/rednotebook-1.13/run --- old/rednotebook-1.12/run 2016-03-28 18:46:33.000000000 +0200 +++ new/rednotebook-1.13/run 2016-05-09 10:43:30.000000000 +0200 @@ -1,103 +1,15 @@ -#!/bin/sh +#! /bin/bash # -# Little helper script that installs all dependencies for RedNotebook and runs -# it without installing. The script should work on all Ubuntu and Debian based -# distros, Fedora and OpenSUSE. +# Little helper script that runs RedNotebook without installing it. # -# Most of the code was taken from the gnome-shell build script. -# Copyright (C) 2008, Red Hat, Inc. +# Note: No need to translate strings locally, since they won't be +# picked up anyway. # -#set -e # Cannot be set, because the check for python may fail and we want to continue. +set -euo pipefail -# Change into RedNotebook directory -------------------------------------------- +# Change into RedNotebook directory. +cd "$(dirname "$0")" -BASEDIR="$(dirname "$0")" -cd $BASEDIR - -# Install dependencies --------------------------------------------------------- - -PKGS_DEB="python-gtk2 python-gtkspell python-yaml python-webkit" -PKGS_FEDORA="pygtk2 gnome-python2-extras PyYAML pywebkitgtk" -PKGS_OPENSUSE="python-gtk python-yaml python-webkitgtk" - -release_file= - -if which lsb_release > /dev/null 2>&1; then - system=`lsb_release -is` - version=`lsb_release -rs` -elif [ -f /etc/fedora-release ] ; then - system=Fedora - release_file=/etc/fedora-release -elif [ -f /etc/SuSE-release ] ; then - system=SUSE - release_file=/etc/SuSE-release -fi - -if [ x$release_file != x ] ; then - version=`sed 's/[^0-9\.]*\([0-9\.]\+\).*/\1/' < $release_file` -fi - -if test "x$system" = xUbuntu -o "x$system" = xDebian -o "x$system" = xLinuxMint ; then - reqd=$PKGS_DEB - - if [ ! -x /usr/bin/dpkg-checkbuilddeps ]; then - echo "Please run 'sudo apt-get install dpkg-dev' and try again." - echo - exit 1 - fi - - for pkg in $reqd ; do - if ! dpkg-checkbuilddeps -d $pkg /dev/null 2> /dev/null; then - missing="$pkg $missing" - fi - done - if test ! "x$missing" = x; then - echo "You need to enter your password to install the missing packages $missing" - sudo apt-get install $missing - fi -fi - -if test "x$system" = xFedora ; then - reqd=$PKGS_FEDORA - - for pkg in $reqd ; do - if ! rpm -q $pkg > /dev/null 2>&1; then - missing="$pkg $missing" - fi - done - if test ! "x$missing" = x; then - gpk-install-package-name $missing - fi -fi - -if test "x$system" = xSUSE -o "x$system" = "xSUSE LINUX" ; then - reqd="" - for pkg in $PKGS_OPENSUSE ; do - if ! rpm -q $pkg > /dev/null 2>&1; then - reqd="$pkg $reqd" - fi - done - if test ! "x$reqd" = x; then - echo "Please run 'su --command=\"zypper install $reqd\"' and try again." - echo - exit 1 - fi -fi - -# Run RedNotebook with the newest python2 version available -------------------- - -for PYTHON in python2.7; do - echo Checking for $PYTHON - # Returns 0 if command is found. - command -v $PYTHON >/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo Running $PYTHON - $PYTHON -V - $PYTHON rednotebook/journal.py "$@" - exit 0 - fi -done - -echo Error: No python interpreter found. -exit 1 +# Run RedNotebook. +python2.7 rednotebook/journal.py "$@"
