GNOME.org
 

[gnome-calculator] Rename to gnome-calculator

commit b1aee095e7bc7bbc56ac6b44b9b9a9f91c66fefe
Author: Robert Ancell <robert ancell canonical com>
Date:   Sun Oct 14 20:53:36 2012 +1300

    Rename to gnome-calculator

 Makefile.am                                        |    2 +-
 autogen.sh                                         |    9 +-----
 configure.ac                                       |    6 ++--
 data/Makefile.am                                   |   12 ++++----
 data/gcalccmd.1                                    |    4 +-
 data/{gcalctool.1 => gnome-calculator.1}           |    8 +++---
 ...tool.desktop.in => gnome-calculator.desktop.in} |    6 +---
 ....xml.in => org.gnome.calculator.gschema.xml.in} |   14 +++++-----
 gcalctool.doap => gnome-calculator.doap            |    8 +++---
 help/C/complex.page                                |    2 +-
 help/C/functions.page                              |    2 +-
 help/C/index.page                                  |    2 +-
 help/Makefile.am                                   |    2 +-
 src/Makefile.am                                    |   29 +++++--------------
 src/currency.vala                                  |    4 +-
 src/{gcalctool.vala => gnome-calculator.vala}      |   26 ++++++++---------
 src/math-variables.vala                            |    2 +-
 src/math-window.vala                               |    2 +-
 18 files changed, 58 insertions(+), 82 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1a62652..8421c03 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,4 +17,4 @@ DISTCLEANFILES = \
 
 EXTRA_DIST = \
 	autogen.sh \
-	gcalctool.doap
+	gnome-calculator.doap
diff --git a/autogen.sh b/autogen.sh
index bb17d41..6bd2f06 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,17 +4,10 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="gcalctool"
+PKG_NAME="gnome-calculator"
 REQUIRED_AUTOMAKE_VERSION=1.7
 REQUIRED_YELP_TOOLS_VERSION=3.1.1
 
-(test -f $srcdir/configure.ac \
-  && test -d $srcdir/src) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level gcalctool directory"
-    exit 1
-}
-
 which gnome-autogen.sh || {
     echo "You need to install gnome-common from the GNOME CVS"
     exit 1
diff --git a/configure.ac b/configure.ac
index 9e49ca9..0013430 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(gcalctool, 6.7.0)
+AC_INIT(gnome-calculator, 3.7.0)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
@@ -19,7 +19,7 @@ GLIB_REQUIRED=2.31
 GIO_REQUIRED=2.25.10
 GTK_REQUIRED=3.0
 
-PKG_CHECK_MODULES(GCALCTOOL, [
+PKG_CHECK_MODULES(GNOME_CALCULATOR, [
     gtk+-3.0 >= $GTK_REQUIRED
     glib-2.0 >= $GLIB_REQUIRED
     gio-2.0 >= $GIO_REQUIRED
@@ -38,7 +38,7 @@ dnl Internationalization
 dnl ###########################################################################
 
 IT_PROG_INTLTOOL([0.35.0])
-AC_SUBST(GETTEXT_PACKAGE, gcalctool)
+AC_SUBST(GETTEXT_PACKAGE, gnome-calculator)
 
 dnl ###########################################################################
 dnl Documentation
diff --git a/data/Makefile.am b/data/Makefile.am
index ee552d0..afea21f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,24 +1,24 @@
-uidir = $(datadir)/gcalctool
+uidir = $(pkgdatadir)
 ui_DATA = \
 	buttons-basic.ui \
 	buttons-advanced.ui \
 	buttons-financial.ui \
 	buttons-programming.ui
 
-gsettings_SCHEMAS = org.gnome.gcalctool.gschema.xml
+gsettings_SCHEMAS = org.gnome.calculator.gschema.xml
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 Utilitiesdir = $(datadir)/applications
-Utilities_in_files = gcalctool.desktop.in
+Utilities_in_files = gnome-calculator.desktop.in
 Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-man1_MANS = gcalctool.1 gcalccmd.1
+man1_MANS = gnome-calculator.1 gcalccmd.1
 
-EXTRA_DIST = $(ui_DATA) org.gnome.gcalctool.gschema.xml.in gcalctool.desktop.in $(man1_MANS)
+EXTRA_DIST = $(ui_DATA) org.gnome.calculator.gschema.xml.in gnome-calculator.desktop.in $(man1_MANS)
 
 DISTCLEANFILES = \
 	Makefile.in \
-	gcalctool.desktop \
+	gnome-calculator.desktop \
 	$(gsettings_SCHEMAS)
diff --git a/data/gcalccmd.1 b/data/gcalccmd.1
index 312f5d6..e3a1897 100644
--- a/data/gcalccmd.1
+++ b/data/gcalccmd.1
@@ -8,10 +8,10 @@ gcalccmd \- a console calculator
 .SH DESCRIPTION
 .B gcalccmd
 is the console version of
-.B gcalctool
+.B gnome-calculator
 the calculator of the GNOME desktop environment.
 
 .SH SEE ALSO
-.B gcalctool
+.B gnome-calculator
 .sp
 .LP
diff --git a/data/gcalctool.1 b/data/gnome-calculator.1
similarity index 79%
rename from data/gcalctool.1
rename to data/gnome-calculator.1
index 51cab3a..fa69ef1 100644
--- a/data/gcalctool.1
+++ b/data/gnome-calculator.1
@@ -1,14 +1,14 @@
 .\" Copyright (c) 1987-2008 - Sun Microsystems, Inc.
-.TH GCALCTOOL 1 "17 June 2009"
+.TH GNOME-CALCULATOR 1 "17 June 2009"
 .SH NAME
-gcalctool \- a desktop calculator
+gnome-calculator \- a desktop calculator
 .SH SYNOPSIS
-.B gcalctool
+.B gnome-calculator
 [
 .I OPTION
 ] ...
 .SH DESCRIPTION
-.B gcalctool
+.B gnome-calculator
 is the official calculator of the GNOME desktop environment.
 .SH OPTIONS
 .TP
diff --git a/data/gcalctool.desktop.in b/data/gnome-calculator.desktop.in
similarity index 67%
rename from data/gcalctool.desktop.in
rename to data/gnome-calculator.desktop.in
index a5478fa..ee677e7 100644
--- a/data/gcalctool.desktop.in
+++ b/data/gnome-calculator.desktop.in
@@ -1,14 +1,12 @@
 [Desktop Entry]
 _Name=Calculator
 _Comment=Perform arithmetic, scientific or financial calculations
-Exec=gcalctool
+Exec=gnome-calculator
 Icon=accessories-calculator
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Utility;Calculator;
-X-GNOME-DocPath=gcalctool/gcalctool.xml
 X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gcalctool
+X-GNOME-Bugzilla-Product=gnome-calculator
 X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-OtherBinaries=gnome-calculator
diff --git a/data/org.gnome.gcalctool.gschema.xml.in b/data/org.gnome.calculator.gschema.xml.in
similarity index 87%
rename from data/org.gnome.gcalctool.gschema.xml.in
rename to data/org.gnome.calculator.gschema.xml.in
index f063205..34a80a5 100644
--- a/data/org.gnome.gcalctool.gschema.xml.in
+++ b/data/org.gnome.calculator.gschema.xml.in
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-  <enum id="org.gnome.gcalctool.NumberFormat">
+  <enum id="org.gnome.calculator.NumberFormat">
     <value value="0" nick="automatic"/>
     <value value="1" nick="fixed"/>
     <value value="2" nick="scientific"/>
     <value value="3" nick="engineering"/>
   </enum>
-  <enum id="org.gnome.gcalctool.ButtonMode">
+  <enum id="org.gnome.calculator.ButtonMode">
     <value value="0" nick="basic"/>
     <value value="1" nick="advanced"/>
     <value value="2" nick="financial"/>
     <value value="3" nick="programming"/>
   </enum>
-  <enum id="org.gnome.gcalctool.AngleUnit">
+  <enum id="org.gnome.calculator.AngleUnit">
     <value value="0" nick="radians"/>
     <value value="1" nick="degrees"/>
     <value value="2" nick="gradians"/>
   </enum>
 
-  <schema path="/org/gnome/gcalctool/" id="org.gnome.gcalctool" gettext-domain="gcalctool">
+  <schema path="/org/gnome/calculator/" id="org.gnome.calculator" gettext-domain="calculator">
     <key type="i" name="accuracy">
       <default>9</default>
       <range min="0" max="9"/>
@@ -47,17 +47,17 @@
       <_summary>Show Trailing Zeroes</_summary>
       <_description>Indicates whether any trailing zeroes after the  numeric point should be shown in the display value.</_description>
     </key>
-    <key name="number-format" enum="org.gnome.gcalctool.NumberFormat">
+    <key name="number-format" enum="org.gnome.calculator.NumberFormat">
       <default>'automatic'</default>
       <_summary>Number format</_summary>
       <_description>The format to display numbers in</_description>
     </key>
-    <key name="angle-units" enum="org.gnome.gcalctool.AngleUnit">
+    <key name="angle-units" enum="org.gnome.calculator.AngleUnit">
       <default>'degrees'</default>
       <_summary>Angle units</_summary>
       <_description>The angle units to use</_description>
     </key>
-    <key name="button-mode" enum="org.gnome.gcalctool.ButtonMode">
+    <key name="button-mode" enum="org.gnome.calculator.ButtonMode">
       <default>'basic'</default>
       <_summary>Button mode</_summary>
       <_description>The button mode</_description>
diff --git a/gcalctool.doap b/gnome-calculator.doap
similarity index 89%
rename from gcalctool.doap
rename to gnome-calculator.doap
index b8a1f0b..b5c32ef 100644
--- a/gcalctool.doap
+++ b/gnome-calculator.doap
@@ -4,11 +4,11 @@
          xmlns:gnome="http://api.gnome.org/doap-extensions#";
          xmlns="http://usefulinc.com/ns/doap#";>
 
-  <name xml:lang="en">gcalctool</name>
+  <name xml:lang="en">gnome-calculator</name>
   <shortdesc xml:lang="en">Desktop calculator</shortdesc>
-  <homepage rdf:resource="http://live.gnome.org/Gcalctool"; />
-  <download-page rdf:resource="http://download.gnome.org/sources/gcalctool/"; />
-  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=gcalctool"; />
+  <homepage rdf:resource="http://live.gnome.org/Calculator"; />
+  <download-page rdf:resource="http://download.gnome.org/sources/gnome-calculator/"; />
+  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=gnome-calculator"; />
   <category rdf:resource="http://api.gnome.org/doap-extensions#desktop"; />
 
   <maintainer>
diff --git a/help/C/complex.page b/help/C/complex.page
index aaec96f..57d28ba 100644
--- a/help/C/complex.page
+++ b/help/C/complex.page
@@ -9,6 +9,6 @@
 	<title>Complex Numbers</title>
     
     <p>
-    Complex numbers are not supported in <app>GCalctool</app>.
+    Complex numbers are not supported in <app>Calculator</app>.
     </p>
 </page>
diff --git a/help/C/functions.page b/help/C/functions.page
index 426d523..a8d17ed 100644
--- a/help/C/functions.page
+++ b/help/C/functions.page
@@ -86,6 +86,6 @@
     </tr>
     </table>
     <p>
-    <app>GCalctool</app> does not support user-defined functions.
+    <app>Calculator</app> does not support user-defined functions.
     </p>
 </page>
diff --git a/help/C/index.page b/help/C/index.page
index 0af5fd7..be58a73 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -10,7 +10,7 @@
 		<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"; />
 	</info>
 
-	<title>GCalctool Help</title>
+	<title>Calculator Help</title>
 
     <section id="ui" style="2column">
         <title>User Interface</title>
diff --git a/help/Makefile.am b/help/Makefile.am
index 371a069..6ea4baa 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,5 +1,5 @@
 @YELP_HELP_RULES@
-HELP_ID = gcalctool
+HELP_ID = gnome-calculator
 HELP_FILES = absolute.page \
              base.page \
              boolean.page \
diff --git a/src/Makefile.am b/src/Makefile.am
index d5da77b..327371f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,19 +1,19 @@
-bin_PROGRAMS = gcalctool gcalccmd
+bin_PROGRAMS = gnome-calculator gcalccmd
 noinst_PROGRAMS = test-number test-equation
 
 TESTS = test-number test-equation
 
 INCLUDES = \
-	-DUI_DIR=\""$(datadir)/gcalctool"\" \
+	-DUI_DIR=\""$(datadir)/gnome-calculator"\" \
 	-DVERSION=\""$(VERSION)"\" \
 	-DLOCALE_DIR=\""$(localedir)"\" \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
 	$(WARN_CFLAGS) \
-	$(GCALCTOOL_CFLAGS)
+	$(GNOME_CALCULATOR_CFLAGS)
 
-gcalctool_SOURCES = \
+gnome_calculator_SOURCES = \
 	config.vapi \
-	gcalctool.vala \
+	gnome-calculator.vala \
 	currency.vala \
 	equation.vala \
 	equation-lexer.vala \
@@ -31,14 +31,14 @@ gcalctool_SOURCES = \
 	serializer.vala \
   	unit.vala
 
-gcalctool_VALAFLAGS = \
+gnome_calculator_VALAFLAGS = \
 	--target-glib 2.32 \
 	--pkg posix \
 	--pkg gtk+-3.0 \
 	--pkg libxml-2.0
 
-gcalctool_LDADD = \
-	$(GCALCTOOL_LIBS) \
+gnome_calculator_LDADD = \
+	$(GNOME_CALCULATOR_LIBS) \
 	-lm
 
 gcalccmd_SOURCES = \
@@ -99,18 +99,5 @@ test_equation_LDADD = \
 	$(GCALCCMD_LIBS) \
 	-lm
 
-# Install a symlink between gcalctool and gnome-calculator
-install-exec-hook:
-	test -e "$(DESTDIR)$(bindir)/gnome-calculator" \
-	|| (cd "$(DESTDIR)$(bindir)" && ln -s gcalctool gnome-calculator)
-
-# Remove the symlink between gcalctool and gnome-calculator
-uninstall-local:
-	test -h "$(DESTDIR)$(bindir)/gnome-calculator" \
-	&& rm -f "$(DESTDIR)$(bindir)/gnome-calculator"
-
 DISTCLEANFILES = \
 	Makefile.in
-
-test: gcalctool
-	./gcalctool -u
diff --git a/src/currency.vala b/src/currency.vala
index eb38232..7d6c753 100644
--- a/src/currency.vala
+++ b/src/currency.vala
@@ -116,12 +116,12 @@ public class CurrencyManager : Object
 
     private string get_imf_rate_filepath ()
     {
-        return Path.build_filename (Environment.get_user_cache_dir (), "gcalctool", "rms_five.xls");
+        return Path.build_filename (Environment.get_user_cache_dir (), "gnome-calculator", "rms_five.xls");
     }
 
     private string get_ecb_rate_filepath ()
     {
-        return Path.build_filename (Environment.get_user_cache_dir (), "gcalctool", "eurofxref-daily.xml");
+        return Path.build_filename (Environment.get_user_cache_dir (), "gnome-calculator", "eurofxref-daily.xml");
     }
 
     private Currency add_currency (string short_name)
diff --git a/src/gcalctool.vala b/src/gnome-calculator.vala
similarity index 89%
rename from src/gcalctool.vala
rename to src/gnome-calculator.vala
index 3f5924a..9f1f94c 100644
--- a/src/gcalctool.vala
+++ b/src/gnome-calculator.vala
@@ -9,7 +9,7 @@
  * license.
  */
 
-public class GCalctool : Gtk.Application
+public class Calculator : Gtk.Application
 {
     private Settings settings;
     private MathWindow window;
@@ -28,7 +28,7 @@ public class GCalctool : Gtk.Application
         { "quit", quit_cb, null, null, null },
     };
     
-    public GCalctool ()
+    public Calculator ()
     {
         Object (flags : ApplicationFlags.NON_UNIQUE);
     }
@@ -37,7 +37,7 @@ public class GCalctool : Gtk.Application
     {
         base.startup ();
 
-        settings = new Settings ("org.gnome.gcalctool");
+        settings = new Settings ("org.gnome.calculator");
         var accuracy = settings.get_int ("accuracy");
         var word_size = settings.get_int ("word-size");
         var number_base = settings.get_int ("base");
@@ -158,25 +158,25 @@ public class GCalctool : Gtk.Application
 
     private static void usage (string progname, bool show_application, bool show_gtk)
     {
-        stderr.printf (/* Description on how to use gcalctool displayed on command-line */
+        stderr.printf (/* Description on how to use gnome-calculator displayed on command-line */
                        _("Usage:\n  %s â Perform mathematical calculations"), progname);
 
         stderr.printf ("\n\n");
 
-        stderr.printf (/* Description on gcalctool command-line help options displayed on command-line */
+        stderr.printf (/* Description on gnome-calculator command-line help options displayed on command-line */
                        _("Help Options:\n  -v, --version                   Show release version\n  -h, -?, --help                  Show help options\n  --help-all                      Show all help options\n  --help-gtk                      Show GTK+ options"));
         stderr.printf ("\n\n");
 
         if (show_gtk)
         {
-            stderr.printf (/* Description on gcalctool command-line GTK+ options displayed on command-line */
+            stderr.printf (/* Description on gnome-calculator command-line GTK+ options displayed on command-line */
                            _("GTK+ Options:\n  --class=CLASS                   Program class as used by the window manager\n  --name=NAME                     Program name as used by the window manager\n  --screen=SCREEN                 X screen to use\n  --sync                          Make X calls synchronous\n  --gtk-module=MODULES            Load additional GTK+ modules\n  --g-fatal-warnings              Make all warnings fatal"));
             stderr.printf ("\n\n");
         }
 
         if (show_application)
         {
-            stderr.printf (/* Description on gcalctool application options displayed on command-line */
+            stderr.printf (/* Description on gnome-calculator application options displayed on command-line */
                            _("Application Options:\n  -s, --solve <equation>          Solve the given equation"));
             stderr.printf ("\n\n");
         }
@@ -313,7 +313,7 @@ public class GCalctool : Gtk.Application
     {
         try
         {
-            Gtk.show_uri (window.get_screen (), "help:gcalctool", Gtk.get_current_event_time ());
+            Gtk.show_uri (window.get_screen (), "help:gnome-calculator", Gtk.get_current_event_time ());
         }
         catch (Error e)
         {
@@ -350,17 +350,15 @@ public class GCalctool : Gtk.Application
         /* The translator credits. Please translate this with your name (s). */
         var translator_credits = _("translator-credits");
 
-        /* The license this software is under (GPL2+) */
-        var license = _("Gcalctool is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nGcalctool is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with Gcalctool; if not, write to the Free Software Foundation, Inc.,\n51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA");
+        var license = "This program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software Foundation, Inc.,\n51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA";
 
         Gtk.show_about_dialog (window,
                                "name",
                                /* Program name in the about dialog */
-                               _("Gcalctool"),
+                               _("Calculator"),
                                "version", VERSION,
                                "copyright",
-                               /* Copyright notice in the about dialog */
-                               _("\xc2\xa9 1986â2010 The Gcalctool authors"),
+                               "\xc2\xa9 1986â2012 The Calculator authors",
                                "license", license,
                                "comments",
                                /* Short description in the about dialog */
@@ -393,7 +391,7 @@ public class GCalctool : Gtk.Application
 
         Gtk.Window.set_default_icon_name ("accessories-calculator");
 
-        var app = new GCalctool ();
+        var app = new Calculator ();
 
         return app.run (args);
     }
diff --git a/src/math-variables.vala b/src/math-variables.vala
index f326f1f..0888684 100644
--- a/src/math-variables.vala
+++ b/src/math-variables.vala
@@ -17,7 +17,7 @@ public class MathVariables : Object
     public MathVariables ()
     {
         registers = new HashTable <string, Number?> (str_hash, str_equal);
-        file_name = Path.build_filename (Environment.get_user_data_dir (), "gcalctool", "registers");
+        file_name = Path.build_filename (Environment.get_user_data_dir (), "gnome-calculator", "registers");
         serializer = new Serializer (DisplayFormat.SCIENTIFIC, 10, 50);
         serializer.set_radix ('.');
         registers_load ();
diff --git a/src/math-window.vala b/src/math-window.vala
index 1c3a614..009625a 100644
--- a/src/math-window.vala
+++ b/src/math-window.vala
@@ -27,7 +27,7 @@ public class MathWindow : Gtk.ApplicationWindow
         _equation = equation;
         set_title (/* Title of main window */
                    _("Calculator"));
-        role = "gcalctool";
+        role = "gnome-calculator";
         resizable = false;
 
         var main_vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]