Add 20071109-1.

[ion3.git] / debian / patches / 299_rename.diff

diff --git a/debian/patches/299_rename.diff b/debian/patches/299_rename.diff
index ffc93eef08df1b3ce000493c9a56c9def89cf18c..a900eb9770eb339831a712bc6952f4244ab5f55d 100644 (file)
--- a/debian/patches/299_rename.diff
+++ b/debian/patches/299_rename.diff
@@ -182,7 +182,26 @@
          return EXIT_FAILURE;
  
      extl_add_searchdir(EXTRABINDIR); /* ion-completefile */
-@@ -216,7 +216,7 @@
+@@ -187,9 +187,17 @@
+         case 'h':
+             help();
+             return EXIT_SUCCESS;
+-        case 'V':
++        case 'V': {
++          char *command;
++          if ((command = strrchr(argv[0], '/')))
++              ++command;
++          else
++              command = argv[0];
++          if (strcmp(command, "ion3") == 0)
++              fputs("ParticleMan called as ion3\n", stderr);
+             printf("%s\n", ION_VERSION);
+             return EXIT_SUCCESS;
++      }
+         case OPT_ID('a'):
+             printf("%s\n", ioncore_aboutmsg());
+             return EXIT_SUCCESS;
+@@ -216,7 +224,7 @@
                  efnam=NULL;
              }else{
                  cloexec_braindamage_fix(fileno(ef));
@@ -224,7 +243,7 @@
  
 --- particleman.orig/ioncore/ioncore.c
 +++ particleman/ioncore/ioncore.c
-@@ -70,17 +70,16 @@
+@@ -70,17 +70,18 @@
  
  WGlobal ioncore_g;
  
@@ -242,9 +261,11 @@
 -    "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"
++    "This software is licensed under the GNU Lesser General Public\n"
++    "License (LGPL), version 2.1, unless otherwise indicated in\n"
++    "components taken from elsewhere. Additional terms apply to the\n"
++    "use of the original name, Ion. For details, see the file\n"
++    "/usr/share/doc/particleman/copyright.\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"