From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 11 Nov 2007 16:01:19 +0000 (+0000)
Subject: Updated program name, copyright statement and licence information in ioncore.
X-Git-Tag: particleman-20071109-1~1
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=6605a6b7fdb704c544cfabfbc9001ca86ceab67c;p=ion3.git

Updated program name, copyright statement and licence information in ioncore.
Changed program name in another message.
Changed manual page name in welcome.head translations.
---

diff --git a/debian/patches/299_rename.diff b/debian/patches/299_rename.diff
index c0f02dc..ffc93ee 100644
--- a/debian/patches/299_rename.diff
+++ b/debian/patches/299_rename.diff
@@ -173,6 +173,15 @@
      submenu("Session",          "sessionmenu"),
 --- particleman.orig/ion/ion.c
 +++ particleman/ion/ion.c
+@@ -149,7 +149,7 @@
+ 
+     libtu_init(argv[0]);
+ 
+-    if(!ioncore_init("ion3", argc, argv, LOCALEDIR))
++    if(!ioncore_init("particleman", argc, argv, LOCALEDIR))
+         return EXIT_FAILURE;
+ 
+     extl_add_searchdir(EXTRABINDIR); /* ion-completefile */
 @@ -216,7 +216,7 @@
                  efnam=NULL;
              }else{
@@ -195,7 +204,7 @@
      ret=extl_cpcall(l_st, (ExtlCPCallFn*)extl_do_serialise, &d);
 --- particleman.orig/mod_query/mod_query.lua
 +++ particleman/mod_query/mod_query.lua
-@@ -555,7 +555,7 @@
+@@ -556,7 +556,7 @@
  -- or close the session (running under a session manager that supports such
  -- requests). If the answer is 'y', 'Y' or 'yes', so will happen.
  function mod_query.query_shutdown(mplex)
@@ -204,7 +213,7 @@
                           ioncore.shutdown)
  end
  
-@@ -564,7 +564,7 @@
+@@ -565,7 +565,7 @@
  -- This query asks whether the user wants restart Ioncore.
  -- If the answer is 'y', 'Y' or 'yes', so will happen.
  function mod_query.query_restart(mplex)
@@ -213,3 +222,64 @@
  end
  
  
+--- particleman.orig/ioncore/ioncore.c
++++ particleman/ioncore/ioncore.c
+@@ -70,17 +70,16 @@
+ 
+ WGlobal ioncore_g;
+ 
+-static const char *progname="ion";
++static const char *progname="particleman";
+ 
+ static const char ioncore_copy[]=
+-    "Ion " ION_VERSION ", copyright (c) Tuomo Valkonen 1999-2007.";
++    "ParticleMan, derived from Ion " ION_VERSION ".\n"
++    "Copyright (c) Tuomo Valkonen 1999-2007.";
+ 
+ static const char ioncore_license[]=DUMMY_TR(
+-    "This software is essentially licensed under the GNU Lesser General\n"
+-    "Public License (LGPL), version 2.1, unless otherwise indicated in\n"
+-    "components taken from elsewhere. Additional terms apply to the use\n"
+-    "of the name of the project, Ion(tm). For details, see the file\n"
+-    "LICENSE that you should have received with this software.\n"
++    "This software is licensed under the GNU Lesser General Public License\n"
++    "(LGPL), version 2.1, unless otherwise indicated in components taken\n"
++    "from elsewhere.\n"
+     "\n"
+     "This program is distributed in the hope that it will be useful,\n"
+     "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+--- particleman.orig/ioncore/saveload.c
++++ particleman/ioncore/saveload.c
+@@ -200,8 +200,8 @@
+ "%s.\n"
+ "If you are _not_ running under a session manager and wish to restore your\n"
+ "old layout, copy this backup file over the layout savefile found in the\n"
+-"same directory while Ion is not running and after having fixed your other\n"
+-"configuration files that are causing this problem. (Maybe a missing\n"
++"same directory while ParticleMan is not running and after having fixed your\n"
++"other configuration files that are causing this problem. (Maybe a missing\n"
+ "module?)");
+ 
+ 
+--- particleman.orig/man/welcome.cs.head
++++ particleman/man/welcome.cs.head
+@@ -5,7 +5,7 @@
+ prostudovat si pøed pokraèováním jeho manuálovou stránku. Kopii
+ manuálové stránky naleznete ní¾e, ale mù¾ete se k ní kdykoliv vrátit
+ napøíklad stiskem klávesy <F1> následované klávesou <Enter>, nebo
+-v terminálu spu¹tìním pøíkazu 'man ion3'. (Pøedpokládáme, ¾e jste
++v terminálu spu¹tìním pøíkazu 'man particleman'. (Pøedpokládáme, ¾e jste
+ Ion nainstalovali standardním zpùsobem a ¾e systémové pøíkazy ví, kde
+ naleznou manuálovou stránku.)
+ 
+--- particleman.orig/man/welcome.fi.head
++++ particleman/man/welcome.fi.head
+@@ -4,7 +4,7 @@
+ Jos et ole käyttänyt Ionia aiemmin, on hyvin suotiteltavaa, että opiskelet
+ Ionin ohjesivun ennen kuin jatkat tätä pidemmälle. Se on toistettu alla,
+ mutta voit aukaista sen myös myöhemmin painamalla <F1> ja <Enter>, tai
+-suorittamalla 'man ion3' komentoriviltä. (Tämä toimii sillä oletuksella,
++suorittamalla 'man particleman' komentoriviltä. (Tämä toimii sillä oletuksella,
+ että olet asentanut Ionin järjestelmässäsi sellaiseen vakiosijaintin, 
+ mistä sen työkalut osaavat hakea ohjesivuja.)
+