Changeset 309


Ignore:
Timestamp:
08/03/09 11:06:45 (8 years ago)
Author:
marc
Message:

Improved spec file, removed unused images from installation, fixed a bug with secure images not being shown in ntotifications, bumped changelog, and improved debian/rules build on converting images

Files:
12 edited

Legend:

Unmodified
Added
Removed
  • branches/release/0.2/ChangeLog

    r306 r309  
    22 * Fixed a fatal bug with Python 2.6/PyGTK 2.14 
    33 * Simplified and improved Makefile 
     4 * Fixed an issue with the right images showing up in notifications 
    45 
    560.2.1:  
  • branches/release/0.2/Makefile

    r306 r309  
    3737        $(INSTALL) -m 644 share/images/itaka.png $(IMAGESDIR) 
    3838        $(INSTALL) -m 644 share/images/itaka-take.png $(IMAGESDIR) 
     39        $(INSTALL) -m 644 share/images/itaka-secure.png $(IMAGESDIR) 
     40        $(INSTALL) -m 644 share/images/itaka-secure-take.png $(IMAGESDIR) 
    3941        $(INSTALL) -m 644 share/images/itaka16x16-take.png $(IMAGESDIR) 
     42        $(INSTALL) -m 644 share/images/itaka16x16-secure-take.png $(IMAGESDIR) 
    4043        $(INSTALL) -m 644 share/images/itaka64x64.png $(IMAGESDIR) 
    4144 
  • branches/release/0.2/debian/rules

    r306 r309  
    3232 
    3333        # Add here commands to clean up after the build process. 
    34         #-$(MAKE) clean 
     34        -$(MAKE) clean 
    3535 
    3636        -rm -f debian/files 
     
    4848 
    4949        # And other miscellaneous tasks 
    50         /usr/bin/convert share/images/itaka32x32.png debian/itaka/usr/share/pixmaps/itaka.xpm 
    51         /usr/bin/convert share/images/itaka16x16.png debian/itaka/usr/share/pixmaps/itaka16x16.xpm 
     50        /usr/bin/convert share/images/itaka.png -resize 32x32 debian/itaka/usr/share/pixmaps/itaka.xpm 
     51        /usr/bin/convert share/images/itaka.png -resize 16x16 debian/itaka/usr/share/pixmaps/itaka16x16.xpm 
    5252 
    5353# Build architecture-independent files here. 
  • branches/release/0.2/itaka.spec

    r300 r309  
    11Summary: On-demand screenshooting server 
    22Name: itaka 
    3 Version: 0.2.1 
    4 Release: 2 
     3Version: 0.2.2 
     4Release: 1 
    55License: GPL 
    66Group: Applications/Communications 
     
    99Packager: Kurt Erickson <psychogenicshk@users.sourceforge.net> 
    1010 
    11 Source: http://internap.dl.sourceforge.net/sourceforge/itaka/itaka-0.2.1.tar.bz2 
     11Source: http://internap.dl.sourceforge.net/sourceforge/itaka/itaka-0.2.2.tar.bz2 
    1212BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root 
    1313 
     
    5151%{_prefix}/share/man/man1/itaka.1.gz 
    5252%{_prefix}/share/applications/itaka.desktop 
    53 %{_prefix}/share/itaka/images/itaka16x16.png 
     53%{_prefix}/share/itaka/images/itaka.png 
    5454%{_prefix}/share/itaka/images/itaka-take.png 
    55 %{_prefix}/share/itaka/images/itaka32x32.png 
     55%{_prefix}/share/itaka/images/itaka-secure.png 
    5656%{_prefix}/share/itaka/images/itaka-secure-take.png 
    57 %{_prefix}/share/itaka/images/itaka64x64-take.png 
    5857%{_prefix}/share/itaka/images/itaka16x16-take.png 
    59 %{_prefix}/share/itaka/images/itaka512x512-take.png 
    60 %{_prefix}/share/itaka/images/itaka-secure.svg 
    61 %{_prefix}/share/itaka/images/itaka.psd 
     58%{_prefix}/share/itaka/images/itaka16x16-secure-take.png 
    6259%{_prefix}/share/itaka/images/itaka64x64.png 
    63 %{_prefix}/share/itaka/images/itaka512x512.png 
    64 %{_prefix}/share/itaka/images/itaka.png 
    65 %{_prefix}/share/itaka/images/itaka.svg 
    66 %{_prefix}/share/itaka/images/itaka-secure.png 
    67 %{_prefix}/share/itaka/images/itaka-logo.png 
    6860%{_prefix}/share/pixmaps/itaka.png 
    6961%{_prefix}/lib/itaka/uigtk.py 
  • branches/release/0.2/server.py

    r295 r309  
    421421        if self.configuration['server']['notify'] and self.itaka_globals.notifyavailable: 
    422422            import pynotify 
    423             uri = "file://" + (os.path.join(self.itaka_globals.image_dir, "itaka-take.png"))  
     423 
     424            if self.configuration['server']['authentication']: 
     425                uri = "file://" + (os.path.join(self.itaka_globals.image_dir, "itaka-secure-take.png"))  
     426            else: 
     427                uri = "file://" + (os.path.join(self.itaka_globals.image_dir, "itaka-take.png"))  
    424428 
    425429            n = pynotify.Notification('Screenshot taken', '%s requested screenshot' % (self.ip), uri) 
  • branches/release/0.2/uigtk.py

    r295 r309  
    318318        else: 
    319319            self.statusIcon.set_from_pixbuf(self.icon_pixbuf) 
     320 
    320321        self.statusIcon.set_tooltip('Itaka') 
    321322        self.statusIcon.set_visible(True) 
     
    12911292        if self.configuration['server']['authentication']: 
    12921293            self.itakaLogo.set_from_file(os.path.join(self.itakaglobals.image_dir, "itaka-secure.png"))             
     1294            self.statusIcon.set_from_file(os.path.join(self.itakaglobals.image_dir, 'itaka-secure.png')) 
    12931295        else: 
    12941296            self.itakaLogo.set_from_file(os.path.join(self.itakaglobals.image_dir, "itaka.png")) 
    1295  
    1296         self.statusIcon.set_from_pixbuf(self.icon_pixbuf) 
     1297            self.statusIcon.set_from_file(os.path.join(self.itakaglobals.image_dir, 'itaka.png')) 
     1298 
    12971299        # Only run this event once 
    12981300        return False 
     
    13171319        self.time = time 
    13181320 
    1319         self.log.detailed_message('Screenshot served to %s' % (self.ip), 'Screenshot number %d served to %s' % (self.counter, self.ip), ['pixbuf', gtk.gdk.pixbuf_new_from_file(os.path.join(self.itakaglobals.image_dir, "itaka16x16-take.png"))]) 
     1321        if self.configuration['server']['authentication']: 
     1322            self.log.detailed_message('Screenshot served to %s' % (self.ip), 'Screenshot number %d served to %s' % (self.counter, self.ip), ['pixbuf', gtk.gdk.pixbuf_new_from_file(os.path.join(self.itakaglobals.image_dir, "itaka16x16-secure-take.png"))]) 
     1323        else: 
     1324            self.log.detailed_message('Screenshot served to %s' % (self.ip), 'Screenshot number %d served to %s' % (self.counter, self.ip), ['pixbuf', gtk.gdk.pixbuf_new_from_file(os.path.join(self.itakaglobals.image_dir, "itaka16x16-take.png"))]) 
    13201325 
    13211326        self.labelServed.set_text('<b>Served</b>: %d' % (self.counter)) 
     
    13281333        if self.configuration['server']['authentication']: 
    13291334            self.itakaLogo.set_from_file(os.path.join(self.itakaglobals.image_dir, 'itaka-secure-take.png')) 
     1335            self.statusIcon.set_from_file(os.path.join(self.itakaglobals.image_dir, 'itaka-secure-take.png')) 
    13301336        else: 
    13311337            self.itakaLogo.set_from_file(os.path.join(self.itakaglobals.image_dir, 'itaka-take.png')) 
    1332         self.statusIcon.set_from_file(os.path.join(self.itakaglobals.image_dir, 'itaka-take.png')) 
     1338            self.statusIcon.set_from_file(os.path.join(self.itakaglobals.image_dir, 'itaka-take.png')) 
    13331339        gobject.timeout_add(1500, self.set_standard_images) 
    13341340 
  • trunk/ChangeLog

    r306 r309  
    1414 * Fixed a fatal bug with Python 2.6/PyGTK 2.14 
    1515 * Simplified and improved Makefile 
     16 * Fixed an issue with the right images showing up in notifications 
    1617 
    17180.2.1: 
  • trunk/Makefile

    r307 r309  
    4040        $(INSTALL) -m 644 share/images/itaka.png $(IMAGESDIR) 
    4141        $(INSTALL) -m 644 share/images/itaka-take.png $(IMAGESDIR) 
     42        $(INSTALL) -m 644 share/images/itaka-secure.png $(IMAGESDIR) 
     43        $(INSTALL) -m 644 share/images/itaka-secure-take.png $(IMAGESDIR) 
    4244        $(INSTALL) -m 644 share/images/itaka16x16-take.png $(IMAGESDIR) 
     45        $(INSTALL) -m 644 share/images/itaka16x16-secure-take.png $(IMAGESDIR) 
    4346        $(INSTALL) -m 644 share/images/itaka64x64.png $(IMAGESDIR) 
    4447 
  • trunk/debian/rules

    r306 r309  
    4848 
    4949        # And other miscellaneous tasks 
    50         /usr/bin/convert share/images/itaka32x32.png debian/itaka/usr/share/pixmaps/itaka.xpm 
    51         /usr/bin/convert share/images/itaka16x16.png debian/itaka/usr/share/pixmaps/itaka16x16.xpm 
     50        /usr/bin/convert share/images/itaka.png -resize 32x32 debian/itaka/usr/share/pixmaps/itaka.xpm 
     51        /usr/bin/convert share/images/itaka.png -resize 16x16 debian/itaka/usr/share/pixmaps/itaka16x16.xpm 
    5252 
    5353# Build architecture-independent files here. 
  • trunk/itaka.spec

    r300 r309  
    11Summary: On-demand screenshooting server 
    22Name: itaka 
    3 Version: 1.0 
     3Version: 0.2.2 
    44Release: 1 
    55License: GPL 
     
    99Packager: Kurt Erickson <psychogenicshk@users.sourceforge.net> 
    1010 
    11 Source: http://internap.dl.sourceforge.net/sourceforge/itaka/itaka-1.0.tar.bz2 
     11Source: http://internap.dl.sourceforge.net/sourceforge/itaka/itaka-0.2.2.tar.bz2 
    1212BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root 
    1313 
     
    5151%{_prefix}/share/man/man1/itaka.1.gz 
    5252%{_prefix}/share/applications/itaka.desktop 
    53 %{_prefix}/share/itaka/images/itaka16x16.png 
     53%{_prefix}/share/itaka/images/itaka.png 
    5454%{_prefix}/share/itaka/images/itaka-take.png 
    55 %{_prefix}/share/itaka/images/itaka32x32.png 
     55%{_prefix}/share/itaka/images/itaka-secure.png 
    5656%{_prefix}/share/itaka/images/itaka-secure-take.png 
    57 %{_prefix}/share/itaka/images/itaka64x64-take.png 
    5857%{_prefix}/share/itaka/images/itaka16x16-take.png 
    59 %{_prefix}/share/itaka/images/itaka512x512-take.png 
    60 %{_prefix}/share/itaka/images/itaka-secure.svg 
    61 %{_prefix}/share/itaka/images/itaka.psd 
     58%{_prefix}/share/itaka/images/itaka16x16-secure-take.png 
    6259%{_prefix}/share/itaka/images/itaka64x64.png 
    63 %{_prefix}/share/itaka/images/itaka512x512.png 
    64 %{_prefix}/share/itaka/images/itaka.png 
    65 %{_prefix}/share/itaka/images/itaka.svg 
    66 %{_prefix}/share/itaka/images/itaka-secure.png 
    67 %{_prefix}/share/itaka/images/itaka-logo.png 
    68 %{_prefix}/share/itaka/images/favicon.ico 
    6960%{_prefix}/share/pixmaps/itaka.png 
    7061%{_prefix}/lib/itaka/uigtk.py 
     
    8576%changelog 
    8677* Thu Jul 20 2007 Kurt Erickson <psychogenicshk@users.sourceforge.net> - 0.2.1-2 
    87 - Pulled 1.0 from upstream. 
    88  
    89 * Thu Jul 20 2007 Kurt Erickson <psychogenicshk@users.sourceforge.net> - 0.2.1-2 
    9078- Removed notify-python dependancy (it's optional). 
    9179 
  • trunk/server.py

    r287 r309  
    480480        if self.configuration['server']['notify'] and self.itaka_globals.notify_available: 
    481481            import pynotify 
     482 
    482483            # 48x48 image by default looks bad in Ubuntu 
    483             uri = "file://" + (os.path.join(self.itaka_globals.image_dir, "itaka-take.png"))  
     484            if self.configuration['server']['authentication']: 
     485                uri = "file://" + (os.path.join(self.itaka_globals.image_dir, "itaka-secure-take.png"))  
     486            else: 
     487                uri = "file://" + (os.path.join(self.itaka_globals.image_dir, "itaka-take.png"))  
    484488             
    485489            n = pynotify.Notification(_('Screenshot taken'), _('%s captured the screen' % (self.ip)), uri) 
     
    494498            winsound.PlaySound(os.path.join(self.itaka_globals.sound_dir, "snap.wav"), winsound.SND_FILENAME|winsound.SND_ASYNC) 
    495499        elif self.itaka_globals.platform == 'Linux': 
     500                """ 
    496501               from wave import open as waveOpen 
    497502               from ossaudiodev import open as ossOpen 
     
    511516               dsp.write(data) 
    512517               dsp.close() 
    513  
     518               """ 
    514519         
    515520        self.gui.update_gui(self.counter, self.ip, self.time) 
  • trunk/uigtk.py

    r289 r309  
    14181418        if self.configuration['server']['authentication']: 
    14191419            self.itaka_logo.set_from_file(os.path.join(self.itaka_globals.image_dir, "itaka-secure.png"))             
     1420            self.status_icon.set_from_file(os.path.join(self.itaka_globals.image_dir, 'itaka-secure.png')) 
    14201421        else: 
    14211422            self.itaka_logo.set_from_file(os.path.join(self.itaka_globals.image_dir, "itaka.png")) 
    1422  
    1423         self.status_icon.set_from_pixbuf(self.icon_pixbuf) 
     1423            self.status_icon.set_from_file(os.path.join(self.itaka_globals.image_dir, 'itaka.png')) 
     1424 
    14241425        # Only run this event once 
    14251426        return False 
     
    14391440        """ 
    14401441 
    1441         self.log.verbose_message(_('Screenshot served to %s') % ip, _('Screenshot number %(number)d served to %(ip)s') % {'number': counter, 'ip':ip}, ['pixbuf', gtk.gdk.pixbuf_new_from_file(os.path.join(self.itaka_globals.image_dir, "itaka16x16-take.png"))]) 
     1442        if self.configuration['server']['authentication']: 
     1443            self.log.verbose_message(_('Screenshot served to %s') % ip, _('Screenshot number %(number)d served to %(ip)s') % {'number': counter, 'ip':ip}, ['pixbuf', gtk.gdk.pixbuf_new_from_file(os.path.join(self.itaka_globals.image_dir, "itaka16x16-secure-take.png"))]) 
     1444        else: 
     1445            self.log.verbose_message(_('Screenshot served to %s') % ip, _('Screenshot number %(number)d served to %(ip)s') % {'number': counter, 'ip':ip}, ['pixbuf', gtk.gdk.pixbuf_new_from_file(os.path.join(self.itaka_globals.image_dir, "itaka16x16-take.png"))]) 
    14421446 
    14431447        self.label_served.set_text(_('<b>Served</b>: %d') % (counter)) 
     
    14501454        if self.configuration['server']['authentication']: 
    14511455            self.itaka_logo.set_from_file(os.path.join(self.itaka_globals.image_dir, 'itaka-secure-take.png')) 
     1456            self.status_icon.set_from_file(os.path.join(self.itaka_globals.image_dir, 'itaka-secure-take.png')) 
    14521457        else: 
    14531458            self.itaka_logo.set_from_file(os.path.join(self.itaka_globals.image_dir, 'itaka-take.png')) 
    1454  
    1455         self.status_icon.set_from_file(os.path.join(self.itaka_globals.image_dir, 'itaka-take.png')) 
     1459            self.status_icon.set_from_file(os.path.join(self.itaka_globals.image_dir, 'itaka-take.png')) 
     1460 
    14561461        gobject.timeout_add(1500, self.set_standard_images) 
    14571462 
Note: See TracChangeset for help on using the changeset viewer.