From adda41f7ff26754f09e71833a8974bc94ff9323d Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 2 Nov 2008 13:09:34 +0000 Subject: [PATCH] Add 20071109-1. Make more name changes. Remove unneeded debconf templates. --- debian/changelog | 15 ++++++++--- debian/particleman.README.Debian | 4 +-- debian/particleman.links | 4 +-- debian/particleman.templates | 44 -------------------------------- debian/patches/299_rename.diff | 31 ++++++++++++++++++---- 5 files changed, 42 insertions(+), 56 deletions(-) delete mode 100644 debian/particleman.templates diff --git a/debian/changelog b/debian/changelog index 2bd7da0..48cdb25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,17 @@ -particleman (20070927-1) unstable; urgency=low +particleman (20071109-1) unstable; urgency=low - * Renamed to produce a DFSG-compliant package + * Renamed to produce a DFSG-compliant package - closes: #450849 + * Added suggestion of ion3-doc package to control file and welcome + message - -- Ben Hutchings Sun, 04 Nov 2007 14:49:46 +0000 + -- Ben Hutchings Sun, 11 Nov 2007 16:07:25 +0000 + +ion3 (20071109-1) unstable; urgency=low + + * New upstream release + * Moved ion3-doc into separate source package + + -- Ben Hutchings Sat, 10 Nov 2007 04:27:00 +0000 ion3 (20070927-1) unstable; urgency=low diff --git a/debian/particleman.README.Debian b/debian/particleman.README.Debian index 83a27d7..3c9038d 100644 --- a/debian/particleman.README.Debian +++ b/debian/particleman.README.Debian @@ -7,7 +7,7 @@ development snapshots. Instructions for using ParticleMan can be found in the manual page ("man particleman"). Additional documentation is included in the -particleman-doc package: "Configuring and extending Ion3 with Lua" and +ion3-doc package: "Configuring and extending Ion3 with Lua" and "Ion: Notes for the module and patch writer". There is an FAQ online at . @@ -81,4 +81,4 @@ in the postinst script to add the configuration file /etc/X11/ion3/cfg_foo.lua. Run "install-ion3-cfg --remove cfg_foo" in the prerm script to remove it. - -- Ben Hutchings , Sun, 4 Nov 2007 15:32:47 +0000 + -- Ben Hutchings , Sun, 11 Nov 2007 16:37:15 +0000 diff --git a/debian/particleman.links b/debian/particleman.links index e6dcdb1..6002621 100644 --- a/debian/particleman.links +++ b/debian/particleman.links @@ -1,5 +1,5 @@ -var/lib/particleman/debian-menu.lua usr/share/particleman/debian-menu.lua -var/lib/particleman/debian-menu-i18n.lua usr/share/particleman/debian-menu-i18n.lua +var/lib/particleman/debian-menu.lua usr/share/ion3/debian-menu.lua +var/lib/particleman/debian-menu-i18n.lua usr/share/ion3/debian-menu-i18n.lua etc/default/particleman etc/X11/particleman/cfg_debian.lua usr/bin/particleman usr/bin/ion3 usr/share/man/man1/particleman.1 usr/share/man/man1/ion3.1 diff --git a/debian/particleman.templates b/debian/particleman.templates deleted file mode 100644 index 348fe16..0000000 --- a/debian/particleman.templates +++ /dev/null @@ -1,44 +0,0 @@ -# These templates have been reviewed by the debian-l10n-english -# team -# -# If modifications/additions/rewording are needed, please ask -# for an advice to debian-l10n-english@lists.debian.org -# -# Even minor modifications require translation updates and such -# changes should be coordinated with translators and reviewers. - -Template: ion3/acknowledge-outdated -Type: boolean -Default: false -_Description: Do you understand that this version is not supported by the author? - The version of Ion3 you are installing (version ${version}) is not - the latest version released by the author. - . - DO NOT send bug reports or questions to the author unless they apply - to the latest version, available at: - http://modeemi.fi/~tuomov/ion/download.html - . - Otherwise, you should send any bug reports about this package to the - Debian bug tracking system and any other questions to the Debian - maintainer. - -Template: ion3/acknowledge-maybe-outdated -Type: boolean -Default: false -_Description: Do you understand that this version may not be supported by the author? - The version of Ion3 you are installing (version ${version}) may not - be the latest version released by the author. - . - DO NOT send bug reports or questions to the author unless they apply - to the latest version, available at: - http://modeemi.fi/~tuomov/ion/download.html - . - Otherwise, you should send any bug reports about this package to the - Debian bug tracking system and any other questions to the Debian - maintainer. - -Template: ion3/did-not-acknowledge-outdated -Type: error -Description: Non-acknowledged installation of an old version - You must acknowledge that the author does not support old versions - and should not be contacted about them. diff --git a/debian/patches/299_rename.diff b/debian/patches/299_rename.diff index ffc93ee..a900eb9 100644 --- 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" -- 2.39.2