[Python-apps-commits] r8273 - in packages/gmail-notify/trunk/debian (14 files)

adejong at users.alioth.debian.org adejong at users.alioth.debian.org
Fri Mar 9 11:52:23 UTC 2012 

    Date: Friday, March 9, 2012 @ 11:52:20
  Author: adejong
Revision: 8273

  * Switch to using the dh command sequencer.
  * Switch source format to 3.0 (quilt) and refresh patches.
  * Add DEP-3 headers to some of the patches.

Added:
  packages/gmail-notify/trunk/debian/gmail-notify.manpages
  packages/gmail-notify/trunk/debian/patches/series
Modified:
  packages/gmail-notify/trunk/debian/changelog
  packages/gmail-notify/trunk/debian/control
  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/rules
  packages/gmail-notify/trunk/debian/source/format

Modified: packages/gmail-notify/trunk/debian/changelog
===================================================================
--- packages/gmail-notify/trunk/debian/changelog	2012-03-09 01:06:17 UTC (rev 8272)
+++ packages/gmail-notify/trunk/debian/changelog	2012-03-09 11:52:20 UTC (rev 8273)
@@ -6,8 +6,11 @@
 
   [ Arthur de Jong ]
   * Moved packaging from python-central to dh_python2 (Closes: #616827).
+  * Switch to using the dh command sequencer.
+  * Switch source format to 3.0 (quilt) and refresh patches.
+  * Add DEP-3 headers to some of the patches.
 
- -- Arthur de Jong <adejong at debian.org>  Sun, 04 Mar 2012 14:35:06 +0100
+ -- Arthur de Jong <adejong at debian.org>  Fri, 09 Mar 2012 12:51:52 +0100
 
 gmail-notify (1.6.1.1-1) unstable; urgency=medium
 

Modified: packages/gmail-notify/trunk/debian/control
===================================================================
--- packages/gmail-notify/trunk/debian/control	2012-03-09 01:06:17 UTC (rev 8272)
+++ packages/gmail-notify/trunk/debian/control	2012-03-09 11:52:20 UTC (rev 8273)
@@ -3,14 +3,14 @@
 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.90~), debhelper (>= 7), patchutils (>= 0.2.25), python, python-all (>= 2.6.6-3~)
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~)
 Standards-Version: 3.8.3
 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
+Depends: ${misc:Depends}, ${python:Depends}, python-gtk2, python-eggtrayicon
 Recommends: www-browser
 Description: A Gmail Notifier
  Gmail Notifier is a Linux alternative for the notifier program released

Added: packages/gmail-notify/trunk/debian/gmail-notify.manpages
===================================================================
--- packages/gmail-notify/trunk/debian/gmail-notify.manpages	                        (rev 0)
+++ packages/gmail-notify/trunk/debian/gmail-notify.manpages	2012-03-09 11:52:20 UTC (rev 8273)
@@ -0,0 +1 @@
+debian/gmail-notify.1

Modified: packages/gmail-notify/trunk/debian/patches/01_fixes.patch
===================================================================
--- packages/gmail-notify/trunk/debian/patches/01_fixes.patch	2012-03-09 01:06:17 UTC (rev 8272)
+++ packages/gmail-notify/trunk/debian/patches/01_fixes.patch	2012-03-09 11:52:20 UTC (rev 8273)
@@ -1,5 +1,5 @@
---- 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
+--- a/GmailConfig.py
++++ b/GmailConfig.py
 @@ -9,8 +9,8 @@
  import xmllangs
  import sys
@@ -26,8 +26,8 @@
  		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
+--- a/notifier.py
++++ b/notifier.py
 @@ -8,6 +8,7 @@
  import os
  import pytrayicon

Modified: packages/gmail-notify/trunk/debian/patches/02_trayicon.patch
===================================================================
--- packages/gmail-notify/trunk/debian/patches/02_trayicon.patch	2012-03-09 01:06:17 UTC (rev 8272)
+++ packages/gmail-notify/trunk/debian/patches/02_trayicon.patch	2012-03-09 11:52:20 UTC (rev 8273)
@@ -1,5 +1,5 @@
---- 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
+--- a/notifier.py
++++ b/notifier.py
 @@ -6,7 +6,7 @@
  import gtk
  import time
@@ -7,9 +7,9 @@
 -import pytrayicon
 +from egg.trayicon import TrayIcon
  import sys
+ sys.path.insert (0, "/usr/lib/gmail-notify/")
  import warnings
- import ConfigParser
-@@ -82,7 +82,7 @@
+@@ -83,7 +83,7 @@
  		self.popuptimer=0
  		self.waittimer=0
  		# Create the tray icon object

Modified: packages/gmail-notify/trunk/debian/patches/03_password_fixes.patch
===================================================================
--- packages/gmail-notify/trunk/debian/patches/03_password_fixes.patch	2012-03-09 01:06:17 UTC (rev 8272)
+++ packages/gmail-notify/trunk/debian/patches/03_password_fixes.patch	2012-03-09 11:52:20 UTC (rev 8273)
@@ -1,6 +1,5 @@
-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
+--- a/GmailConfig.py
++++ b/GmailConfig.py
 @@ -237,7 +237,10 @@
  				self.config.remove_option( "options", "gmailusername" )
  				self.config.remove_option( "options", "gmailpassword" )

Modified: packages/gmail-notify/trunk/debian/patches/04_www-browser.patch
===================================================================
--- packages/gmail-notify/trunk/debian/patches/04_www-browser.patch	2012-03-09 01:06:17 UTC (rev 8272)
+++ packages/gmail-notify/trunk/debian/patches/04_www-browser.patch	2012-03-09 11:52:20 UTC (rev 8273)
@@ -1,11 +1,11 @@
---- GmailConfig.py	2005-09-25 11:12:11.000000000 -0600
-+++ GmailConfig2.py	2006-09-22 19:01:21.000000000 -0600
+--- a/GmailConfig.py
++++ b/GmailConfig.py
 @@ -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",   
++	options = { "gmailusername":None, "gmailpassword":None, "browserpath":"www-browser", "lang":"English",
  				"voffset":0, "hoffset":0, "checkinterval":20000, 
  				"animationdelay":15, "popuptimespan":5000}
  					

Modified: packages/gmail-notify/trunk/debian/patches/05_proxy_support.patch
===================================================================
--- packages/gmail-notify/trunk/debian/patches/05_proxy_support.patch	2012-03-09 01:06:17 UTC (rev 8272)
+++ packages/gmail-notify/trunk/debian/patches/05_proxy_support.patch	2012-03-09 11:52:20 UTC (rev 8273)
@@ -1,6 +1,10 @@
-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
+Description: Provide proxy support.
+Author: Luca Falavigna <dktrkranz at ubuntu.com>
+Bug-Debian: http://bugs.debian.org/428260
+Bug-Ubuntu: https://launchpad.net/bugs/66276
+
+--- a/gmailatom.py
++++ b/gmailatom.py
 @@ -116,12 +116,17 @@
  	host = "https://mail.google.com"
  	url = host + "/mail/feed/atom"
@@ -21,17 +25,16 @@
  		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
+--- a/GmailConfig.py
++++ b/GmailConfig.py
 @@ -18,8 +18,8 @@
  	configElements = None 
  
  	# Declare global variables for configuration as dictionary
--	options = { "gmailusername":None, "gmailpassword":None, "browserpath":"www-browser", "lang":"English",   
+-	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, 
++				"lang":"English", "voffset":0, "hoffset":0, "checkinterval":20000,
  				"animationdelay":15, "popuptimespan":5000}
  					
  	config = ConfigParser.RawConfigParser()
@@ -88,9 +91,8 @@
  			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
+--- a/notifier.py
++++ b/notifier.py
 @@ -163,7 +163,7 @@
  			gtk.main_iteration( gtk.TRUE)
  		# Attemp connection
@@ -100,7 +102,7 @@
  			self.connection.refreshInfo()
  			print "connection successful... continuing"
  			self._tooltip.set_tip(self.tray,self.lang.get_string(14))
-@@ -383,6 +383,6 @@
+@@ -383,7 +383,7 @@
  		self.maintimer = gtk.timeout_add(self.options["checkinterval"], self.mail_check )
  
  		# Update user/pass
@@ -108,9 +110,9 @@
 +		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
+ 
+--- a/langs.xml
++++ b/langs.xml
 @@ -34,6 +34,7 @@
  		<string id="33">Some value is missing</string>
  		<string id="34">Save username and password</string>

Modified: packages/gmail-notify/trunk/debian/patches/06_gmail_to_mail.patch
===================================================================
--- packages/gmail-notify/trunk/debian/patches/06_gmail_to_mail.patch	2012-03-09 01:06:17 UTC (rev 8272)
+++ packages/gmail-notify/trunk/debian/patches/06_gmail_to_mail.patch	2012-03-09 11:52:20 UTC (rev 8273)
@@ -1,5 +1,9 @@
---- notifier.py.orig	2009-09-13 11:59:53.000000000 +0100
-+++ notifier.py	2009-09-13 12:00:10.000000000 +0100
+Description: Changed gmail.google.com to mail.google.com.
+Bug-Debian: http://bugs.debian.org/503740
+Author: Alan Woodland <awoodland at debian.org>
+
+--- a/notifier.py
++++ b/notifier.py
 @@ -352,8 +352,8 @@
  
  	def gotourl( self, wg=None):

Modified: packages/gmail-notify/trunk/debian/patches/07_preferences-window.patch
===================================================================
--- packages/gmail-notify/trunk/debian/patches/07_preferences-window.patch	2012-03-09 01:06:17 UTC (rev 8272)
+++ packages/gmail-notify/trunk/debian/patches/07_preferences-window.patch	2012-03-09 11:52:20 UTC (rev 8273)
@@ -1,7 +1,11 @@
-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 @@
+Description: Preferences window will now open up once.
+Bug-Debian: http://bugs.debian.org/432676
+Bug-Ubuntu: https://launchpad.net/bugs/62081
+Author: Diego Ongaro (ongardie)
+
+--- a/GmailConfig.py
++++ b/GmailConfig.py
+@@ -264,9 +264,13 @@
  	def get_lang( self ):
  		return self.lang
  			
@@ -15,9 +19,8 @@
  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
+--- a/notifier.py
++++ b/notifier.py
 @@ -56,8 +56,11 @@
          	# Reference to global options
  	        self.options = self.configWindow.options

Modified: packages/gmail-notify/trunk/debian/patches/08_ampersand-fix.patch
===================================================================
--- packages/gmail-notify/trunk/debian/patches/08_ampersand-fix.patch	2012-03-09 01:06:17 UTC (rev 8272)
+++ packages/gmail-notify/trunk/debian/patches/08_ampersand-fix.patch	2012-03-09 11:52:20 UTC (rev 8273)
@@ -1,5 +1,8 @@
---- notifier.py.orig	2009-09-13 12:12:38.000000000 +0100
-+++ notifier.py	2009-09-13 12:17:08.000000000 +0100
+Description: Replace & with & in popups.
+Bug-Debian: http://bugs.debian.org/420871
+
+--- a/notifier.py
++++ b/notifier.py
 @@ -15,6 +15,7 @@
  import GmailConfig
  import GmailPopupMenu

Added: packages/gmail-notify/trunk/debian/patches/series
===================================================================
--- packages/gmail-notify/trunk/debian/patches/series	                        (rev 0)
+++ packages/gmail-notify/trunk/debian/patches/series	2012-03-09 11:52:20 UTC (rev 8273)
@@ -0,0 +1,8 @@
+01_fixes.patch
+02_trayicon.patch
+03_password_fixes.patch
+04_www-browser.patch
+05_proxy_support.patch
+06_gmail_to_mail.patch
+07_preferences-window.patch
+08_ampersand-fix.patch

Modified: packages/gmail-notify/trunk/debian/rules
===================================================================
--- packages/gmail-notify/trunk/debian/rules	2012-03-09 01:06:17 UTC (rev 8272)
+++ packages/gmail-notify/trunk/debian/rules	2012-03-09 11:52:20 UTC (rev 8273)
@@ -1,14 +1,4 @@
 #!/usr/bin/make -f
 
-export DH_VERBOSE=1
-
-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_python2
+%:
+	dh $@ --with python2

Modified: packages/gmail-notify/trunk/debian/source/format
===================================================================
--- packages/gmail-notify/trunk/debian/source/format	2012-03-09 01:06:17 UTC (rev 8272)
+++ packages/gmail-notify/trunk/debian/source/format	2012-03-09 11:52:20 UTC (rev 8273)
@@ -1 +1 @@
-1.0
+3.0 (quilt)

More information about the Python-apps-commits mailing list