Changeset 306


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

Fixed Menu, improved makefile (backported from trunk), don't install so many images

Files:
1 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • branches/release/0.2/ChangeLog

    r294 r306  
    110.2.2: 
    22 * Fixed a fatal bug with Python 2.6/PyGTK 2.14 
     3 * Simplified and improved Makefile 
    34 
    450.2.1:  
  • branches/release/0.2/Makefile

    r298 r306  
    66FIND ?= find 
    77 
    8 # autodetect GNOME prefix, change this if you want it elsewhere 
    9 #PREFIX ?= `pkg-config libgnome-2.0 --variable=prefix || echo /usr` 
    108PREFIX = /usr 
     9# When debian builds it, it passes its own DESTDIR 
    1110DESTDIR = $(PREFIX) 
    1211 
     
    1514DATADIR = $(DESTDIR)/share/itaka 
    1615IMAGESDIR = $(DATADIR)/images 
    17 # For debian compatibility 
    18 REPLACEIMAGESDIR = $(PREFIX)/share/itaka/images 
    1916APPLICATIONSDIR = $(DESTDIR)/share/applications 
    2017ICONDIR = $(DESTDIR)/share/pixmaps 
    2118MANDIR = $(DESTDIR)/share/man/man1 
    2219 
     20# For debian compatibility, these are hardcoded 
     21REPLACEIMAGESDIR = $(PREFIX)/share/itaka/images/ 
     22 
    2323PYFILES := $(shell $(FIND) . -name "*.py" -print) 
    2424 
    2525install:  
     26        # Replace images directory 
    2627        mv config.py config.py.old 
    2728        sed -e "s|/usr/share/itaka/images/|$(REPLACEIMAGESDIR)|g" config.py.old > config.py 
     29        mv config.py.old config.py 
     30 
     31        gzip -9 -c share/itaka.1 > share/itaka.1.gz 
     32 
    2833        $(INSTALL) -m 755 -d $(BINDIR) $(DATADIR) $(LIBDIR) $(IMAGESDIR) $(APPLICATIONSDIR) $(ICONDIR) $(MANDIR) 
    2934        $(INSTALL) -m 755 *.py $(LIBDIR) 
    30         $(INSTALL) -m 644 share/images/* $(IMAGESDIR) 
    31         $(INSTALL) -m 644 share/images/itaka.png $(ICONDIR) 
     35 
     36        # We only need a few images 
     37        $(INSTALL) -m 644 share/images/itaka.png $(IMAGESDIR) 
     38        $(INSTALL) -m 644 share/images/itaka-take.png $(IMAGESDIR) 
     39        $(INSTALL) -m 644 share/images/itaka16x16-take.png $(IMAGESDIR) 
     40        $(INSTALL) -m 644 share/images/itaka64x64.png $(IMAGESDIR) 
     41 
     42        ln -sf $(IMAGESDIR)/itaka.png $(ICONDIR)/itaka.png 
     43 
    3244        $(INSTALL) -m 644 share/itaka.desktop $(APPLICATIONSDIR) 
    33         gzip -9 -c share/itaka.1 > share/itaka.1.gz 
    3445        $(INSTALL) -m 644 share/itaka.1.gz $(MANDIR) 
    3546        if test -f $(BINDIR)/itaka; then rm $(BINDIR)/itaka; fi  
     
    3748        echo $( ls $(BINDIR)/itaka ) 
    3849        chmod +x $(BINDIR)/itaka 
    39         mv config.py.old config.py 
    40         rm share/itaka.1.gz 
     50         
    4151uninstall: 
    4252        rm -r $(BINDIR)/itaka $(DATADIR) $(LIBDIR) $(ICONDIR)/itaka.png $(APPLICATIONSDIR)/itaka.desktop $(MANDIR)/itaka.1.gz 
     53 
     54clean: 
     55        find . -name '*.pyc' -o -name '*.pyo' -exec rm {} \; 
     56        rm share/itaka.1.gz 
     57 
     58help: 
     59        @echo Usage: 
     60        @echo make install              - install binaries into the official directories 
     61        @echo make clean                - delete built modules and object files 
     62        @echo make uninstall            - uninstall binaries from the official directories 
     63        @echo make help                 - prints this help 
     64        @echo 
     65 
  • branches/release/0.2/debian/itaka.menu

    r303 r306  
    33    section="Applications/Network/Monitoring" \ 
    44    title="Itaka" \ 
    5     longtitle="Itaka Screenshot Server" 
     5    longtitle="Itaka Screenshot Server" \ 
    66    command="/usr/bin/itaka" \ 
    77    hints="screenshooting" \ 
  • branches/release/0.2/debian/rules

    r305 r306  
    11#!/usr/bin/make -f 
    22# -*- makefile -*- 
    3 # Sample debian/rules that uses debhelper. 
    4 # This file was originally written by Joey Hess and Craig Small. 
    5 # As a special exception, when this file is copied by dh-make into a 
    6 # dh-make output file, you may use that output file without restriction. 
    7 # This special exception was added by Craig Small in version 0.37 of dh-make. 
    83 
    94# Uncomment this to turn on verbose mode. 
     
    5045 
    5146        # Add here commands to install the package into debian/itaka. 
    52         $(MAKE) -f Makefile.Debian DESTDIR=$(CURDIR)/debian/itaka install 
    53         #$(MAKE) install 
     47        $(MAKE) DESTDIR=$(CURDIR)/debian/itaka/usr install 
    5448 
    5549        # And other miscellaneous tasks 
  • trunk/ChangeLog

    r297 r306  
    1010 * Don't check for system compatibility of Libnotify 
    1111 * Code cleanup towards PEP-8 compliance 
    12  * Simplified and improved Makefile 
    1312 
    14130.2.2: 
    1514 * Fixed a fatal bug with Python 2.6/PyGTK 2.14 
     15 * Simplified and improved Makefile 
    1616 
    17170.2.1: 
  • trunk/Makefile

    r298 r306  
    2626 
    2727install:  
     28        # Replace images and locales directory 
    2829        mv config.py config.py.old 
    2930        mv itaka.py itaka.py.old 
    3031        sed -e "s|/usr/share/itaka/images/|$(REPLACEIMAGESDIR)|g" config.py.old > config.py 
    3132        sed -e "s|/usr/share/locale/|$(REPLACELOCALEDIR)|g" itaka.py.old > itaka.py 
     33        mv config.py.old config.py 
     34        mv itaka.py.old itaka.py 
     35         
    3236        $(INSTALL) -m 755 -d $(BINDIR) $(DATADIR) $(LIBDIR) $(IMAGESDIR) $(APPLICATIONSDIR) $(ICONDIR) $(MANDIR) 
    3337        $(INSTALL) -m 755 *.py $(LIBDIR) 
    34         $(INSTALL) -m 644 share/images/* $(IMAGESDIR) 
    35         $(INSTALL) -m 644 share/images/itaka.png $(ICONDIR) 
     38 
     39        # We only need a few images 
     40        $(INSTALL) -m 644 share/images/itaka.png $(IMAGESDIR) 
     41        $(INSTALL) -m 644 share/images/itaka-take.png $(IMAGESDIR) 
     42        $(INSTALL) -m 644 share/images/itaka16x16-take.png $(IMAGESDIR) 
     43        $(INSTALL) -m 644 share/images/itaka64x64.png $(IMAGESDIR) 
     44 
     45        ln -sf share/images/itaka.png $(ICONDIR)/itaka.png 
     46 
    3647        $(INSTALL) -m 644 share/itaka.desktop $(APPLICATIONSDIR) 
    3748        gzip -9 -c share/itaka.1 > share/itaka.1.gz 
     
    4152        echo $( ls $(BINDIR)/itaka ) 
    4253        chmod +x $(BINDIR)/itaka 
    43         mv config.py.old config.py 
    44         mv itaka.py.old itaka.py 
    4554         
    4655        for lang in locale/*; do  
  • trunk/debian/itaka.menu

    r302 r306  
    33    section="Applications/Network/Monitoring" \ 
    44    title="Itaka" \ 
    5     longtitle="Itaka Screenshot Server" 
     5    longtitle="Itaka Screenshot Server" \ 
    66    command="/usr/bin/itaka" \ 
    77    hints="screenshooting" \ 
  • trunk/debian/rules

    r305 r306  
    11#!/usr/bin/make -f 
    22# -*- makefile -*- 
    3 # Sample debian/rules that uses debhelper. 
    4 # This file was originally written by Joey Hess and Craig Small. 
    5 # As a special exception, when this file is copied by dh-make into a 
    6 # dh-make output file, you may use that output file without restriction. 
    7 # This special exception was added by Craig Small in version 0.37 of dh-make. 
    83 
    94# Uncomment this to turn on verbose mode. 
Note: See TracChangeset for help on using the changeset viewer.