From 37f68ca2ed7d9a31bc96d0a3bf91009b3901bada Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 2 Nov 2008 12:45:16 +0000 Subject: [PATCH] Updated debian/copyright file for ion-3rc-20080103. Refreshed patches for ion-3rc-20080103. --- debian/changelog | 6 ++ debian/copyright | 95 ++++++++++--------- debian/patches/201_build-config.diff | 37 +++++--- debian/patches/205_ion-lock.diff | 6 +- .../patches/206_use-x-terminal-emulator.diff | 4 +- debian/patches/211_add-debian-menu.diff | 4 +- 6 files changed, 85 insertions(+), 67 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8705a08..fe60902 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ion3 (20080103-1) unstable; urgency=low + + * New upstream version + + -- Ben Hutchings Sun, 06 Jan 2008 01:43:32 +0000 + ion3 (20071109-1) unstable; urgency=low * New upstream release diff --git a/debian/copyright b/debian/copyright index 7e986a0..e25729b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,76 +13,77 @@ The author of Ion3 is Tuomo Valkonen . The following notice applies to the Ion3 code and to the names "Ion", "Ion3", etc.: -Copyright (c) Tuomo Valkonen 1999-2007. +Copyright (c) Tuomo Valkonen 1999-2008. -The code of this project is "essentially" licensed under the LGPL, version -2.1, unless otherwise indicated in components taken from elsewhere. It is -reproduced below. Additionally, the following terms apply to the use of -the name of the project, Ion(tm), names of particular "branches" such as -Ion3(tm), and other derived names: +Unless otherwise indicated in components taken from elsewhere, this software +is licensed under the GNU Lesser General Public License, version 2.1 ("LGPL", +reproduced below), extended and modified with the following terms: If the name Ion(tm) or other names that can be associated with the Ion project are used to distribute this software, then: - A version that does not significantly differ from one of the - original author's versions must be provided by default. + copyright holder's releases, must be provided by default. - - When there are no further prominent notices of possible out-datedness, - and no prominent original author's version qualifiers present (resp. - only branch qualifier is present), then the version distributed online - may not significantly differ from the original author's latest stable - release (resp. latest release on the branch) within a reasonable delay - (normally 28 days). The holders of physical distribution media must - be provided ways to upgrade to the latest release within this delay. + - Versions not based on the copyright holder's latest release (on + the corresponding "branch", such as Ion3(tm)), must within 28 days + of this release, be prominently marked as (potentially) obsolete + and unsupported. - Significantly altered versions may be provided only if the user explicitly requests for those modifications to be applied, and is prominently notified that the software is no longer considered - the standard version, and is not supported by the original author. + the standard version, and is not supported by the copyright holder. The version string displayed by the program must describe these modifications and the "support void" status. - Derived works that do not satisfy the above terms must be renamed so - that they can not be associated with the Ion project, their executables - must be given names that do not conflict with the original author's - version, and this author may not be referred to for support. + Versions for which the above conditions are not satisfied, must be + renamed so that they can not be associated with the Ion project, their + executables must be given names that do not conflict with the copyright + holder's version, and neither the copyright holder nor the Ion project + may be referred to for support. + + In the text of sections 0-2, 4-12, and 14-16 of the LGPL, "this License" + is to be understood to refer to the LGPL extended with these terms and, + where applicable, possible similar terms related to the names of other + works forming a whole. Sections 3 and 13 of the LGPL are void. Where + contradictory, these additional terms take precedence over the LGPL. - Modules and other (standalone) extensions to Ion must also be named - so that they can not be confused to be supported by the original - author. If "Ion" occurs in the name, it must be in the form - "Foo for Ion" instead of "Ion Foo", etc. +End of terms. - This name policy notice may not be altered, and must be included in - any altered versions and binary redistributions. It may only be - removed when using small portions of the code in unrelated projects. - The original author and the Ion project retain the same rights to - your modifications that it would have under the LGPL or GPL without - these or similar additional terms. +Explanations - If you fail to follow these terms, you lose the rights granted to - you by the LGPL. +Trademarks: With the terms above primarily appealing to copyright law, +should any of the indicated trademarks be found invalid, does not excuse +you from the conditions imposed by those terms. The use of these names +in contexts other than redistribution of this software and modifications, +is outside the scope of the terms above, and governed by applicable +trademark or other laws. -Explanations: + With regard to modules and other extensions to Ion(tm), the permission + is hereby granted to use "Ion" as part of the name, provided that it + occurs in a form suggesting that the work is supported by neither the + copyright holder nor the Ion project: "Foo for Ion" instead of "Ion Foo", + etc. -Significant change: Bug fixes are a priori insignificant as additions. -Basic changes that are needed to install or run the software on a target -platform are a priori insignificant. Additionally, basic configuration -changes to better integrate the software with the target platform, -without obstructing the standard behaviour, are a priori insignificant. -Everything else is significant. The author reserves the right to refine -the definition of significant changes on a per-case basis. Please consult -when in doubt. +Significant change: Bug fixes are insignificant as additions. Basic changes +that are needed to install or run the software on a target platform, are +insignificant. Additionally, basic/small configuration changes to better +integrate the software with the target platform, without obstructing the +standard behaviour, are insignificant. Everything else is significant, +unless expressly declared otherwise by the copyright holder. Distributions: For example, suppose an aggregate distribution of software provides an `installpkg` command for installing packages. Then the action -`installpkg ion3` (resp. `installpkg ion`) should within a reasonable -delay install the latest release of Ion3 (resp. the latest stable release), -or prominently notify the user that the provided version is not or may not -be the latest. The action `installpkg ion-3ds-20070318` may at any date -install this particular mentioned release. Likewise, the action `installpkg ---support-void-featurex ion3` may apply additional patches to the latest -Ion3, within the further constraints set above. +`installpkg ion3` (resp. `installpkg ion`) should provide the latest release +of Ion3 (resp. the latest stable release) 28 days from release date at the +latest, or prominently notify the user that the provided version is (likely +to be) obsolete and unsupported. The latest release being provided by +default, or prominently appearing in a listing, constitutes prominent +marking of earlier releases as obsolete. Specific versions (including +modified versions) may be provided if the user explicitly requests for +those, within the constraints set above. The intent of these terms is to curb the power that "distributions", as the primary sources of software for many users, have in defining what diff --git a/debian/patches/201_build-config.diff b/debian/patches/201_build-config.diff index 6a3ce86..c58cdf2 100755 --- a/debian/patches/201_build-config.diff +++ b/debian/patches/201_build-config.diff @@ -1,15 +1,15 @@ --- ion3.orig/system.mk +++ ion3/system.mk -@@ -7,7 +7,7 @@ - ## Installation paths - ## +@@ -8,7 +8,7 @@ + # Installation path prefix. Unless you know what you're doing, the default + # of /usr/local is likely the correct choice. -PREFIX=/usr/local +PREFIX=/usr # Unless you are creating a package conforming to some OS's standards, you # probably do not want to modify the following directories: -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ # Main binaries BINDIR=$(PREFIX)/bin # Configuration .lua files @@ -18,7 +18,7 @@ # Some .lua files and ion-* shell scripts SHAREDIR=$(PREFIX)/share/ion3 # Manual pages -@@ -27,11 +27,11 @@ +@@ -28,11 +28,11 @@ # Nothing at the moment LIBDIR=$(PREFIX)/lib # Modules @@ -32,7 +32,7 @@ # For ion-completeman system-wide cache VARDIR=/var/cache/ion3 # Message catalogs -@@ -56,18 +56,18 @@ +@@ -59,18 +59,18 @@ # If you have installed Lua 5.1 from the official tarball without changing # paths, this should do it. @@ -60,16 +60,16 @@ ## -@@ -104,7 +104,7 @@ - # asprintf and vasprintf in the c library. (gnu libc has.) - # If HAS_SYSTEM_ASPRINTF is not defined, an implementation - # in sprintf_2.2/ is used. +@@ -124,7 +124,7 @@ + # You may uncomment this if you know that your system C libary provides + # asprintf and vasprintf. (GNU libc does.) If HAS_SYSTEM_ASPRINTF is not + # defined, an implementation provided in libtu/sprintf_2.2/ is used. -#HAS_SYSTEM_ASPRINTF=1 +HAS_SYSTEM_ASPRINTF=1 - # If you're on an archaic system (such as relatively recent *BSD releases) - # without even dummy multibyte/widechar and localisation support, you may -@@ -140,14 +140,14 @@ + # The following setting is needed with GNU libc for clock_gettime and the + # monotonic clock. Other systems may not need it, or may not provide a +@@ -163,14 +163,14 @@ #C89_SOURCE=-ansi @@ -87,3 +87,14 @@ # The -DCF_HAS_VA_COPY option should allow for some optimisations, and # in some cases simply defining +--- ion3.orig/utils/ion-statusd/Makefile ++++ ion3/utils/ion-statusd/Makefile +@@ -15,7 +15,7 @@ + DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \ + -DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \ + -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" \ +- -DSTATUSD_LOCATION=\"$(EXTRABINDIR)/ion-statusd\" ++# -DSTATUSD_LOCATION=\"$(EXTRABINDIR)/ion-statusd\" + + SOURCES = ion-statusd.c exec.c extlrx.c + diff --git a/debian/patches/205_ion-lock.diff b/debian/patches/205_ion-lock.diff index fce52f9..70de723 100755 --- a/debian/patches/205_ion-lock.diff +++ b/debian/patches/205_ion-lock.diff @@ -1,6 +1,6 @@ --- ion3.orig/etc/cfg_ioncore.lua +++ ion3/etc/cfg_ioncore.lua -@@ -331,7 +331,8 @@ +@@ -330,7 +330,8 @@ defmenu("mainmenu", { menuentry("Run...", "mod_query.query_exec(_)"), menuentry("Terminal", "ioncore.exec_on(_, XTERM or 'xterm')"), @@ -13,7 +13,7 @@ --- ion3.orig/utils/Makefile +++ ion3/utils/Makefile @@ -11,7 +11,7 @@ - SUBDIRS=ion-completefile + SUBDIRS=ion-completefile ion-statusd INSTALL_SUBDIRS=$(SUBDIRS) -SHELLSCRIPTS = ion-runinxterm ion-completeman @@ -21,7 +21,7 @@ TARGETS = ion-completeman ---- ion3.orig/utils/ion-lock +--- /dev/null +++ ion3/utils/ion-lock @@ -0,0 +1,6 @@ +#!/bin/sh diff --git a/debian/patches/206_use-x-terminal-emulator.diff b/debian/patches/206_use-x-terminal-emulator.diff index afaab3f..47b26ba 100644 --- a/debian/patches/206_use-x-terminal-emulator.diff +++ b/debian/patches/206_use-x-terminal-emulator.diff @@ -1,6 +1,6 @@ --- ion3.orig/etc/cfg_ioncore.lua +++ ion3/etc/cfg_ioncore.lua -@@ -153,7 +153,7 @@ +@@ -143,7 +143,7 @@ kpress(META.."F1", "ioncore.exec_on(_, ':man ion3')"), bdoc("Run a terminal emulator."), @@ -9,7 +9,7 @@ bdoc("Query for command line to execute."), kpress(ALTMETA.."F3", "mod_query.query_exec(_)"), -@@ -330,7 +330,7 @@ +@@ -329,7 +329,7 @@ -- Main menu defmenu("mainmenu", { menuentry("Run...", "mod_query.query_exec(_)"), diff --git a/debian/patches/211_add-debian-menu.diff b/debian/patches/211_add-debian-menu.diff index 22203ce..277601c 100644 --- a/debian/patches/211_add-debian-menu.diff +++ b/debian/patches/211_add-debian-menu.diff @@ -1,6 +1,6 @@ --- ion3.orig/etc/cfg_ioncore.lua +++ ion3/etc/cfg_ioncore.lua -@@ -336,6 +336,7 @@ +@@ -335,6 +335,7 @@ menuentry("Help", "mod_query.query_man(_)"), menuentry("About Ion", "mod_query.show_about_ion(_)"), submenu("Styles", "stylemenu"), @@ -8,7 +8,7 @@ submenu("Session", "sessionmenu"), }) -@@ -381,3 +382,12 @@ +@@ -380,3 +381,12 @@ defctxmenu("WClientWin", "Client window", { menuentry("Kill", "WClientWin.kill(_)"), }) -- 2.39.5