diff -Naur orthcal-1.4-orig/Makefile orthcal-1.4/Makefile
--- orthcal-1.4-orig/Makefile 2012-10-22 11:38:56.000000000 +0300
+++ orthcal-1.4/Makefile 2013-02-27 21:58:22.296071860 +0200
@@ -1,16 +1,19 @@
-INSTALLDIR=$(DESTDIR)/opt/extras.ubuntu.com/orthcal
+INSTALLDIR=$(DESTDIR)
Scripts: bin/OrthCal.pl bin/OrthCal_ind.py
chmod 755 bin/OrthCal.pl
chmod 755 bin/OrthCal_ind.py
install:
- mkdir -p $(INSTALLDIR)/bin/
- mkdir -p $(DESTDIR)/usr/share/applications/
- cp bin/OrthCal.pl $(INSTALLDIR)/bin/
- cp bin/OrthCal_ind.py $(INSTALLDIR)/bin/
- cp -R content/ $(INSTALLDIR)
- cp -R translations/ $(INSTALLDIR)
+ mkdir -p $(INSTALLDIR)/usr/bin/
+ mkdir -p $(INSTALLDIR)/usr/share/locale/
+ mkdir -p $(INSTALLDIR)/usr/share/pixmaps/orthcal/
+ mkdir -p $(DESTDIR)/usr/share/applications/orthcal/content/
+ cp bin/OrthCal.pl $(INSTALLDIR)/usr/bin/
+ cp bin/OrthCal_ind.py $(INSTALLDIR)/usr/bin/
+ cp -R content/images/* $(INSTALLDIR)/usr/share/pixmaps/orthcal/
+ cp -R content/saints.db $(DESTDIR)/usr/share/applications/orthcal/content/
+ cp -R translations/locale $(INSTALLDIR)/usr/share/
cp extras-orthcal.desktop $(DESTDIR)/usr/share/applications/
uninstall:
diff -Naur orthcal-1.4-orig/bin/OrthCal.pl orthcal-1.4/bin/OrthCal.pl
--- orthcal-1.4-orig/bin/OrthCal.pl 2012-10-22 11:38:56.000000000 +0300
+++ orthcal-1.4/bin/OrthCal.pl 2013-02-27 22:13:27.797720691 +0200
@@ -28,12 +28,12 @@
our $VERSION = 1.4;
my $d = Locale::gettext->domain('OrthCal');
-$d->dir('/opt/extras.ubuntu.com/orthcal/translations/locale/');
+$d->dir('/usr/share/locale/');
my $indicator = 'OrthCal_ind.py';
if ( `ps -e | grep OrthCal` !~ /$indicator/ )
{
- system "/opt/extras.ubuntu.com/orthcal/bin/OrthCal_ind.py&";
+ system "/usr/bin/OrthCal_ind.py&";
exit;
}
@@ -41,13 +41,13 @@
{
my $window = Gtk2::Window->new('toplevel');
$window->set_default_icon_from_file(
- '/opt/extras.ubuntu.com/orthcal/content/images/OrthCal.png');
+ '/usr/share/pixmaps/orthcal/OrthCal.png');
$window->set_title( $d->get('About OrthCal') );
$window->signal_connect( destroy => sub { Gtk2->main_quit() } );
$window->set_resizable(0);
my $logo = Gtk2::Image->new_from_file(
- '/opt/extras.ubuntu.com/orthcal/content/images/OrthCal.png');
+ '/usr/share/pixmaps/orthcal/OrthCal.png');
my $top_info = $d->get(<<'ABOUT');
OrthCal, the Eastern Orthodox Calendar, v. 1.4
Homepage - - Translations
@@ -200,7 +200,7 @@
{
my $window = Gtk2::Window->new('toplevel');
$window->set_default_icon_from_file(
- '/opt/extras.ubuntu.com/orthcal/content/images/OrthCal.png');
+ '/usr/share/pixmaps/orthcal/OrthCal.png');
$window->signal_connect( destroy => sub { Gtk2->main_quit() } );
$window->set_resizable(0);
my $vbox = Gtk2::VBox->new( '0', '10' );
@@ -371,7 +371,7 @@
$source = 'orthodoxwiki.org';
}
my $dbh =
- DBI->connect( 'dbi:SQLite:/opt/extras.ubuntu.com/orthcal/content/saints.db',
+ DBI->connect( 'dbi:SQLite:/usr/share/applications/orthcal/content/saints.db',
q{}, q{} );
my $db_sel = $dbh->prepare(
"SELECT * FROM Saints WHERE Month = $month AND Day = $day AND source LIKE '%$source%'"
@@ -514,7 +514,7 @@
my $window = Gtk2::Window->new('toplevel');
$window->set_default_icon_from_file(
- '/opt/extras.ubuntu.com/orthcal/content/images/OrthCal.png');
+ '/usr/share/pixmaps/orthcal/OrthCal.png');
$window->signal_connect( destroy => \&app_quit );
$window->set_resizable(0);
@@ -636,7 +636,7 @@
#Background.#
#############
my $back_pixbuf = Gtk2::Gdk::Pixbuf->new_from_file(
- '/opt/extras.ubuntu.com/orthcal/content/images/bg.jpg');
+ '/usr/share/pixmaps/orthcal/bg.jpg');
my ( $pixmap, $mask ) = $back_pixbuf->render_pixmap_and_mask(255);
my $style = $window->get_style();
$style = $style->copy();
@@ -682,7 +682,7 @@
[Desktop Entry]
Type=Application
-Exec=/opt/extras.ubuntu.com/orthcal/bin/OrthCal.pl
+Exec=/usr/bin/OrthCal.pl
Hidden=false
NoDisplay=false
X-GNOME-Autostart-enabled=true
@@ -724,7 +724,7 @@
{
my $pascha_window = Gtk2::Window->new('toplevel');
$pascha_window->set_default_icon_from_file(
- '/opt/extras.ubuntu.com/orthcal/content/images/OrthCal.png');
+ '/usr/share/pixmaps/orthcal/OrthCal.png');
$pascha_window->set_title( $d->get('Pascha calculator -- OrthCal') );
$pascha_window->signal_connect( destroy => sub { Gtk2->main_quit() } );
$pascha_window->set_position('mouse');
@@ -798,7 +798,7 @@
{
my $search_window = Gtk2::Window->new('toplevel');
$search_window->set_default_icon_from_file(
- '/opt/extras.ubuntu.com/orthcal/content/images/OrthCal.png');
+ '/usr/share/pixmaps/orthcal/OrthCal.png');
$search_window->set_title( $d->get('Feast search -- OrthCal') );
$search_window->signal_connect( destroy => sub { Gtk2->main_quit() } );
$search_window->set_position('mouse');
diff -Naur orthcal-1.4-orig/bin/OrthCal_ind.py orthcal-1.4/bin/OrthCal_ind.py
--- orthcal-1.4-orig/bin/OrthCal_ind.py 2012-10-22 11:38:56.000000000 +0300
+++ orthcal-1.4/bin/OrthCal_ind.py 2013-02-27 22:07:59.136116231 +0200
@@ -30,13 +30,13 @@
import sys
from locale import gettext as _
-locale.bindtextdomain('OrthCal_ind', '/opt/extras.ubuntu.com/orthcal/translations/locale')
+locale.bindtextdomain('OrthCal_ind', '/usr/share/locale')
locale.textdomain('OrthCal_ind')
class StatusIcon:
def __init__(self):
self.statusicon = gtk.StatusIcon()
- self.statusicon.set_from_file("/opt/extras.ubuntu.com/orthcal/content/images/orthcal_ind.png")
+ self.statusicon.set_from_file("/usr/share/pixmaps/orthcal/orthcal_ind.png")
self.statusicon.connect("popup-menu", self.right_click_event)
self.statusicon.set_title("OrthCal")
@@ -84,24 +84,24 @@
menu.popup(None, None, gtk.status_icon_position_menu, button, time, self.statusicon)
def about_OrthCal(w, about):
- subprocess.call('/opt/extras.ubuntu.com/orthcal/bin/OrthCal.pl about&', shell=True)
+ subprocess.call('/usr/bin/OrthCal.pl about&', shell=True)
def destroy(appindicator, data=None):
gtk.mainquit()
def julian_calendar(w, feastsJulian):
- subprocess.call('/opt/extras.ubuntu.com/orthcal/bin/OrthCal.pl Julian&', shell=True)
+ subprocess.call('/usr/bin/OrthCal.pl Julian&', shell=True)
def OrthCal_options(w, options):
- subprocess.call('/opt/extras.ubuntu.com/orthcal/bin/OrthCal.pl options&', shell=True)
+ subprocess.call('/usr/bin/OrthCal.pl options&', shell=True)
def rjulian_calendar(w, feastsRJulian):
- subprocess.call('/opt/extras.ubuntu.com/orthcal/bin/OrthCal.pl RJulian&', shell=True)
+ subprocess.call('/usr/bin/OrthCal.pl RJulian&', shell=True)
if __name__ == '__main__':
if have_indicator == True:
- ind = appindicator.Indicator('OrthCal', '/opt/extras.ubuntu.com/orthcal/content/images/orthcal_ind.png', appindicator.CATEGORY_OTHER)
+ ind = appindicator.Indicator('OrthCal', '/usr/share/pixmaps/orthcal/orthcal_ind.png', appindicator.CATEGORY_OTHER)
ind.set_status(appindicator.STATUS_ACTIVE)
menu = gtk.Menu()
diff -Naur orthcal-1.4-orig/extras-orthcal.desktop orthcal-1.4/extras-orthcal.desktop
--- orthcal-1.4-orig/extras-orthcal.desktop 2012-10-22 11:38:56.000000000 +0300
+++ orthcal-1.4/extras-orthcal.desktop 2013-02-27 22:16:02.581894717 +0200
@@ -2,7 +2,7 @@
Version=1.0
Type=Application
Terminal=false
-Exec=/opt/extras.ubuntu.com/orthcal/bin/OrthCal.pl
+Exec=/usr/bin/OrthCal.pl
Comment[el]=OrthCal, το Ορθόδοξο ημερολόγιο
Comment[fr]=OrthCal, le calendrier Orthodoxe
Comment[es]=OrthCal, el calendario ortodoxo del este
@@ -11,7 +11,7 @@
Name=OrthCal
GenericName=Orthodox Calendar
Comment=OrthCal, the Eastern Orthodox Calendar
-Icon=/opt/extras.ubuntu.com/orthcal/content/images/OrthCal.png
+Icon=/usr/share/pixmaps/orthcal/OrthCal.png
Categories=GNOME;GTK;Utility;
StartupWMClass=OrthCal.pl
@@ -23,8 +23,8 @@
Name[es]=Feriados de hoy (viejo calendario/juliano)
Name[ru]=Сегодняшние праздники (Юлиансккий календарь / старый стиль)
Name[ro]=Sărbătorile zilei (Calendarul Iulian/Vechi)
-Exec=/opt/extras.ubuntu.com/orthcal/bin/OrthCal.pl Julian
-OnlyShowIn=Unity;
+Exec=/usr/bin/OrthCal.pl Julian
+#OnlyShowIn=Unity;
[Desktop Action RJulian]
Name=Today's Feasts (Revised Julian/New Calendar)
@@ -32,8 +32,8 @@
Name[es]=Feriados de hoy (nuevo calendario/juliano revisado)
Name[ru]=Сегодняшние праздники (Пересмотренный юлианский календарь / новый стиль)
Name[ro]=Sărbătorile zilei (Calendarul Îndreptat/Nou)
-Exec=/opt/extras.ubuntu.com/orthcal/bin/OrthCal.pl RJulian
-OnlyShowIn=Unity;
+Exec=/usr/bin/OrthCal.pl RJulian
+#OnlyShowIn=Unity;
[Desktop Action Options]
Name=Options
@@ -41,8 +41,8 @@
Name[es]=Opciones
Name[ru]=Настройки
Name[ro]=Opțiuni
-Exec=/opt/extras.ubuntu.com/orthcal/bin/OrthCal.pl options
-OnlyShowIn=Unity;
+Exec=/usr/bin/OrthCal.pl options
+#OnlyShowIn=Unity;
[Desktop Action About]
Name=About OrthCal
@@ -50,5 +50,5 @@
Name[es]=Acerca de OrthCal
Name[ru]=Об OrthCal
Name[ro]=Despre OrthCal
-Exec=/opt/extras.ubuntu.com/orthcal/bin/OrthCal.pl about
-OnlyShowIn=Unity;
+Exec=/usr/bin/OrthCal.pl about
+#OnlyShowIn=Unity;