[Pkg-sugar-commit] [sugar-toolkit] 62/118: Drop obsolete patch syncing with upstream Git HEAD.
Jonas Smedegaard
dr at jones.dk
Thu Apr 16 18:49:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
js pushed a commit to annotated tag debian/0.84.10-1
in repository sugar-toolkit.
commit b059cd8fe7d79daf0849a0a8ff540af54c86fcdf
Author: Jonas Smedegaard <dr at jones.dk>
Date: Thu Dec 3 14:59:27 2009 +0100
Drop obsolete patch syncing with upstream Git HEAD.
---
debian/patches/0001_sync_git_head.patch | 324 --------------------------------
debian/patches/series | 1 -
2 files changed, 325 deletions(-)
diff --git a/debian/patches/0001_sync_git_head.patch b/debian/patches/0001_sync_git_head.patch
deleted file mode 100644
index dac40fb..0000000
--- a/debian/patches/0001_sync_git_head.patch
+++ /dev/null
@@ -1,324 +0,0 @@
-diff --git a/po/ar.po b/po/ar.po
-index f4e9b3e..b5840f9 100644
---- a/po/ar.po
-+++ b/po/ar.po
-@@ -1,33 +1,34 @@
- # translation of sugar.po to Arabic
--# Khaled Hosny <khaledhosny at eglug.org>, 2007, 2008.
-+# Khaled Hosny <khaledhosny at eglug.org>, 2007, 2008, 2009.
- # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
- # This file is distributed under the same license as the PACKAGE package.
- msgid ""
- msgstr ""
- "Project-Id-Version: sugar\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2008-06-24 00:07+0530\n"
--"PO-Revision-Date: 2008-08-07 17:03-0400\n"
-+"POT-Creation-Date: 2009-04-29 17:35-0400\n"
-+"PO-Revision-Date: 2009-08-28 14:07-0400\n"
- "Last-Translator: Khaled Hosny <khaledhosny at eglug.org>\n"
- "Language-Team: Arabic <doc at arabeyes.org>\n"
-+"Language: ar\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n>=3 && "
- "n<=10 ? 3 : n>=11 && n<=99 ? 4 : 5;\n"
--"X-Generator: Pootle 1.1.0rc2\n"
-+"X-Generator: Pootle 1.2.1\n"
- "Nplurals=6; Plural=N==0 ? 0: n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 "
- ": n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
--#: ../src/sugar/activity/activity.py:120
-+#: ../src/sugar/activity/activity.py:123
- msgid "Share with:"
- msgstr "شارِك مع:"
-
--#: ../src/sugar/activity/activity.py:122
-+#: ../src/sugar/activity/activity.py:125
- msgid "Private"
- msgstr "خاص"
-
--#: ../src/sugar/activity/activity.py:123
-+#: ../src/sugar/activity/activity.py:126
- msgid "My Neighborhood"
- msgstr "جِوارِي"
-
-@@ -35,150 +36,183 @@ msgstr "جِوارِي"
- # TODO: Implement stopping downloads
- # self._stop_item.connect('activate', self._stop_item_activate_cb)
- # self.append_menu_item(self._stop_item)
--#: ../src/sugar/activity/activity.py:130
-+#: ../src/sugar/activity/activity.py:133
-+#: ../src/sugar/activity/namingalert.py:84
- msgid "Keep"
- msgstr "احفظ"
-
--#: ../src/sugar/activity/activity.py:136
-+#: ../src/sugar/activity/activity.py:144
- msgid "Stop"
- msgstr "قف"
-
--#: ../src/sugar/activity/activity.py:251
-+#: ../src/sugar/activity/activity.py:258
- msgid "Undo"
- msgstr "تراجع"
-
--#: ../src/sugar/activity/activity.py:256
-+#: ../src/sugar/activity/activity.py:263
- msgid "Redo"
- msgstr "أعِد"
-
--#: ../src/sugar/activity/activity.py:266
-+#: ../src/sugar/activity/activity.py:273
- msgid "Copy"
- msgstr "انسخ"
-
--#: ../src/sugar/activity/activity.py:271
-+#: ../src/sugar/activity/activity.py:278
- msgid "Paste"
- msgstr "الصق"
-
--#: ../src/sugar/activity/activity.py:297
-+#: ../src/sugar/activity/activity.py:304
- msgid "Activity"
- msgstr "النشاط"
-
--#: ../src/sugar/activity/activity.py:469
-+#: ../src/sugar/activity/activity.py:543
- #, python-format
- msgid "%s Activity"
- msgstr "نشاط %s"
-
--#: ../src/sugar/activity/activity.py:856
-+#: ../src/sugar/activity/activity.py:924
- msgid "Keep error"
- msgstr "خطأ في الحفظ"
-
--#: ../src/sugar/activity/activity.py:857
-+#: ../src/sugar/activity/activity.py:925
- msgid "Keep error: all changes will be lost"
- msgstr "خطأ في الحفظ: ستُفقد كل التغييرات"
-
--#: ../src/sugar/activity/activity.py:860
-+#: ../src/sugar/activity/activity.py:928
- msgid "Don't stop"
- msgstr "لا تتوقف"
-
--#: ../src/sugar/activity/activity.py:863
-+#: ../src/sugar/activity/activity.py:931
- msgid "Stop anyway"
- msgstr "توقف على أي حال"
-
--#: ../src/sugar/graphics/alert.py:166 ../src/sugar/graphics/alert.py:209
-+#: ../src/sugar/activity/namingalert.py:79
-+msgid "Name this entry"
-+msgstr "سمّ هذه المدخلة"
-+
-+#: ../src/sugar/activity/namingalert.py:275
-+msgid "Untitled"
-+msgstr "بدون عنوان"
-+
-+#: ../src/sugar/activity/namingalert.py:282
-+msgid "Description:"
-+msgstr "الوصف:"
-+
-+#: ../src/sugar/activity/namingalert.py:306
-+msgid "Tags:"
-+msgstr "الوُسوم:"
-+
-+#: ../src/sugar/graphics/alert.py:288 ../src/sugar/graphics/alert.py:367
- msgid "Cancel"
- msgstr "ألغِ"
-
--#: ../src/sugar/graphics/alert.py:170 ../src/sugar/graphics/alert.py:247
-+#: ../src/sugar/graphics/alert.py:292 ../src/sugar/graphics/alert.py:426
- msgid "Ok"
- msgstr "حسنا"
-
--#: ../src/sugar/graphics/alert.py:219
-+#: ../src/sugar/graphics/alert.py:377
- msgid "Continue"
- msgstr "واصِل"
-
--#: ../src/sugar/util.py:181
-+#: ../src/sugar/graphics/colorbutton.py:49
-+msgid "Choose a color"
-+msgstr "اختر لونا"
-+
-+#: ../src/sugar/graphics/colorbutton.py:267
-+msgid "Red"
-+msgstr "أحمر"
-+
-+#: ../src/sugar/graphics/colorbutton.py:269
-+msgid "Green"
-+msgstr "أخضر"
-+
-+#: ../src/sugar/graphics/colorbutton.py:271
-+msgid "Blue"
-+msgstr "أزرق"
-+
-+#: ../src/sugar/util.py:196
- msgid " and "
- msgstr " و "
-
--#: ../src/sugar/util.py:182
-+#: ../src/sugar/util.py:197
- msgid ", "
- msgstr " و "
-
- #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
--#: ../src/sugar/util.py:185
-+#: ../src/sugar/util.py:200
- msgid "Seconds ago"
- msgstr "منذ بضعة ثوان"
-
- #. TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago",
- #. "[2 minutes] in the past", or "[3 years, 1 month] earlier"
--#: ../src/sugar/util.py:189
-+#: ../src/sugar/util.py:204
- #, python-format
- msgid "%s ago"
- msgstr "منذ %s"
-
- #. TRANS: Relative dates (eg. 1 month and 5 days).
--#: ../src/sugar/util.py:202
-+#: ../src/sugar/util.py:217
- #, python-format
- msgid "%d year"
- msgid_plural "%d years"
- msgstr[0] "%d سنة"
--msgstr[1] "%.sسنة"
--msgstr[2] "%.sسنتين"
-+msgstr[1] "سنة"
-+msgstr[2] "سنتين"
- msgstr[3] "%d سنوات"
- msgstr[4] "%d سنة"
- msgstr[5] "%d سنة"
-
--#: ../src/sugar/util.py:203
-+#: ../src/sugar/util.py:218
- #, python-format
- msgid "%d month"
- msgid_plural "%d months"
- msgstr[0] "%d شهر"
--msgstr[1] "%.0sشهر"
--msgstr[2] "%.0sشهرين"
-+msgstr[1] "شهر"
-+msgstr[2] "شهرين"
- msgstr[3] "%d شهور"
- msgstr[4] "%d شهرا"
- msgstr[5] "%d شهر"
-
--#: ../src/sugar/util.py:204
-+#: ../src/sugar/util.py:219
- #, python-format
- msgid "%d week"
- msgid_plural "%d weeks"
- msgstr[0] "%d أسبوع"
--msgstr[1] "%.0sأسبوع"
--msgstr[2] "%.0sأسبوعين"
-+msgstr[1] "أسبوع"
-+msgstr[2] "أسبوعين"
- msgstr[3] "%d أسابيع"
- msgstr[4] "%d أسبوعا"
- msgstr[5] "%d أسبوع"
-
--#: ../src/sugar/util.py:205
-+#: ../src/sugar/util.py:220
- #, python-format
- msgid "%d day"
- msgid_plural "%d days"
- msgstr[0] "%d يوم"
--msgstr[1] "%.0sيوم"
--msgstr[2] "%.0sيومين"
-+msgstr[1] "يوم"
-+msgstr[2] "يومين"
- msgstr[3] "%d أيام"
- msgstr[4] "%d يوما"
- msgstr[5] "%d يوم"
-
--#: ../src/sugar/util.py:206
-+#: ../src/sugar/util.py:221
- #, python-format
- msgid "%d hour"
- msgid_plural "%d hours"
- msgstr[0] "%d ساعة"
--msgstr[1] "%.0sساعة"
--msgstr[2] "%.0sساعتين"
-+msgstr[1] "ساعة"
-+msgstr[2] "ساعتين"
- msgstr[3] "%d ساعات"
- msgstr[4] "%d ساعة"
- msgstr[5] "%d ساعة"
-
--#: ../src/sugar/util.py:207
-+#: ../src/sugar/util.py:222
- #, python-format
- msgid "%d minute"
- msgid_plural "%d minutes"
- msgstr[0] "%d دقيقة"
--msgstr[1] "%.0sدقيقة"
--msgstr[2] "%.0sدقيقتين"
-+msgstr[1] "دقيقة"
-+msgstr[2] "دقيقتين"
- msgstr[3] "%d دقائق"
- msgstr[4] "%d دقيقة"
- msgstr[5] "%d دقيقة"
-@@ -560,5 +594,10 @@ msgstr[5] "%d دقيقة"
- #~ msgid "OK"
- #~ msgstr "حسنا"
-
-+# Only show disconnect when there's a mesh device, because mesh takes
-+# priority over the normal wireless device. NM doesn't have a "disconnect"
-+# method for a device either (for various reasons) so this doesn't
-+# have a good mapping
-+# TODO: show the channel number
- #~ msgid "%d second"
- #~ msgstr "%d ثانية"
-diff --git a/src/sugar/graphics/icon.py b/src/sugar/graphics/icon.py
-index 6e88f88..57c53f5 100644
---- a/src/sugar/graphics/icon.py
-+++ b/src/sugar/graphics/icon.py
-@@ -314,9 +314,21 @@ class Icon(gtk.Image):
-
- def __init__(self, **kwargs):
- self._buffer = _IconBuffer()
-+ self._file = None
-
- gobject.GObject.__init__(self, **kwargs)
-
-+ def get_file(self):
-+ return self._file
-+
-+ def set_file(self, file_name):
-+ self._file = file_name
-+ self._buffer.file_name = file_name
-+
-+ # XXX we need to override file property to support auto_ptr objects
-+ # that used to represent temporaly unzipped icons from bundles, see #1175
-+ file = gobject.property(type=object, setter=set_file, getter=get_file)
-+
- def _sync_image_properties(self):
- if self._buffer.icon_name != self.props.icon_name:
- self._buffer.icon_name = self.props.icon_name
-diff --git a/src/sugar/profile.py b/src/sugar/profile.py
-index cce45a7..d5012bd 100644
---- a/src/sugar/profile.py
-+++ b/src/sugar/profile.py
-@@ -181,11 +181,11 @@ class Profile(object):
- '# log files and features\n'\
- '#export LM_DEBUG=net\n' \
- '#export GABBLE_DEBUG=all\n' \
-- '#export' \
-- 'GABBLE_LOGFILE=~/.sugar/default/logs/telepathy-gabble.log\n' \
-+ '#export ' \
-+ 'GABBLE_LOGFILE=$HOME/.sugar/default/logs/telepathy-gabble.log\n' \
- '#export SALUT_DEBUG=all\n' \
-- '#export' \
-- 'SALUT_LOGFILE=~/.sugar/default/logs/telepathy-salut.log\n' \
-+ '#export ' \
-+ 'SALUT_LOGFILE=$HOME/.sugar/default/logs/telepathy-salut.log\n' \
- '#export GIBBER_DEBUG=all\n' \
- '#export PRESENCESERVICE_DEBUG=1\n' \
- '#export SUGAR_LOGGER_LEVEL=debug\n\n' \
diff --git a/debian/patches/series b/debian/patches/series
index dcbf2a0..78f709c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001_sync_git_head.patch
1001_danish_l10n.patch
2002_ignore_debian_and_quilt-patches.patch
2003_bundlebuilder_exit_nonzero_on_error.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-toolkit.git
More information about the pkg-sugar-commit
mailing list