Changeset 306

Timestamp:

08/03/09 03:11:39 (3 years ago)

Author:

marc

Message:

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

Files:

• branches/release/0.2/ChangeLog (modified) (1 diff)
• branches/release/0.2/Makefile (modified) (3 diffs)
• branches/release/0.2/Makefile.Debian (deleted)
• branches/release/0.2/debian/itaka.menu (modified) (1 diff)
• branches/release/0.2/debian/rules (modified) (2 diffs)
• trunk/ChangeLog (modified) (1 diff)
• trunk/Makefile (modified) (2 diffs)
• trunk/debian/itaka.menu (modified) (1 diff)
• trunk/debian/rules (modified) (1 diff)

branches/release/0.2/ChangeLog

@@ -1 +1 @@
 0.2.2:
  * Fixed a fatal bug with Python 2.6/PyGTK 2.14
+ * Simplified and improved Makefile
 
 0.2.1: 

branches/release/0.2/Makefile

@@ -6 +6 @@
 FIND ?= find
 
-# autodetect GNOME prefix, change this if you want it elsewhere
-#PREFIX ?= `pkg-config libgnome-2.0 --variable=prefix || echo /usr`
 PREFIX = /usr
+# When debian builds it, it passes its own DESTDIR
 DESTDIR = $(PREFIX)
 
@@ -15 +14 @@
 DATADIR = $(DESTDIR)/share/itaka
 IMAGESDIR = $(DATADIR)/images
-# For debian compatibility
-REPLACEIMAGESDIR = $(PREFIX)/share/itaka/images
 APPLICATIONSDIR = $(DESTDIR)/share/applications
 ICONDIR = $(DESTDIR)/share/pixmaps
 MANDIR = $(DESTDIR)/share/man/man1
 
+# For debian compatibility, these are hardcoded
+REPLACEIMAGESDIR = $(PREFIX)/share/itaka/images/
+
 PYFILES := $(shell $(FIND) . -name "*.py" -print)
 
 install: 
+        # Replace images directory
         mv config.py config.py.old
         sed -e "s|/usr/share/itaka/images/|$(REPLACEIMAGESDIR)|g" config.py.old > config.py
+        mv config.py.old config.py
+
+        gzip -9 -c share/itaka.1 > share/itaka.1.gz
+
         $(INSTALL) -m 755 -d $(BINDIR) $(DATADIR) $(LIBDIR) $(IMAGESDIR) $(APPLICATIONSDIR) $(ICONDIR) $(MANDIR)
         $(INSTALL) -m 755 *.py $(LIBDIR)
-        $(INSTALL) -m 644 share/images/* $(IMAGESDIR)
-        $(INSTALL) -m 644 share/images/itaka.png $(ICONDIR)
+
+        # We only need a few images
+        $(INSTALL) -m 644 share/images/itaka.png $(IMAGESDIR)
+        $(INSTALL) -m 644 share/images/itaka-take.png $(IMAGESDIR)
+        $(INSTALL) -m 644 share/images/itaka16x16-take.png $(IMAGESDIR)
+        $(INSTALL) -m 644 share/images/itaka64x64.png $(IMAGESDIR)
+
+        ln -sf $(IMAGESDIR)/itaka.png $(ICONDIR)/itaka.png
+
         $(INSTALL) -m 644 share/itaka.desktop $(APPLICATIONSDIR)
-        gzip -9 -c share/itaka.1 > share/itaka.1.gz
         $(INSTALL) -m 644 share/itaka.1.gz $(MANDIR)
         if test -f $(BINDIR)/itaka; then rm $(BINDIR)/itaka; fi 
@@ -37 +48 @@
         echo $( ls $(BINDIR)/itaka )
         chmod +x $(BINDIR)/itaka
-        mv config.py.old config.py
-        rm share/itaka.1.gz
+        
 uninstall:
         rm -r $(BINDIR)/itaka $(DATADIR) $(LIBDIR) $(ICONDIR)/itaka.png $(APPLICATIONSDIR)/itaka.desktop $(MANDIR)/itaka.1.gz
+
+clean:
+        find . -name '*.pyc' -o -name '*.pyo' -exec rm {} \;
+        rm share/itaka.1.gz
+
+help:
+        @echo Usage:
+        @echo make install              - install binaries into the official directories
+        @echo make clean                - delete built modules and object files
+        @echo make uninstall            - uninstall binaries from the official directories
+        @echo make help                 - prints this help
+        @echo
+

branches/release/0.2/debian/itaka.menu

@@ -3 +3 @@
     section="Applications/Network/Monitoring" \
     title="Itaka" \
-    longtitle="Itaka Screenshot Server"
+    longtitle="Itaka Screenshot Server" \
     command="/usr/bin/itaka" \
     hints="screenshooting" \

branches/release/0.2/debian/rules

@@ -1 +1 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
@@ -50 +45 @@
 
         # Add here commands to install the package into debian/itaka.
-        $(MAKE) -f Makefile.Debian DESTDIR=$(CURDIR)/debian/itaka install
-        #$(MAKE) install
+        $(MAKE) DESTDIR=$(CURDIR)/debian/itaka/usr install
 
         # And other miscellaneous tasks

trunk/ChangeLog

@@ -10 +10 @@
  * Don't check for system compatibility of Libnotify
  * Code cleanup towards PEP-8 compliance
- * Simplified and improved Makefile
 
 0.2.2:
  * Fixed a fatal bug with Python 2.6/PyGTK 2.14
+ * Simplified and improved Makefile
 
 0.2.1:

trunk/Makefile

@@ -26 +26 @@
 
 install: 
+        # Replace images and locales directory
         mv config.py config.py.old
         mv itaka.py itaka.py.old
         sed -e "s|/usr/share/itaka/images/|$(REPLACEIMAGESDIR)|g" config.py.old > config.py
         sed -e "s|/usr/share/locale/|$(REPLACELOCALEDIR)|g" itaka.py.old > itaka.py
+        mv config.py.old config.py
+        mv itaka.py.old itaka.py
+        
         $(INSTALL) -m 755 -d $(BINDIR) $(DATADIR) $(LIBDIR) $(IMAGESDIR) $(APPLICATIONSDIR) $(ICONDIR) $(MANDIR)
         $(INSTALL) -m 755 *.py $(LIBDIR)
-        $(INSTALL) -m 644 share/images/* $(IMAGESDIR)
-        $(INSTALL) -m 644 share/images/itaka.png $(ICONDIR)
+
+        # We only need a few images
+        $(INSTALL) -m 644 share/images/itaka.png $(IMAGESDIR)
+        $(INSTALL) -m 644 share/images/itaka-take.png $(IMAGESDIR)
+        $(INSTALL) -m 644 share/images/itaka16x16-take.png $(IMAGESDIR)
+        $(INSTALL) -m 644 share/images/itaka64x64.png $(IMAGESDIR)
+
+        ln -sf share/images/itaka.png $(ICONDIR)/itaka.png
+
         $(INSTALL) -m 644 share/itaka.desktop $(APPLICATIONSDIR)
         gzip -9 -c share/itaka.1 > share/itaka.1.gz
@@ -41 +52 @@
         echo $( ls $(BINDIR)/itaka )
         chmod +x $(BINDIR)/itaka
-        mv config.py.old config.py
-        mv itaka.py.old itaka.py
         
         for lang in locale/*; do 

trunk/debian/itaka.menu

@@ -3 +3 @@
     section="Applications/Network/Monitoring" \
     title="Itaka" \
-    longtitle="Itaka Screenshot Server"
+    longtitle="Itaka Screenshot Server" \
     command="/usr/bin/itaka" \
     hints="screenshooting" \

trunk/debian/rules

@@ -1 +1 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.