[Python-apps-commits] r3852 - in packages/gmail-notify/trunk/debian (25 files)
awoodland at users.alioth.debian.org
awoodland at users.alioth.debian.org
Sat Sep 26 16:03:22 UTC 2009
Date: Saturday, September 26, 2009 @ 16:03:01
Author: awoodland
Revision: 3852
- import existing gmail-notify
Added:
packages/gmail-notify/trunk/debian/changelog
packages/gmail-notify/trunk/debian/compat
packages/gmail-notify/trunk/debian/control
packages/gmail-notify/trunk/debian/copyright
packages/gmail-notify/trunk/debian/docs
packages/gmail-notify/trunk/debian/extras/
packages/gmail-notify/trunk/debian/extras/icon.xpm
packages/gmail-notify/trunk/debian/gmail-notify.1
packages/gmail-notify/trunk/debian/gmail-notify.desktop
packages/gmail-notify/trunk/debian/gmail-notify.install
packages/gmail-notify/trunk/debian/menu
packages/gmail-notify/trunk/debian/patches/
packages/gmail-notify/trunk/debian/patches/01_fixes.patch
packages/gmail-notify/trunk/debian/patches/02_trayicon.patch
packages/gmail-notify/trunk/debian/patches/03_password_fixes.patch
packages/gmail-notify/trunk/debian/patches/04_www-browser.patch
packages/gmail-notify/trunk/debian/patches/05_proxy_support.patch
packages/gmail-notify/trunk/debian/patches/06_gmail_to_mail.patch
packages/gmail-notify/trunk/debian/patches/07_preferences-window.patch
packages/gmail-notify/trunk/debian/patches/08_ampersand-fix.patch
packages/gmail-notify/trunk/debian/pycompat
packages/gmail-notify/trunk/debian/rules
packages/gmail-notify/trunk/debian/scripts/
packages/gmail-notify/trunk/debian/scripts/gmail-notify
packages/gmail-notify/trunk/debian/watch
Added: packages/gmail-notify/trunk/debian/changelog
===================================================================
--- packages/gmail-notify/trunk/debian/changelog (rev 0)
+++ packages/gmail-notify/trunk/debian/changelog 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,49 @@
+gmail-notify (1.6.1.1-1) unstable; urgency=medium
+
+ * Acknowledge my own NMU(!) (Closes: #546464)
+ * Team maintained, python-apps-team
+ * Set VCS control fields for new SVN home
+ * Adopt the package and set the maintainer field accordingly
+ (Closes: #547725, #548239)
+ * Medium urgency, one of the bugs is RC
+ * Drop deprecated dh_desktop call
+ * Bump standards to 3.8.3 (No changes)
+ * Add dependency on XB-Python-version
+ * debian/compat: use 7 now instead
+ * Build using python-central now
+
+ -- Alan Woodland <awoodland at debian.org> Fri, 25 Sep 2009 20:37:37 +0100
+
+gmail-notify (1.6.1.1-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release 1.6.1.1, (Closes: #457748)
+ * Depend on python-eggtrayicon instead of python-gnome2-extras (Closes: #485318)
+ * Changed gmail.google.com to mail.google.com (Closes: #503740)
+ * Applied patch for proxy support from Luca Falavigna (Closes: #428260)
+ * Applied preference window patch from Ubuntu (Closes: #432676)
+ * Replace & with & in popups (Closes: #420871)
+ * Add debian/watch
+
+ -- Alan Woodland <awoodland at debian.org> Sun, 13 Sep 2009 11:31:01 +0100
+
+gmail-notify (1.6.1-3) unstable; urgency=low
+
+ * Chance default x-www-browser to www-browser (closes: #389532)
+
+ -- Joseph Smidt <jsmidt at byu.edu> Thu, 28 Sep 2006 19:59:36 -0600
+
+gmail-notify (1.6.1-2) unstable; urgency=low
+
+ *Add x-www-browser as default web browser
+ change arch: any to arch all
+ Update dependency on python2.4* to python* since python2.4 is default
+
+ -- Joseph Smidt <jsmidt at byu.edu> Fri, 22 Sep 2006 18:52:03 -0600
+
+gmail-notify (1.6.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #369625)
+
+ -- Joseph Smidt <jsmidt at byu.edu> Mon, 3 Jul 2006 10:43:33 -0600
+
Added: packages/gmail-notify/trunk/debian/compat
===================================================================
--- packages/gmail-notify/trunk/debian/compat (rev 0)
+++ packages/gmail-notify/trunk/debian/compat 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1 @@
+7
Added: packages/gmail-notify/trunk/debian/control
===================================================================
--- packages/gmail-notify/trunk/debian/control (rev 0)
+++ packages/gmail-notify/trunk/debian/control 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,20 @@
+Source: gmail-notify
+Section: mail
+Priority: optional
+Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Uploaders: Alan Woodland <awoodland at debian.org>
+Build-Depends: cdbs (>= 0.4.49), debhelper (>= 7), patchutils (>= 0.2.25), python, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6)
+Standards-Version: 3.8.3
+XS-Python-Version: all
+Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/gmail-notify/trunk/
+Vcs-Svn: svn://svn.debian.org/python-apps/packages/gmail-notify/trunk/
+
+Package: gmail-notify
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-gtk2, python-eggtrayicon
+Recommends: www-browser
+XB-Python-Version: ${python:Versions}
+Description: A Gmail Notifier
+ Gmail Notifier is a Linux alternative for the notifier program released
+ by Google, it is written in Python and provides an attractive and
+ simple way to check for new mail messages.
Added: packages/gmail-notify/trunk/debian/copyright
===================================================================
--- packages/gmail-notify/trunk/debian/copyright (rev 0)
+++ packages/gmail-notify/trunk/debian/copyright 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,25 @@
+This package was debianized by Joseph Smidt <jsmidt at byu.edu> on
+Mon, 3 Jul 2006 10:43:33 -0600.
+
+It was downloaded from http://gmail-notify.sourceforge.net/
+
+Copyright Holder: 2004,2005 John Winter <wintersoft at gmail.com>
+
+License:
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL file.
+
+
Added: packages/gmail-notify/trunk/debian/docs
===================================================================
--- packages/gmail-notify/trunk/debian/docs (rev 0)
+++ packages/gmail-notify/trunk/debian/docs 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1 @@
+README
Added: packages/gmail-notify/trunk/debian/extras/icon.xpm
===================================================================
--- packages/gmail-notify/trunk/debian/extras/icon.xpm (rev 0)
+++ packages/gmail-notify/trunk/debian/extras/icon.xpm 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,43 @@
+/* XPM */
+static char *icon[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 5 1",
+" c #B64F53",
+". c #E7DFE4",
+"X c #E6E6E6",
+"o c gray100",
+"O c None",
+/* pixels */
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"OOOO ................ OOOO",
+"OOO oooooooooooooo OOO",
+"OO oooooooooooo OO",
+"OO oooooooooo OO",
+"OO oooooooo OO",
+"OO oooooo OO",
+"OO o oooo o OO",
+"OO oo oo oo OO",
+"OO ooo ooo OO",
+"OO oooo oooo OO",
+"OO ooooo ooooo OO",
+"OO oooooo oooooo OO",
+"OO ooooooo ooooooo OO",
+"OO oooooooo oooooooo OO",
+"OO ooooooooo ooooooooo OO",
+"OO oooooooo.oo.oooooooo OO",
+"OO ooooooo.oooo.ooooooo OO",
+"OO oooooo.oooooo.oooooo OO",
+"OO ooooo.oooooooo.ooooo OO",
+"OO oooo.oooooooooo.oooo OO",
+"OO ooo.oooooooooooo.ooo OO",
+"OO oo.oooooooooooooo.oo OO",
+"OO o.oooooooooooooooo.o OO",
+"OO .oooooooooooooooooo. OO",
+"OOO OOO",
+"OOOO OOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
+};
Added: packages/gmail-notify/trunk/debian/gmail-notify.1
===================================================================
--- packages/gmail-notify/trunk/debian/gmail-notify.1 (rev 0)
+++ packages/gmail-notify/trunk/debian/gmail-notify.1 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,40 @@
+.TH gmail-notify 1 "May 31, 2006"
+.
+.SH NAME
+gmail-notify \- A Gmail Notifier
+.
+.SH SYNOPSIS
+.B gmail-notify
+.
+.SH DESCRIPTION
+.B gmail-notify
+Gmail Notifier is a Linux alternative for the notifier program released
+by Google, it is written in Python and provides an attractive and
+simple way to check for new mail messages.
+
+Open the notifier.conf file in your favourite text editor and edit the configuration options to match your system. Below is an explanation of each option: (See notifer.conf.sample located in the /usr/share/doc/gmail-notify directory for a helpful example)
+
+gmailusername - fairly self explanatory, must be without the @gmail.com at the end
+
+gmailpassword - obvious
+
+browserpath - this is the full path to the browser that you want Gmail Notifier to open when you click the popup to goto your Gmail inbox
+
+voffset - this is the amount (in pixels) the popup will be displaced from the bottom of the screen, it will almost definately need changing to suit your system, ideally, you want it to look like it came out of the bar along the bottom of the screen the best way to adjust it is to run it initially with the default value and then add/remove from it then test again. Higher values result in the popup appearing higher up the screen.
+
+hoffset - same as above only this is the amount the popup will be displaced from the side of the screen. Higher values will displace it more to the left of the screen.
+
+checkinterval - this is how often Gmail Notifier will check for new mail (in ms), do NOT set it lower than 20000 (20 seconds), or the libgmail library will not keep up, causing many strange side effects. If you need to check your mail more than once every 20 seconds, then chances are your famous and don't have time to read your mail anyway.
+
+animationdelay - this is the amount of time (in ms) that Gmail Notifier will wait before moving the popup up one step, when the popup is popping up, to high values will cause the animation to be jerky, to low values will cause tearing at the bottom of the popup. 15ms seems about right. Only small adjustments are necercery, best thing is to leave it alone.
+
+popuptimespan - this is the amount of time before the popup will dissappear again after popping up you can set this to whatever you want
+
+.
+.SH Web Page
+http://gmail-notify.sourceforge.net/
+.
+.SH AUTHOR
+John Winter <wintersoft at gmail.com>
+.
+.\" EOF
Added: packages/gmail-notify/trunk/debian/gmail-notify.desktop
===================================================================
--- packages/gmail-notify/trunk/debian/gmail-notify.desktop (rev 0)
+++ packages/gmail-notify/trunk/debian/gmail-notify.desktop 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Gmail Notify
+GenericName=Gmail Notify
+Comment=New Gmail notification tool
+Icon=gmail-notify-icon.png
+Exec=gmail-notify
+Terminal=false
+Categories=Application;Network;
Added: packages/gmail-notify/trunk/debian/gmail-notify.install
===================================================================
--- packages/gmail-notify/trunk/debian/gmail-notify.install (rev 0)
+++ packages/gmail-notify/trunk/debian/gmail-notify.install 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,9 @@
+*.py* usr/lib/gmail-notify/
+*.xml usr/share/apps/gmail-notify/
+notifier.conf.sample usr/share/doc/gmail-notify
+debian/scripts/gmail-notify usr/bin/
+debian/extras/* usr/share/apps/gmail-notify/
+*.png usr/share/apps/gmail-notify/
+*.jpg usr/share/apps/gmail-notify/
+debian/gmail-notify.desktop usr/share/applications/
+gmail-notify-icon.png usr/share/pixmaps/
Added: packages/gmail-notify/trunk/debian/menu
===================================================================
--- packages/gmail-notify/trunk/debian/menu (rev 0)
+++ packages/gmail-notify/trunk/debian/menu 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,4 @@
+?package(gmail-notify):needs="X11" section="Applications/Network/Communication" title="GMail Notifier" \
+ command="/usr/bin/gmail-notify" \
+ icon="/usr/share/apps/gmail-notify/icon.xpm"
+
Added: packages/gmail-notify/trunk/debian/patches/01_fixes.patch
===================================================================
--- packages/gmail-notify/trunk/debian/patches/01_fixes.patch (rev 0)
+++ packages/gmail-notify/trunk/debian/patches/01_fixes.patch 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,51 @@
+--- gmail-notify-1.6.1/GmailConfig.py.old 2005-10-08 17:25:08.422002680 +0200
++++ gmail-notify-1.6.1/GmailConfig.py 2005-10-08 17:26:05.778283200 +0200
+@@ -9,8 +9,8 @@
+ import xmllangs
+ import sys
+
+-LANGSXML_PATH=sys.path[0]+"/langs.xml"
+-ICON_PATH=sys.path[0]+"/gmail-notify-icon.png"
++LANGSXML_PATH="/usr/share/apps/gmail-notify/langs.xml"
++ICON_PATH="/usr/share/apps/gmail-notify/gmail-notify-icon.png"
+
+ class GmailConfigWindow:
+
+@@ -131,12 +131,12 @@
+ # Attach combobox and label
+ table.attach( self.lbl_langs, 0, 1, 8, 9 )
+ self.lbl_langs.show()
+- table.attach( self.cbo_langs, 1, 2, 8, 9, ypadding=5 )
++ table.attach( self.cbo_langs, 1, 2, 8, 9, xpadding=5, ypadding=5 )
+ self.cbo_langs.show()
+
+ # Add 'Close' button
+ button = gtk.Button( stock=gtk.STOCK_OK )
+- table.attach( button, 0, 2, 10, 11, ypadding=2 )
++ table.attach( button, 0, 2, 10, 11, xpadding=2, ypadding=2 )
+ button.connect( "clicked", self.onOkay )
+ button.show()
+
+--- gmail-notify-1.6.1/notifier.py.old 2005-10-08 17:26:24.603421344 +0200
++++ gmail-notify-1.6.1/notifier.py 2005-10-08 17:27:34.491796696 +0200
+@@ -8,6 +8,7 @@
+ import os
+ import pytrayicon
+ import sys
++sys.path.insert (0, "/usr/lib/gmail-notify/")
+ import warnings
+ import ConfigParser
+ import xmllangs
+@@ -15,9 +16,9 @@
+ import GmailPopupMenu
+ import gmailatom
+
+-BKG_PATH=sys.path[0]+"/background.jpg"
+-ICON_PATH=sys.path[0]+"/icon.png"
+-ICON2_PATH=sys.path[0]+"/icon2.png"
++BKG_PATH="/usr/share/apps/gmail-notify/background.jpg"
++ICON_PATH="/usr/share/apps/gmail-notify/icon.png"
++ICON2_PATH="/usr/share/apps/gmail-notify/icon2.png"
+
+ def removetags(text):
+ raw=text.split("<b>")
Added: packages/gmail-notify/trunk/debian/patches/02_trayicon.patch
===================================================================
--- packages/gmail-notify/trunk/debian/patches/02_trayicon.patch (rev 0)
+++ packages/gmail-notify/trunk/debian/patches/02_trayicon.patch 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,20 @@
+--- gmail-notify-1.6.1/notifier.py.old 2005-10-08 17:39:28.897190568 +0200
++++ gmail-notify-1.6.1/notifier.py 2005-10-08 17:39:48.163261680 +0200
+@@ -6,7 +6,7 @@
+ import gtk
+ import time
+ import os
+-import pytrayicon
++from egg.trayicon import TrayIcon
+ import sys
+ import warnings
+ import ConfigParser
+@@ -82,7 +82,7 @@
+ self.popuptimer=0
+ self.waittimer=0
+ # Create the tray icon object
+- self.tray = pytrayicon.TrayIcon(self.lang.get_string(21));
++ self.tray = TrayIcon(self.lang.get_string(21));
+ self.eventbox = gtk.EventBox()
+ self.tray.add(self.eventbox)
+ self.eventbox.connect("button_press_event", self.tray_icon_clicked)
Added: packages/gmail-notify/trunk/debian/patches/03_password_fixes.patch
===================================================================
--- packages/gmail-notify/trunk/debian/patches/03_password_fixes.patch (rev 0)
+++ packages/gmail-notify/trunk/debian/patches/03_password_fixes.patch 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,15 @@
+diff -Nur gmail-notify-1.6.1/GmailConfig.py gmail-notify-1.6.1.new/GmailConfig.py
+--- gmail-notify-1.6.1/GmailConfig.py 2005-09-25 19:12:11.000000000 +0200
++++ gmail-notify-1.6.1.new/GmailConfig.py 2006-04-09 00:06:01.000000000 +0200
+@@ -237,7 +237,10 @@
+ self.config.remove_option( "options", "gmailusername" )
+ self.config.remove_option( "options", "gmailpassword" )
+
+- self.config.write( open( self.loadedConfig, 'w' ) )
++ fd = open( self.loadedConfig, 'w' )
++ os.chmod( self.loadedConfig, 0600)
++ self.config.write( fd )
++ fd.close()
+ gtk.main_quit()
+ self.hide()
+ else:
Added: packages/gmail-notify/trunk/debian/patches/04_www-browser.patch
===================================================================
--- packages/gmail-notify/trunk/debian/patches/04_www-browser.patch (rev 0)
+++ packages/gmail-notify/trunk/debian/patches/04_www-browser.patch 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,11 @@
+--- GmailConfig.py 2005-09-25 11:12:11.000000000 -0600
++++ GmailConfig2.py 2006-09-22 19:01:21.000000000 -0600
+@@ -18,7 +18,7 @@
+ configElements = None
+
+ # Declare global variables for configuration as dictionary
+- options = { "gmailusername":None, "gmailpassword":None, "browserpath":"firefox", "lang":"English",
++ options = { "gmailusername":None, "gmailpassword":None, "browserpath":"www-browser", "lang":"English",
+ "voffset":0, "hoffset":0, "checkinterval":20000,
+ "animationdelay":15, "popuptimespan":5000}
+
Added: packages/gmail-notify/trunk/debian/patches/05_proxy_support.patch
===================================================================
--- packages/gmail-notify/trunk/debian/patches/05_proxy_support.patch (rev 0)
+++ packages/gmail-notify/trunk/debian/patches/05_proxy_support.patch 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,232 @@
+diff -Nur gmail-notify-1.6.1/gmailatom.py gmail-notify-1.6.1.new/gmailatom.py
+--- gmail-notify-1.6.1/gmailatom.py 2007-06-09 13:41:13.000000000 +0200
++++ gmail-notify-1.6.1.new/gmailatom.py 2007-06-09 18:32:24.000000000 +0200
+@@ -116,12 +116,17 @@
+ host = "https://mail.google.com"
+ url = host + "/mail/feed/atom"
+
+- def __init__(self, user, pswd):
++ def __init__(self, user, pswd, proxy=None):
+ self.m = MailHandler()
+ # initialize authorization handler
+ auth_handler = urllib2.HTTPBasicAuthHandler()
+ auth_handler.add_password( self.realm, self.host, user, pswd)
+- opener = urllib2.build_opener(auth_handler)
++ # manage proxy
++ if proxy:
++ proxy_handler = urllib2.ProxyHandler({'http': proxy})
++ opener = urllib2.build_opener(proxy_handler, auth_handler)
++ else:
++ opener = urllib2.build_opener(auth_handler)
+ urllib2.install_opener(opener)
+
+ def sendRequest(self):
+diff -Nur gmail-notify-1.6.1/GmailConfig.py gmail-notify-1.6.1.new/GmailConfig.py
+--- gmail-notify-1.6.1/GmailConfig.py 2007-06-09 18:32:08.000000000 +0200
++++ gmail-notify-1.6.1.new/GmailConfig.py 2007-06-09 18:32:09.000000000 +0200
+@@ -18,8 +18,8 @@
+ configElements = None
+
+ # Declare global variables for configuration as dictionary
+- options = { "gmailusername":None, "gmailpassword":None, "browserpath":"www-browser", "lang":"English",
+- "voffset":0, "hoffset":0, "checkinterval":20000,
++ options = { "gmailusername":None, "gmailpassword":None, "browserpath":"www-browser", "proxy":None,
++ "lang":"English", "voffset":0, "hoffset":0, "checkinterval":20000,
+ "animationdelay":15, "popuptimespan":5000}
+
+ config = ConfigParser.RawConfigParser()
+@@ -49,6 +49,7 @@
+ ["gmailusername",2,None,None],
+ ["gmailpassword",22,None,None],
+ ["browserpath",3,None,None],
++ ["proxy",36,None,None],
+ ["voffset",28,None,None],
+ ["hoffset",27,None,None],
+ ["checkinterval",31,None,None],
+@@ -57,7 +58,7 @@
+ ]
+
+ # Create table and attach to window
+- table = gtk.Table( rows=11, columns=2, homogeneous=gtk.FALSE )
++ table = gtk.Table( rows=12, columns=2, homogeneous=gtk.FALSE )
+
+ self.window.add(table)
+
+@@ -114,7 +115,7 @@
+ self.savePassword.set_active( gtk.FALSE )
+
+ self.savePassword.show()
+- table.attach( alignment, 0, 2, 9, 10 )
++ table.attach( alignment, 0, 2, 10, 11 )
+ alignment.show()
+
+ # Add combobox to select language
+@@ -129,14 +130,14 @@
+ self.cbo_langs.append_text( one_lang.get_name())
+ self.cbo_langs.set_active(0)
+ # Attach combobox and label
+- table.attach( self.lbl_langs, 0, 1, 8, 9 )
++ table.attach( self.lbl_langs, 0, 1, 9, 10 )
+ self.lbl_langs.show()
+- table.attach( self.cbo_langs, 1, 2, 8, 9, xpadding=5, ypadding=5 )
++ table.attach( self.cbo_langs, 1, 2, 9, 10, xpadding=5, ypadding=5 )
+ self.cbo_langs.show()
+
+ # Add 'Close' button
+ button = gtk.Button( stock=gtk.STOCK_OK )
+- table.attach( button, 0, 2, 10, 11, xpadding=2, ypadding=2 )
++ table.attach( button, 0, 2, 11, 12, xpadding=2, ypadding=2 )
+ button.connect( "clicked", self.onOkay )
+ button.show()
+
+@@ -222,7 +223,7 @@
+
+ # Before writing, check for bad values
+ try:
+- tempLogin = gmailatom.GmailAtom( self.options["gmailusername"], self.options["gmailpassword"] )
++ tempLogin = gmailatom.GmailAtom( self.options["gmailusername"], self.options["gmailpassword"], self.options["proxy"])
+ tempLogin.refreshInfo()
+ except:
+ print "Unexpected error:", sys.exc_info()[0]
+diff -Nur gmail-notify-1.6.1/notifier.py gmail-notify-1.6.1.new/notifier.py
+--- gmail-notify-1.6.1/notifier.py 2007-06-09 18:32:08.000000000 +0200
++++ gmail-notify-1.6.1.new/notifier.py 2007-06-09 18:32:09.000000000 +0200
+@@ -163,7 +163,7 @@
+ gtk.main_iteration( gtk.TRUE)
+ # Attemp connection
+ try:
+- self.connection=gmailatom.GmailAtom(self.options['gmailusername'],self.options['gmailpassword'])
++ self.connection=gmailatom.GmailAtom(self.options['gmailusername'],self.options['gmailpassword'],self.options['proxy'])
+ self.connection.refreshInfo()
+ print "connection successful... continuing"
+ self._tooltip.set_tip(self.tray,self.lang.get_string(14))
+@@ -383,6 +383,6 @@
+ self.maintimer = gtk.timeout_add(self.options["checkinterval"], self.mail_check )
+
+ # Update user/pass
+- self.connection=gmailatom.GmailAtom(self.options["gmailusername"],self.options["gmailpassword"])
++ self.connection=gmailatom.GmailAtom(self.options["gmailusername"],self.options["gmailpassword"],self.options['proxy'])
+ self.connect()
+ self.mail_check()
+diff -Nur gmail-notify-1.6.1/langs.xml gmail-notify-1.6.1.new/langs.xml
+--- gmail-notify-1.6.1/langs.xml 2005-09-25 19:41:01.000000000 +0200
++++ gmail-notify-1.6.1.new/langs.xml 2007-06-09 18:32:09.000000000 +0200
+@@ -34,6 +34,7 @@
+ <string id="33">Some value is missing</string>
+ <string id="34">Save username and password</string>
+ <string id="35">s</string>
++ <string id="36">Proxy</string>
+ </lang>
+ <lang name="Español">
+ <string id="1" >Configuración de Gmail Notifier</string>
+@@ -69,6 +70,7 @@
+ <string id="33">Falta completar algún valor</string>
+ <string id="34">Guardar nombre de usuario y contraseña</string>
+ <string id="35">s</string>
++ <string id="36">Proxy</string>
+ </lang>
+ <lang name="Svenska">
+ <string id="1" >Gmail Notifier - konfiguration</string>
+@@ -104,6 +106,7 @@
+ <string id="33">Några värden fattas</string>
+ <string id="34">Spara användarnamn och lösenord</string>
+ <string id="35">n</string>
++ <string id="36">Proxy</string>
+ </lang>
+ <lang name="Italiano">
+ <string id="1">Gmail Notifier Configurazione</string>
+@@ -139,6 +142,7 @@
+ <string id="33">Mancano dei valori</string>
+ <string id="34">Salva nome utente e password</string>
+ <string id="35">s</string>
++ <string id="36">Proxy</string>
+ </lang>
+ <lang name="Nederlands">
+ <string id="1" >Gmail Notifier Instellingen</string>
+@@ -174,6 +178,7 @@
+ <string id="33">Enkele invoer niet aanwezig</string>
+ <string id="34">Opslaan gebruikersnaam en wachtwoord</string>
+ <string id="35">s</string>
++ <string id="36">Proxy</string>
+ </lang>
+ <lang name="Deutsch">
+ <string id="1">Gmail Notifier - Einstellungen</string>
+@@ -209,6 +214,7 @@
+ <string id="33">Ein Wert fehlt</string>
+ <string id="34">Nutzername und Passwort speichern</string>
+ <string id="35">en</string>
++ <string id="36">Proxy</string>
+ </lang>
+ <lang name="Portuguese (Brazil)">
+ <string id="1" >Configuração do Gmail Notifier</string>
+@@ -244,6 +250,7 @@
+ <string id="33">Algum valor precisa ser preenchido</string>
+ <string id="34">Lembrar meu login e senha</string>
+ <string id="35">s</string>
++ <string id="36">Proxy</string>
+ </lang>
+ <lang name="Français">
+ <string id="1" >Configuration de Gmail Notifier</string>
+@@ -279,6 +286,7 @@
+ <string id="33">Il manque certaines valeurs</string>
+ <string id="34">Enregistrer mon utilisateur et mot de passe</string>
+ <string id="35">s</string>
++ <string id="36">Proxy</string>
+ </lang>
+ <lang name="ÄŒesky">
+ <string id="1">Nastavenà Gmail oznamovatele</string>
+@@ -314,6 +322,7 @@
+ <string id="33">NÄ›která hodnota chybÃ</string>
+ <string id="34">Uložit uživatelské jméno a heslo</string>
+ <string id="35">y</string>
++ <string id="36">Proxy</string>
+ </lang>
+ <lang name="Russian">
+ <string id="1" >ÐаÑтройка Gmail Notifier</string>
+@@ -349,6 +358,7 @@
+ <string id="33">Ðекоторые Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñ‚ÐµÑ€Ñны</string>
+ <string id="34">Сохранить Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ пароль</string>
+ <string id="35"></string>
++ <string id="36">Proxy</string>
+ </lang>
+ <lang name="Polish">
+ <string id="1">Konfiguracja Gmail Notifier</string>
+@@ -384,6 +394,7 @@
+ <string id="33">Brakuje jakiÅ› danych</string>
+ <string id="34">Zachowan nazwę użytkownika i hasło</string>
+ <string id="35"></string>
++ <string id="36">Proxy</string>
+ </lang>
+ <lang name="Latviešu">
+ <string id="1" >Gmail Notifier Uzskaņošana</string>
+@@ -419,6 +430,7 @@
+ <string id="33">KÄda no vÄ“rtÄ«bÄm nav ievadÄ«ta</string>
+ <string id="34">SaglabÄt lietotÄjvÄrdu un paroli</string>
+ <string id="35">s</string>
++ <string id="36">Proxy</string>
+ </lang>
+ <lang name="Arabic">
+ <string id="1" >Gmail Notifier إعداد</string>
+@@ -454,6 +466,7 @@
+ <string id="33">لم تملئ كل الخانات</string>
+ <string id="34">تذكر اسم المستخدم وكلمة السر</string>
+ <string id="35"></string>
++ <string id="36">Proxy</string>
+ </lang>
+ <lang name="Japanese - 日本語">
+ <string id="1" >Gmail Notifier è¨å®š</string>
+@@ -489,6 +502,7 @@
+ <string id="33">値ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“</string>
+ <string id="34">ユーザåã¨ãƒ‘スワードをä¿å˜ã™ã‚‹</string>
+ <string id="35"></string>
++ <string id="36">Proxy</string>
+ </lang>
+ <lang name="Esperanto">
+ <string id="1" >Agordoj de Gmail Notifier</string>
+@@ -524,5 +538,6 @@
+ <string id="33">Valoro mankas</string>
+ <string id="34">Konservu nomon k pasvorton</string>
+ <string id="35">j</string>
++ <string id="36">Proxy</string>
+ </lang>
+ </langs>
Added: packages/gmail-notify/trunk/debian/patches/06_gmail_to_mail.patch
===================================================================
--- packages/gmail-notify/trunk/debian/patches/06_gmail_to_mail.patch (rev 0)
+++ packages/gmail-notify/trunk/debian/patches/06_gmail_to_mail.patch 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,13 @@
+--- notifier.py.orig 2009-09-13 11:59:53.000000000 +0100
++++ notifier.py 2009-09-13 12:00:10.000000000 +0100
+@@ -352,8 +352,8 @@
+
+ def gotourl( self, wg=None):
+ print "----------"
+- print "launching browser "+self.options['browserpath']+" http://gmail.google.com"
+- os.system(self.options['browserpath']+" http://gmail.google.com &")
++ print "launching browser "+self.options['browserpath']+" http://mail.google.com"
++ os.system(self.options['browserpath']+" http://mail.google.com &")
+
+ def show_quota_info( self, event):
+ print "Not available"
Added: packages/gmail-notify/trunk/debian/patches/07_preferences-window.patch
===================================================================
--- packages/gmail-notify/trunk/debian/patches/07_preferences-window.patch (rev 0)
+++ packages/gmail-notify/trunk/debian/patches/07_preferences-window.patch 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,33 @@
+diff -Nurw gmail-notify-dist/GmailConfig.py gmail-notify/GmailConfig.py
+--- gmail-notify-dist/GmailConfig.py 2006-09-23 15:57:39.000000000 -0500
++++ gmail-notify/GmailConfig.py 2006-09-23 16:05:55.000000000 -0500
+@@ -263,9 +263,13 @@
+ def get_lang( self ):
+ return self.lang
+
++ def no_username_or_password( self ):
++ return ( self.options["gmailusername"] == None or self.options["gmailpassword"] == None )
++
+ def main( self ):
+ gtk.main()
+
++
+ if __name__ == "__main__":
+ config = GmailConfigWindow()
+ config.update_labels();
+diff -Nurw gmail-notify-dist/notifier.py gmail-notify/notifier.py
+--- gmail-notify-dist/notifier.py 2006-09-23 15:57:39.000000000 -0500
++++ gmail-notify/notifier.py 2006-09-23 16:08:42.000000000 -0500
+@@ -56,8 +56,11 @@
+ # Reference to global options
+ self.options = self.configWindow.options
+ # Check if there is a user and password, if not, load config window
+- while ( self.options["gmailusername"] == None or self.options["gmailpassword"] == None ):
++ if self.configWindow.no_username_or_password():
+ self.configWindow.show()
++ # If there's still not a username or password, just exit.
++ if self.configWindow.no_username_or_password():
++ sys.exit(0)
+ # Load selected language
+ self.lang = self.configWindow.get_lang()
+ print "selected language: "+self.lang.get_name()
Added: packages/gmail-notify/trunk/debian/patches/08_ampersand-fix.patch
===================================================================
--- packages/gmail-notify/trunk/debian/patches/08_ampersand-fix.patch (rev 0)
+++ packages/gmail-notify/trunk/debian/patches/08_ampersand-fix.patch 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,20 @@
+--- notifier.py.orig 2009-09-13 12:12:38.000000000 +0100
++++ notifier.py 2009-09-13 12:17:08.000000000 +0100
+@@ -15,6 +15,7 @@
+ import GmailConfig
+ import GmailPopupMenu
+ import gmailatom
++import re
+
+ BKG_PATH="/usr/share/apps/gmail-notify/background.jpg"
+ ICON_PATH="/usr/share/apps/gmail-notify/icon.png"
+@@ -229,7 +230,8 @@
+ self._tooltip.set_tip(self.tray,self.lang.get_string(18))
+ pixbuf = gtk.gdk.pixbuf_new_from_file( ICON_PATH )
+
+- self.label.set_markup(self.default_label)
++ p = re.compile('&')
++ self.label.set_markup(p.sub('&', self.default_label))
+ scaled_buf = pixbuf.scale_simple(24,24,gtk.gdk.INTERP_BILINEAR)
+ self.imageicon.set_from_pixbuf(scaled_buf)
+ self.eventbox.add(self.imageicon)
Added: packages/gmail-notify/trunk/debian/pycompat
===================================================================
--- packages/gmail-notify/trunk/debian/pycompat (rev 0)
+++ packages/gmail-notify/trunk/debian/pycompat 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1 @@
+2
Added: packages/gmail-notify/trunk/debian/rules
===================================================================
--- packages/gmail-notify/trunk/debian/rules (rev 0)
+++ packages/gmail-notify/trunk/debian/rules 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+export DH_VERBOSE=1
+
+DEB_PYTHON_SYSTEM=pycentral
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+install/gmail-notify::
+ chmod -x notifier.conf.sample
+ dh_install
+ dh_installman debian/gmail-notify.1
+
+binary-fixup/gmail-notify::
+ dh_pycentral
Property changes on: packages/gmail-notify/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+
Added: packages/gmail-notify/trunk/debian/scripts/gmail-notify
===================================================================
--- packages/gmail-notify/trunk/debian/scripts/gmail-notify (rev 0)
+++ packages/gmail-notify/trunk/debian/scripts/gmail-notify 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/lib/gmail-notify
+./notifier.py
Added: packages/gmail-notify/trunk/debian/watch
===================================================================
--- packages/gmail-notify/trunk/debian/watch (rev 0)
+++ packages/gmail-notify/trunk/debian/watch 2009-09-26 16:03:01 UTC (rev 3852)
@@ -0,0 +1,3 @@
+version=3
+opts=uversionmangle=s/\.(tar.*|tgz|zip|gz|bz2)$//i,dversionmangle=s/[-.+~]?(cvs|svn|git|snapshot|pre|hg)(.*)$//i,pasv \
+http://sf.net/gmail-notify/gmail-notify-?_?([\d+\.]+|\d+)\.(tar.*|tgz|zip|gz|bz2|) debian uupdate
More information about the Python-apps-commits
mailing list