resolved conflicts

debian/changelog

@@ -0,0 +1,6 @@
+mitter (1.0.0-1) unstable; urgency=low
+
+  * Packaging mitter 1.0.0
+
+-- Julio Biason <julio.biason@gmail.com> Sat, 23 Jan 2010
+

debian/compat

@@ -0,0 +1 @@
+5

debian/control

@@ -0,0 +1,12 @@
+Source: mitter
+Section: net
+Priority: extra
+Maintainer: Julio Biason <julio.biason@gmail.com>
+Build-Depends: debhelper (>= 5)
+Standards-Version: 3.7.2
+
+Package: mitter
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: python-gtk2
+Description: A microblogging tool with multiple interfaces

debian/copyright

@@ -0,0 +1,22 @@
+THis package was debianized by Sugree Phatanapherom <sugree@gmail.com> and Julio Biason <julio.biason@gmail.com> on Sat, 21 Jan 2010
+
+It was downloaded from <http://mitter.googlecode.com>
+
+Upstream Authors(s):
+
+    Julio Biaosn <julio.biason@gmail.com>
+    Deepak Sarda <deepak@antrix.net>
+    Gerald Kaszuba <gerald.kaszuba@gmail.com>
+
+Copyright:
+
+    Julio Biaosn <julio.biason@gmail.com>
+    Deepak Sarda <deepak@antrix.net>
+    Gerald Kaszuba <gerald.kaszuba@gmail.com>
+
+License:
+
+    GPLv3
+
+The Debian Package is (c) 2008 Sugree Phatanapherom <sugree@gmail.com> and (c) 2010 Julio Biason <julio.biason@gmail.com>; it's liecensed under the GPL, see `/usr/share/common-licenses/GPL`.
+

debian/dirs

@@ -0,0 +1,2 @@
+usr/bin
+user/sbin

debian/install

@@ -0,0 +1 @@
+debian/mitter.desktop	usr/share/applications

debian/menu

@@ -0,0 +1,4 @@
+?package(mitter):needs="X11" section="Applications/Network/Communication" \
+  title="Mitter" command="/usr/bin/mitter" \
+        longtitle="Microblogging client" \
+        icon="/usr/share/pixmaps/mitter.png"

debian/pycompat

@@ -0,0 +1 @@
+2

debian/pyversions

@@ -0,0 +1 @@
+2.5

debian/rules

@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+DEB_PYTHON_SYSTEM=pysupport
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+
+DEB_COMPRESS_EXCLUDE := .py

mitter.desktop

@@ -1,9 +1,11 @@
 [Desktop Entry]
-Version=0.4
-Encoding=UTF-8
-Name=Mitter
-Comment=A client for twitter.com
+Version=1.0.0-alpha4
+GenericName=Microblogging tool
+Comment=A microblogging tool with multiple interfaces
 Exec=/usr/bin/mitter
 Icon=mitter
+Terminal=false
+Encoding=UTF-8
+Name=Mitter
 Type=Application
 Categories=Network

mitterlib/ui/ui_pygtk.py

@@ -355,21 +355,19 @@ class Interface(object):
               <separator />
               <menuitem action="Update" />
               <menuitem action="Cancel" />
-              <menuitem action="ShrinkURL" />
-              <menuitem action="MuteNotify" />
               <separator />
               <menuitem action="Settings" />
             </menu>
+            <menu action="View">
+              <menuitem action="Messages" />
+              <menuitem action="Replies" />
+            </menu>
             <menu action="Message">
               <menuitem action="Delete" />
               <menuitem action="Reply" />
               <menuitem action="Repost" />
               <menuitem action="Favourite" />
             </menu>
-            <menu action="View">
-              <menuitem action="Messages" />
-              <menuitem action="Replies" />
-            </menu>
             <menu action="Help">
               <menuitem action="About" />
             </menu>
@@ -638,13 +636,9 @@ class Interface(object):
     def _window_to_tray(self, statusicon, user_data=None):
         """Minimize/display main window (as in minimize to tray.)"""
         if self._main_window.get_property('visible'):
-            (x, y) = self._main_window.get_position()
-            _log.debug('Current position: %d x %d', x, y)
             self._options[self.NAMESPACE]['position_x'] = x
             self._options[self.NAMESPACE]['position_y'] = y
 
-            (width, height) = self._main_window.get_size()
-            _log.debug('Current window size: %d x %d', width, height)
             self._options[self.NAMESPACE]['width'] = width
             self._options[self.NAMESPACE]['height'] = height