Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2013-10-21 12:30:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meld" Changes: -------- --- /work/SRC/openSUSE:Factory/meld/meld.changes 2013-09-23 15:25:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes 2013-10-21 12:30:14.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Oct 20 11:33:25 UTC 2013 - [email protected] + +- Update to version 1.8.2: + + Fix regression selecting Subversion 1.6 repositories. + + Fix for unicode usernames on Windows; note that this change + also moves Meld config from the remote to the local app data + folder. + + Add copyright string to appdata file. + + Updated translations. + +------------------------------------------------------------------- Old: ---- meld-1.8.1.tar.xz New: ---- meld-1.8.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.YdW8pd/_old 2013-10-21 12:30:14.000000000 +0200 +++ /var/tmp/diff_new_pack.YdW8pd/_new 2013-10-21 12:30:14.000000000 +0200 @@ -17,7 +17,7 @@ Name: meld -Version: 1.8.1 +Version: 1.8.2 Release: 0 Summary: Visual diff and merge tool License: GPL-2.0+ ++++++ meld-1.8.1.tar.xz -> meld-1.8.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-1.8.1/NEWS new/meld-1.8.2/NEWS --- old/meld-1.8.1/NEWS 2013-09-22 00:47:41.000000000 +0200 +++ new/meld-1.8.2/NEWS 2013-10-17 22:57:02.000000000 +0200 @@ -1,3 +1,19 @@ +2013-10-18 meld 1.8.2 +===================== + + Fixes: + + * Fix regression selecting Subversion 1.6 repositories (Kai Willadsen) + * Fix for unicode usernames on Windows; note that this change also moves + Meld config from the remote to the local app data folder (Kai Willadsen) + * Add copyright string to appdata file (Kai Willadsen) + + Translations: + + * Fran Diéguez (gl) + * Matej Urbančič (sl) + + 2013-9-22 meld 1.8.1 ==================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-1.8.1/data/meld.appdata.xml new/meld-1.8.2/data/meld.appdata.xml --- old/meld-1.8.1/data/meld.appdata.xml 2013-09-22 00:47:41.000000000 +0200 +++ new/meld-1.8.2/data/meld.appdata.xml 2013-10-17 22:57:02.000000000 +0200 @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright 2013 Kai Willadsen <[email protected]> --> <application> <id type="desktop">meld.desktop</id> <licence>CC0</licence> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-1.8.1/meld/meldapp.py new/meld-1.8.2/meld/meldapp.py --- old/meld-1.8.1/meld/meldapp.py 2013-09-22 00:47:41.000000000 +0200 +++ new/meld-1.8.2/meld/meldapp.py 2013-10-17 22:57:02.000000000 +0200 @@ -32,7 +32,7 @@ from . import preferences from . import recent -version = "1.8.1" +version = "1.8.2" class MeldApp(gobject.GObject): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-1.8.1/meld/recent.py new/meld-1.8.2/meld/recent.py --- old/meld-1.8.1/meld/recent.py 2013-09-22 00:47:41.000000000 +0200 +++ new/meld-1.8.2/meld/recent.py 2013-10-17 22:57:02.000000000 +0200 @@ -28,6 +28,7 @@ import ConfigParser import os +import sys import tempfile from gettext import gettext as _ @@ -48,7 +49,9 @@ class RecentFiles(object): - recent_path = os.path.join(glib.get_user_data_dir(), "meld") + recent_dirname = "Meld" if sys.platform == "win32" else "meld" + recent_path = os.path.join(glib.get_user_data_dir(), recent_dirname) + recent_path = recent_path.decode('utf8') recent_suffix = ".meldcmp" # Recent data diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-1.8.1/meld/util/prefs.py new/meld-1.8.2/meld/util/prefs.py --- old/meld-1.8.1/meld/util/prefs.py 2013-09-22 00:47:41.000000000 +0200 +++ new/meld-1.8.2/meld/util/prefs.py 2013-10-17 22:57:02.000000000 +0200 @@ -189,7 +189,8 @@ } if sys.platform == "win32": - pref_dir = os.path.join(os.getenv("APPDATA"), "Meld") + config_dir = glib.get_user_config_dir().decode('utf8') + pref_dir = os.path.join(config_dir, "Meld") else: pref_dir = os.path.join(glib.get_user_config_dir(), "meld") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-1.8.1/meld/vc/__init__.py new/meld-1.8.2/meld/vc/__init__.py --- old/meld-1.8.1/meld/vc/__init__.py 2013-09-22 00:47:41.000000000 +0200 +++ new/meld-1.8.2/meld/vc/__init__.py 2013-10-17 22:57:02.000000000 +0200 @@ -30,7 +30,7 @@ def load_plugins(): _vcdir = os.path.dirname(os.path.abspath(__file__)) ret = [] - for plugin in glob.glob(os.path.join(_vcdir, "[a-z]*.py")): + for plugin in sorted(glob.glob(os.path.join(_vcdir, "[a-z]*.py"))): modname = "meld.vc.%s" % os.path.basename(os.path.splitext(plugin)[0]) ret.append( __import__(modname, globals(), locals(), "*") ) return ret @@ -73,24 +73,21 @@ """ vcs = [] - max_depth = 0 for plugin in _plugins: try: vc = plugin.Vc(location) except ValueError: continue + vcs.append(vc) - # Choose the deepest root we find, unless it's from a VC that - # doesn't walk; these can be spurious as the real root may be - # much higher up in the tree. - depth = len(vc.root) - if depth > max_depth and vc.VC_ROOT_WALK: - vcs, max_depth = [], depth - if depth >= max_depth: - vcs.append(vc) + # Choose the deepest root we find, unless it's from a VC that + # doesn't walk; these can be spurious as the real root may be + # much higher up in the tree. + max_depth = max(len(vc.root) for vc in vcs if vc.VC_ROOT_WALK) + vcs = [vc for vc in vcs if not vc.VC_ROOT_WALK or + (len(vc.root) == max_depth and vc.VC_ROOT_WALK)] if not vcs: - # No plugin recognized that location, fallback to _null return [_null.Vc(location)] vc_sort_key = lambda v: vc_sort_order.index(v.NAME) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-1.8.1/po/gl.po new/meld-1.8.2/po/gl.po --- old/meld-1.8.1/po/gl.po 2013-09-22 00:47:41.000000000 +0200 +++ new/meld-1.8.2/po/gl.po 2013-10-17 22:57:02.000000000 +0200 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: Stephen Kennedy <[email protected]>\n" -"POT-Creation-Date: 2013-08-27 02:01+0200\n" -"PO-Revision-Date: 2013-08-27 01:57+0200\n" +"POT-Creation-Date: 2013-09-23 01:13+0200\n" +"PO-Revision-Date: 2013-09-23 01:13+0200\n" "Last-Translator: Fran Dieguez <[email protected]>\n" "Language-Team: [email protected]\n" "Language: gl\n" @@ -192,10 +192,10 @@ #: ../data/ui/meldapp.ui.h:2 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2012 Kai Willadsen" +"Copyright © 2009-2013 Kai Willadsen" msgstr "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2012 Kai Willadsen" +"Copyright © 2009-2013 Kai Willadsen" #: ../data/ui/meldapp.ui.h:4 msgid "" @@ -553,7 +553,7 @@ msgid "Delete selected" msgstr "Eliminar o seleccionado" -#: ../meld/dirdiff.py:273 ../meld/filediff.py:1366 ../meld/filediff.py:1401 +#: ../meld/dirdiff.py:273 ../meld/filediff.py:1368 ../meld/filediff.py:1403 msgid "Hide" msgstr "Ocultar" @@ -668,8 +668,8 @@ msgid "'%s' hidden by '%s'" msgstr "«%s» agochado por «%s»" -#: ../meld/dirdiff.py:805 ../meld/filediff.py:1094 ../meld/filediff.py:1370 -#: ../meld/filediff.py:1403 +#: ../meld/dirdiff.py:805 ../meld/filediff.py:1096 ../meld/filediff.py:1372 +#: ../meld/filediff.py:1405 msgid "Hi_de" msgstr "Ocu_ltar" @@ -948,42 +948,42 @@ "O filtro «%s» cambiou o número de liñas no ficheiro. A comparación será " "incorrecta. Ver o manual de usuario para máis detalles." -#: ../meld/filediff.py:1082 +#: ../meld/filediff.py:1084 #, python-format msgid "[%s] Set num panes" msgstr "[%s] Estabelecer número de paneis" -#: ../meld/filediff.py:1088 +#: ../meld/filediff.py:1090 #, python-format msgid "[%s] Opening files" msgstr "[%s] Abrindo os ficheiros" -#: ../meld/filediff.py:1112 ../meld/filediff.py:1122 ../meld/filediff.py:1135 -#: ../meld/filediff.py:1141 +#: ../meld/filediff.py:1114 ../meld/filediff.py:1124 ../meld/filediff.py:1137 +#: ../meld/filediff.py:1143 msgid "Could not read file" msgstr "Non foi posíbel ler o ficheiro" -#: ../meld/filediff.py:1113 +#: ../meld/filediff.py:1115 #, python-format msgid "[%s] Reading files" msgstr "[%s] Lendo os ficheiros" -#: ../meld/filediff.py:1123 +#: ../meld/filediff.py:1125 #, python-format msgid "%s appears to be a binary file." msgstr "%s semella ser un ficheiro binario." -#: ../meld/filediff.py:1136 +#: ../meld/filediff.py:1138 #, python-format msgid "%s is not in encodings: %s" msgstr "%s non está na codificación: %s" -#: ../meld/filediff.py:1170 +#: ../meld/filediff.py:1172 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Calculando as diferenzas" -#: ../meld/filediff.py:1357 +#: ../meld/filediff.py:1359 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -991,19 +991,19 @@ "Se están usando filtros de texto, e poden estar agochando diferenzas entre " "ficheiros. Quere comparar os ficheiros non filtrados?" -#: ../meld/filediff.py:1363 +#: ../meld/filediff.py:1365 msgid "Files are identical" msgstr "Os ficheiros son idénticos" -#: ../meld/filediff.py:1373 +#: ../meld/filediff.py:1375 msgid "Show without filters" msgstr "Mostrar sen filtros" -#: ../meld/filediff.py:1395 +#: ../meld/filediff.py:1397 msgid "Change highlighting incomplete" msgstr "Cambiar realzado incompleto" -#: ../meld/filediff.py:1396 +#: ../meld/filediff.py:1398 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." @@ -1012,15 +1012,15 @@ "Meld que vote máis tempo realzando cambios máis largos, porén isto pode ser " "lento." -#: ../meld/filediff.py:1405 +#: ../meld/filediff.py:1407 msgid "Keep highlighting" msgstr "Manter realzado" -#: ../meld/filediff.py:1407 +#: ../meld/filediff.py:1409 msgid "_Keep highlighting" msgstr "_Manter realzado" -#: ../meld/filediff.py:1539 +#: ../meld/filediff.py:1541 #, python-format msgid "" "\"%s\" exists!\n" @@ -1029,7 +1029,7 @@ "\"%s\" existe!\n" "Sobrescribir?" -#: ../meld/filediff.py:1552 +#: ../meld/filediff.py:1554 #, python-format msgid "" "Error writing to %s\n" @@ -1040,19 +1040,19 @@ "\n" "%s." -#: ../meld/filediff.py:1563 +#: ../meld/filediff.py:1565 msgid "Save Left Pane As" msgstr "Gardar panel da esquerda como" -#: ../meld/filediff.py:1565 +#: ../meld/filediff.py:1567 msgid "Save Middle Pane As" msgstr "Gardar panel intermedio como" -#: ../meld/filediff.py:1567 +#: ../meld/filediff.py:1569 msgid "Save Right Pane As" msgstr "Gardar panel da dereita como" -#: ../meld/filediff.py:1588 +#: ../meld/filediff.py:1590 #, python-format msgid "" "This file '%s' contains a mixture of line endings.\n" @@ -1063,7 +1063,7 @@ "\n" "Que formato quere usar?" -#: ../meld/filediff.py:1604 +#: ../meld/filediff.py:1606 #, python-format msgid "" "'%s' contains characters not encodable with '%s'\n" @@ -1072,11 +1072,11 @@ "«%s» contén caracteres non codificábeis con «%s»\n" "Quere gardar como UTF-8?" -#: ../meld/filediff.py:1972 +#: ../meld/filediff.py:1974 msgid "Live comparison updating disabled" msgstr "Actualización de comparación en vivo desactivada" -#: ../meld/filediff.py:1973 +#: ../meld/filediff.py:1975 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1703,27 +1703,27 @@ "Erro na expresión regular\n" "«%s»" -#: ../meld/ui/historyentry.py:375 +#: ../meld/ui/historyentry.py:381 msgid "_Browse..." msgstr "E_xaminar..." -#: ../meld/ui/historyentry.py:383 +#: ../meld/ui/historyentry.py:389 msgid "Path" msgstr "Ruta" -#: ../meld/ui/historyentry.py:384 +#: ../meld/ui/historyentry.py:390 msgid "Path to file" msgstr "Ruta ao ficheiro" -#: ../meld/ui/historyentry.py:385 +#: ../meld/ui/historyentry.py:391 msgid "Pop up a file selector to choose a file" msgstr "Mostrar un selector para escoller un ficheiro" -#: ../meld/ui/historyentry.py:523 +#: ../meld/ui/historyentry.py:529 msgid "Select directory" msgstr "Seleccionar cartafol" -#: ../meld/ui/historyentry.py:527 +#: ../meld/ui/historyentry.py:533 msgid "Select file" msgstr "Seleccionar ficheiro" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-1.8.1/po/sl.po new/meld-1.8.2/po/sl.po --- old/meld-1.8.1/po/sl.po 2013-09-22 00:47:41.000000000 +0200 +++ new/meld-1.8.2/po/sl.po 2013-10-17 22:57:02.000000000 +0200 @@ -2,15 +2,15 @@ # Copyright (C) 2009 meld's COPYRIGHT HOLDER # This file is distributed under the same license as the meld package. # -# Matej Urbančič <[email protected]>, 2009 - 2013. +# Matej Urbančič <[email protected]>, 2009-2013. # msgid "" msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; "product=meld&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-08-31 23:09+0000\n" -"PO-Revision-Date: 2013-09-01 22:30+0100\n" +"POT-Creation-Date: 2013-09-21 23:03+0000\n" +"PO-Revision-Date: 2013-09-22 21:40+0100\n" "Last-Translator: Matej Urbančič <[email protected]>\n" "Language-Team: Slovenian GNOME Translation Team <[email protected]>\n" "Language: sl_SI\n" @@ -189,10 +189,10 @@ #: ../data/ui/meldapp.ui.h:2 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2012 Kai Willadsen" +"Copyright © 2009-2013 Kai Willadsen" msgstr "" "Avtorske pravice © 2002-2009 Stephen Kennedy\n" -"Avtorske pravice © 2009-2012 Kai Willadsen" +"Avtorske pravice © 2009-2013 Kai Willadsen" #: ../data/ui/meldapp.ui.h:4 msgid "" @@ -547,7 +547,7 @@ msgid "Delete selected" msgstr "Izbriši izbor" -#: ../meld/dirdiff.py:273 ../meld/filediff.py:1366 ../meld/filediff.py:1401 +#: ../meld/dirdiff.py:273 ../meld/filediff.py:1368 ../meld/filediff.py:1403 msgid "Hide" msgstr "Skrij" @@ -662,8 +662,8 @@ msgid "'%s' hidden by '%s'" msgstr "'%s' je skrit; '%s'" -#: ../meld/dirdiff.py:805 ../meld/filediff.py:1094 ../meld/filediff.py:1370 -#: ../meld/filediff.py:1403 +#: ../meld/dirdiff.py:805 ../meld/filediff.py:1096 ../meld/filediff.py:1372 +#: ../meld/filediff.py:1405 msgid "Hi_de" msgstr "S_krij" @@ -954,42 +954,42 @@ "Po uporabi filtra '%s' se je spremenilo število vrstic v datoteki, zato " "primerjava ne bo natančna. Za več podrobnosti si oglejte priročnik." -#: ../meld/filediff.py:1082 +#: ../meld/filediff.py:1084 #, python-format msgid "[%s] Set num panes" msgstr "[%s] Določi okna" -#: ../meld/filediff.py:1088 +#: ../meld/filediff.py:1090 #, python-format msgid "[%s] Opening files" msgstr "[%s] Odpiranje datotek" -#: ../meld/filediff.py:1112 ../meld/filediff.py:1122 ../meld/filediff.py:1135 -#: ../meld/filediff.py:1141 +#: ../meld/filediff.py:1114 ../meld/filediff.py:1124 ../meld/filediff.py:1137 +#: ../meld/filediff.py:1143 msgid "Could not read file" msgstr "Ni mogoče prebrati datoteke" -#: ../meld/filediff.py:1113 +#: ../meld/filediff.py:1115 #, python-format msgid "[%s] Reading files" msgstr "[%s] Branje datotek" -#: ../meld/filediff.py:1123 +#: ../meld/filediff.py:1125 #, python-format msgid "%s appears to be a binary file." msgstr "%s je videti kot dvojiška datoteka." -#: ../meld/filediff.py:1136 +#: ../meld/filediff.py:1138 #, python-format msgid "%s is not in encodings: %s" msgstr "%s ni zapisan v naboru: %s" -#: ../meld/filediff.py:1170 +#: ../meld/filediff.py:1172 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Računanje razlik" -#: ../meld/filediff.py:1357 +#: ../meld/filediff.py:1359 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -997,19 +997,19 @@ "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. " "Ali naj se primerja vsebina brez dejavnih filtrov?" -#: ../meld/filediff.py:1363 +#: ../meld/filediff.py:1365 msgid "Files are identical" msgstr "Datoteki sta enaki" -#: ../meld/filediff.py:1373 +#: ../meld/filediff.py:1375 msgid "Show without filters" msgstr "Pokaži brez filtrov" -#: ../meld/filediff.py:1395 +#: ../meld/filediff.py:1397 msgid "Change highlighting incomplete" msgstr "Spremeni označevanje kot nedokončano" -#: ../meld/filediff.py:1396 +#: ../meld/filediff.py:1398 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." @@ -1017,15 +1017,15 @@ "Nekaterih sprememb ni mogoče poudariti, ker so prevelike. Označevanje je " "mogoče vsiliti, vendar je postopek lahko zelo dolgotrajen." -#: ../meld/filediff.py:1405 +#: ../meld/filediff.py:1407 msgid "Keep highlighting" msgstr "Poudarjanje skladnje" -#: ../meld/filediff.py:1407 +#: ../meld/filediff.py:1409 msgid "_Keep highlighting" msgstr "_Poudarjanje skladnje" -#: ../meld/filediff.py:1539 +#: ../meld/filediff.py:1541 #, python-format msgid "" "\"%s\" exists!\n" @@ -1034,7 +1034,7 @@ "\"%s\" že obstaja!\n" "Ali naj bo datoteka prepisana?" -#: ../meld/filediff.py:1552 +#: ../meld/filediff.py:1554 #, python-format msgid "" "Error writing to %s\n" @@ -1045,19 +1045,19 @@ "\n" "%s." -#: ../meld/filediff.py:1563 +#: ../meld/filediff.py:1565 msgid "Save Left Pane As" msgstr "Shrani levi pladenj kot" -#: ../meld/filediff.py:1565 +#: ../meld/filediff.py:1567 msgid "Save Middle Pane As" msgstr "Shrani srednji pladenj kot" -#: ../meld/filediff.py:1567 +#: ../meld/filediff.py:1569 msgid "Save Right Pane As" msgstr "Shrani desni pladenj kot" -#: ../meld/filediff.py:1588 +#: ../meld/filediff.py:1590 #, python-format msgid "" "This file '%s' contains a mixture of line endings.\n" @@ -1068,7 +1068,7 @@ "\n" "Kateri zapis želite uporabiti?" -#: ../meld/filediff.py:1604 +#: ../meld/filediff.py:1606 #, python-format msgid "" "'%s' contains characters not encodable with '%s'\n" @@ -1077,11 +1077,11 @@ "'%s' vsebuje znake, ki jih ni mogoče kodirati v naboru '%s'\n" "Ali naj se datoteka shrani v naboru UTF-8?" -#: ../meld/filediff.py:1972 +#: ../meld/filediff.py:1974 msgid "Live comparison updating disabled" msgstr "Živo posodabljanje ob primerjavi je onemogočeno" -#: ../meld/filediff.py:1973 +#: ../meld/filediff.py:1975 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
