cardapio-bzr/arch_and_python_stuff.patch

   1 diff -Naur src.ori//cardapio/cardapio/Makefile src//cardapio/cardapio/Makefile
   2 --- src.ori//cardapio/cardapio/Makefile 2011-04-11 22:05:32.000000000 +0200
   3 +++ src//cardapio/cardapio/Makefile     2011-04-11 22:06:42.923995141 +0200
   4 @@ -1,4 +1,4 @@
   5 -PYTHON = `which python`
   6 +PYTHON = `which python2`
   7
   8  ifeq ($(DESTDIR),)
   9  DESTDIR =
  10 @@ -15,10 +15,10 @@
  11         @echo "make clean - Get rid of scratch and byte files"
  12
  13  install: install_docky_helper
  14 -       python -m compileall src/
  15 -       python -m compileall src/plugins/
  16 -       python -m compileall src/gnomepanel/
  17 -       python -m compileall src/docky/
  18 +       $(PYTHON) -m compileall src/
  19 +       $(PYTHON) -m compileall src/plugins/
  20 +       $(PYTHON) -m compileall src/gnomepanel/
  21 +       $(PYTHON) -m compileall src/docky/
  22
  23         # remove old files which have been renamed
  24         rm -rf $(PREFIX)/lib/cardapio/cardapio.py
  25 @@ -74,6 +74,6 @@
  26         cp -rf locale/* $(PREFIX)/share/locale/
  27
  28         mkdir -p $(PREFIX)/bin
  29 -       ln -fs $(PREFIX)/lib/cardapio/cardapio $(PREFIX)/bin/cardapio
  30 +       #ln -fs $(PREFIX)/lib/cardapio/cardapio $(PREFIX)/bin/cardapio
  31
  32         mkdir -p $(DESTDIR)/usr/lib/bonobo/servers
  33         #cp -f src/gnomepanel/cardapio.server $(DESTDIR)/usr/lib/bonobo/servers/
  34 diff -Naur src.ori//cardapio/cardapio/src/cardapio src//cardapio/cardapio/src/cardapio
  35 --- src.ori//cardapio/cardapio/src/cardapio     2011-04-11 22:05:32.000000000 +0200
  36 +++ src//cardapio/cardapio/src/cardapio 2011-04-11 22:07:11.214195078 +0200
  37 @@ -1,4 +1,4 @@
  38 -#!/usr/bin/env python
  39 +#!/usr/bin/env python2
  40  #
  41  #    Cardapio is an alternative Gnome menu applet, launcher, and much more!
  42  #
  43 diff -Naur src.ori//cardapio/cardapio-gnomepanel/src/cardapio-gnome-panel-applet src//cardapio/cardapio-gnomepanel/src/cardapio-gnome-panel-applet
  44 --- src.ori//cardapio/cardapio-gnomepanel/src/cardapio-gnome-panel-applet       2011-04-11 22:05:32.000000000 +0200
  45 +++ src//cardapio/cardapio-gnomepanel/src/cardapio-gnome-panel-applet   2011-04-11 22:07:38.024384574 +0200
  46 @@ -1,4 +1,4 @@
  47 -#!/usr/bin/env python
  48 +#!/usr/bin/env python2
  49  #
  50  #    Cardapio is an alternative Gnome menu applet, launcher, and much more!
  51  #
  52 diff -Naur src.ori//cardapio/cardapio/src/Cardapio.py src//cardapio/cardapio/src/Cardapio.py
  53 --- src.ori//cardapio/cardapio/src/Cardapio.py  2011-04-11 22:05:32.000000000 +0200
  54 +++ src//cardapio/cardapio/src/Cardapio.py      2011-04-11 22:08:26.351392815 +0200
  55 @@ -125,7 +125,7 @@
  56
  57  class Cardapio(dbus.service.Object):
  58
  59 -       distro_name = platform.linux_distribution()[0]
  60 +       distro_name = 'ArchLinux'
  61
  62         MIN_VISIBILITY_TOGGLE_INTERVAL    = 0.200 # seconds (this is a bit of a hack to fix some focus problems)
  63         PLUGIN_REBUILD_DELAY              = 30000 # milliseconds
  64 @@ -892,7 +892,7 @@
  65                         self.launch_raw('gnome-about')
  66
  67                 elif verb == 'AboutDistro':
  68 -                       self.launch_raw('yelp ghelp:about-%s' % Cardapio.distro_name.lower())
  69 +                       self.launch_raw('xdg-open http://wiki.archlinux.org')
  70                         # NOTE: i'm assuming this is the pattern for all distros...
  71
  72                 else: self.view.open_about_dialog()