From 0237a5f9d655a8e660ee0b75e04d44884f531a48 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 10 Nov 2007 03:59:11 +0000 Subject: [PATCH] Updated for use in separate ion3-doc source package. --- debian/changelog | 8 +- debian/compat | 1 + debian/control | 52 ++----- debian/copyright | 253 +------------------------------- debian/ion3-doc.doc-base.config | 2 +- debian/ion3-doc.doc-base.notes | 2 +- debian/ion3-doc.docs | 4 +- debian/rules | 129 +--------------- debian/watch | 2 +- 9 files changed, 36 insertions(+), 417 deletions(-) create mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index e23c951..7488576 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,11 @@ -ion3 (20070927-1) unstable; urgency=low +ion3-doc (20070927-2) unstable; urgency=low + + * Moved ion3-doc into separate source package + -- Ben Hutchings Sun, 04 Nov 2007 17:05:26 +0000 + +ion3 (20070927-1) unstable; urgency=low + * New upstream release * Reenabled dh_strip since debugging information is disabled by default * Changed menu section to conform to new menu policy diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control index 1f2fba9..3da5fcf 100644 --- a/debian/control +++ b/debian/control @@ -1,49 +1,21 @@ -Source: ion3 -Section: non-free/x11 +Source: ion3-doc +Section: non-free/doc Priority: extra Maintainer: Ben Hutchings Standards-Version: 3.7.2.0 -Build-Depends: debhelper (>= 4.1.16), gcc (>> 3), libx11-dev, libxext-dev, libsm-dev, liblua5.1-0-dev, lua5.1, quilt, pkg-config, groff-base, po-debconf - -Package: ion3 -Section: non-free/x11 -Architecture: any -Depends: ${shlibs:Depends}, xterm | x-terminal-emulator, debconf, xbase-clients -Recommends: devscripts, libwww-perl, xfonts-75dpi | xfonts-75dpi-transcoded | xfonts-100dpi | xfonts-100dpi-transcoded -Suggests: menu (>= 2.1.9), docker, ion3-scripts -Conflicts: ion (<< 0.0.20020207-7), ion3-old -Provides: x-window-manager, ion3-api-${Ion:ApiVersion} -Description: keyboard-friendly window manager with tiled windows - Ion, based on PWM, is an unusual window manager with no overlapping - windows. Windows are placed in tabbed frames which may be arbitrarily - split to create additional frames, making keyboard navigation much - easier. Flexible configuration is possible thanks to Lua, which is - used as the configuration language. - . - There is also support for so-called 'floating workspaces' where - windows are managed the conventional way, so that you can still run - applications which do not fit very well into Ion's window management - approach. A pwm3 binary is included which starts Ion with floating - workspaces as the default, thus replacing the now obsolete PWM window - manager. - . - Homepage: http://iki.fi/tuomov/ion/ - -Package: ion3-dev -Section: non-free/devel -Priority: extra -Architecture: all -Depends: libx11-dev, libsm-dev, lua5.1, gcc (>> 3) -Description: ion3 development files - This package contains the files necessary for building extension - modules to the Ion window manager. +Build-Depends: debhelper (>= 4.1.16), quilt, pkg-config, groff-base Package: ion3-doc Section: non-free/doc Architecture: all Recommends: lynx | www-browser Suggests: doc-base, dwww | doc-central | dhelp -Description: ion3 documentation - This package contains the document 'Configuring and extending Ion3 - with Lua' which explains how to configure and extend the Ion window - manager. +Description: documentation for Ion3 and ParticleMan + This package contains two documents: + . + * 'Ion: Configuring and extending with Lua' describes how to + configure and extend the window manager Ion3. + . + * 'Ion: Notes for the module and patch writer' is an unorganized + collection of notes for those who want to write modules or patches + to Ion3. diff --git a/debian/copyright b/debian/copyright index 7e986a0..4003277 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,12 +1,12 @@ -This is the Debian-packaged version of Ion3. +This is the Debian-packaged version of the Ion3 documentation. -The package was put together by Per Olofsson , based -on the ion package created by Tommi Virtanen . It uses -source from: +The package is based on the ion3 package put together by Per Olofsson +. It uses source from: http://modeemi.fi/~tuomov/ion/ -The author of Ion3 is Tuomo Valkonen . +The author of Ion3 and its documentation is Tuomo Valkonen +. --- @@ -94,248 +94,5 @@ such versions. --- -The following notice applies to the dock module (mod_dock): - -Copyright (c) Tom Payne 2003 -Copyright (c) Per Olofsson 2003 - -This program is licensed under the terms of the Lesser General Public -License (LGPL) version 2.1. - ---- - -The following notices apply to the file name completion code -(ion-completefile, based on editline): - -Copyright 1992 Simmule Turner and Rich Salz. All rights reserved. - -This software is not subject to any license of the American Telephone -and Telegraph Company or of the Regents of the University of California. - -Permission is granted to anyone to use this software for any purpose on -any computer system, and to alter it and redistribute it freely, subject -to the following restrictions: -1. The authors are not responsible for the consequences of use of this - software, no matter how awful, even if they arise from flaws in it. -2. The origin of this software must not be misrepresented, either by - explicit claim or by omission. Since few users ever read sources, - credits must appear in the documentation. -3. Altered versions must be plainly marked as such, and must not be - misrepresented as being the original software. Since few users - ever read sources, credits must appear in the documentation. -4. This notice may not be removed or altered. - -The version contained here has some modifications by awb@cstr.ed.ac.uk -(Alan W Black) in order to integrate it with the Edinburgh Speech Tools -library and Scheme-in-one-defun in particular. - ---- - -The following notice applies to libtu, a library included in Ion3: - -Copyright (c) Tuomo Valkonen 1999-2007. - -Most of this library may be distributed and modified under either under -the Clarified Artistic License or the GNU LGPL, version 2.1 or later, -both reproduced in the file LICENSE. The red-black tree code is under -the GNU LGPL; see README.rb for details. - ---- - -The following notice applies to the red-black tree code in libtu: - -Copyright (C) 2000 James S. Plank - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - ---- - -Ion3 includes an implementation of snprintf which is licensed under -the "Frontier Artistic License Version 1.0". This code is not -included in the Debian binary packages. In the source package, the -license text can be found in libtu/snprintf_2.2/LICENSE.txt. - ---- - -Ion3 includes fontset handling code based on an example by Tomohiro -Kubota, to which the following notice applies: - -Copyright © 1999-2001 Tomohiro KUBOTA. - -This manual is free software; you may redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) any -later version. - ---- - -The following notice applies to the "grab" code, in addition to -Tuomo Valkonen's copyright and licence: - -Copyright (c) Lukas Schroeder 2002 - -Alternatively, you may apply the Clarified Artistic License to this file, -since Lukas' contributions were originally under that. - ---- - -The following notice applies to the Czech translation of Ion3: - -Copyright (c) Miroslav Kure 2004,2005,2006,2007. - -This file is distributed under the same license as the Ion3 package. - ---- - -The following notice applies to the document "Configuring and -extending with Lua": - -Copyright © 2003-2007 Tuomo Valkonen. - -This document is free; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2 of the License, or (at your -option) any later version. - ---- - -The following notice applies to the document "Ion: Notes for -the module and patch writer": - -Copyright © 2003-2004 Tuomo Valkonen. - -This document is free; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2 of the License, or (at your -option) any later version. - ---- - The GNU Lesser General Public License can be found in /usr/share/common-licenses/LGPL on Debian systems. - -The GNU General Public License can be found in -/usr/share/common-licenses/GPL on Debian systems. - ---- - -The Clarified Artistic License - -Preamble - -The intent of this document is to state the conditions under which a -Package may be copied, such that the Copyright Holder maintains some -semblance of artistic control over the development of the package, while -giving the users of the package the right to use and distribute the Package -in a more-or-less customary fashion, plus the right to make reasonable -modifications. - -Definitions: - -"Package" refers to the collection of files distributed by the Copyright -Holder, and derivatives of that collection of files created through textual -modification. -"Standard Version" refers to such a Package if it has not been modified, or -has been modified in accordance with the wishes of the Copyright Holder as -specified below. -"Copyright Holder" is whoever is named in the copyright or copyrights for -the package. -"You" is you, if you're thinking about copying or distributing this -Package. -"Distribution fee" is a fee you charge for providing a copy of this Package -to another party. -"Freely Available" means that no fee is charged for the right to use the -item, though there may be fees involved in handling the item. It also means -that recipients of the item may redistribute it under the same conditions -they received it. - - 1. You may make and give away verbatim copies of the source form of the - Standard Version of this Package without restriction, provided that you - duplicate all of the original copyright notices and associated - disclaimers. - 2. You may apply bug fixes, portability fixes and other modifications - derived from the Public Domain, or those made Freely Available, or from - the Copyright Holder. A Package modified in such a way shall still be - considered the Standard Version. - 3. You may otherwise modify your copy of this Package in any way, provided - that you insert a prominent notice in each changed file stating how and - when you changed that file, and provided that you do at least ONE of - the following: - - 1. place your modifications in the Public Domain or otherwise make them - Freely Available, such as by posting said modifications to Usenet - or an equivalent medium, or placing the modifications on a major - network archive site allowing unrestricted access to them, or by - allowing the Copyright Holder to include your modifications in the - Standard Version of the Package. - 2. use the modified Package only within your corporation or - organization. - 3. rename any non-standard executables so the names do not conflict - with standard executables, which must also be provided, and provide - a separate manual page for each non-standard executable that - clearly documents how it differs from the Standard Version. - 4. make other distribution arrangements with the Copyright Holder. - 5. permit and encourge anyone who receives a copy of the modified - Package permission to make your modifications Freely Available in - some specific way. - - 4. You may distribute the programs of this Package in object code or - executable form, provided that you do at least ONE of the following: - - 1. distribute a Standard Version of the executables and library files, - together with instructions (in the manual page or equivalent) on - where to get the Standard Version. - 2. accompany the distribution with the machine-readable source of the - Package with your modifications. - 3. give non-standard executables non-standard names, and clearly - document the differences in manual pages (or equivalent), together - with instructions on where to get the Standard Version. - 4. make other distribution arrangements with the Copyright Holder. - 5. offer the machine-readable source of the Package, with your - modifications, by mail order. - - 5. You may charge a distribution fee for any distribution of this Package. - If you offer support for this Package, you may charge any fee you - choose for that support. You may not charge a license fee for the right - to use this Package itself. You may distribute this Package in - aggregate with other (possibly commercial and possibly nonfree) - programs as part of a larger (possibly commercial and possibly nonfree) - software distribution, and charge license fees for other parts of that - software distribution, provided that you do not advertise this Package - as a product of your own. If the Package includes an interpreter, You - may embed this Package's interpreter within an executable of yours (by - linking); this shall be construed as a mere form of aggregation, - provided that the complete Standard Version of the interpreter is so - embedded. - 6. The scripts and library files supplied as input to or produced as output - from the programs of this Package do not automatically fall under the - copyright of this Package, but belong to whoever generated them, and - may be sold commercially, and may be aggregated with this Package. If - such scripts or library files are aggregated with this Package via the - so-called "undump" or "unexec" methods of producing a binary executable - image, then distribution of such an image shall neither be construed as - a distribution of this Package nor shall it fall under the restrictions - of Paragraphs 3 and 4, provided that you do not represent such an - executable image as a Standard Version of this Package. - 7. C subroutines (or comparably compiled subroutines in other languages) - supplied by you and linked into this Package in order to emulate - subroutines and variables of the language defined by this Package shall - not be considered part of this Package, but are the equivalent of input - as in Paragraph 6, provided these subroutines do not change the - language in any way that would cause it to fail the regression tests - for the language. - 8. Aggregation of the Standard Version of the Package with a commercial - distribution is always permitted provided that the use of this Package - is embedded; that is, when no overt attempt is made to make this - Package's interfaces visible to the end user of the commercial - distribution. Such use shall not be construed as a distribution of this - Package. - 9. The name of the Copyright Holder may not be used to endorse or promote - products derived from this software without specific prior written - permission. -10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF - MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/debian/ion3-doc.doc-base.config b/debian/ion3-doc.doc-base.config index 3ad6474..1e09bfc 100644 --- a/debian/ion3-doc.doc-base.config +++ b/debian/ion3-doc.doc-base.config @@ -1,5 +1,5 @@ Document: ion3-doc-config -Title: Ion: Configuring and extending with Lua (ion3) +Title: Ion: Configuring and extending with Lua (ion3-doc) Author: Tuomo Valkonen Abstract: This document describes how to configure and extend the window manager Ion (version 3). diff --git a/debian/ion3-doc.doc-base.notes b/debian/ion3-doc.doc-base.notes index fb1e77f..1e58db2 100644 --- a/debian/ion3-doc.doc-base.notes +++ b/debian/ion3-doc.doc-base.notes @@ -1,5 +1,5 @@ Document: ion3-doc-notes -Title: Ion: Notes for the module and patch writer (ion3) +Title: Ion: Notes for the module and patch writer (ion3-doc) Author: Tuomo Valkonen Abstract: This document is an unorganized collection of notes for those who want to write modules or patches to Ion (version 3). diff --git a/debian/ion3-doc.docs b/debian/ion3-doc.docs index 3e65e4f..b0cac13 100644 --- a/debian/ion3-doc.docs +++ b/debian/ion3-doc.docs @@ -1,2 +1,2 @@ -doc/ionconf -doc/ionnotes +ionconf +ionnotes diff --git a/debian/rules b/debian/rules index f7ed172..32fb69f 100755 --- a/debian/rules +++ b/debian/rules @@ -5,51 +5,19 @@ export SHELL=/bin/bash -include /usr/share/quilt/quilt.make - -PACKAGE := $(shell dpkg-parsechangelog | sed -r 's/^Source: //; t; d') -PACKAGE_DEV := $(PACKAGE)-dev -PACKAGE_DOC := $(PACKAGE)-doc -INSTDIR := debian/$(PACKAGE) -INSTDIR_DEV := debian/$(PACKAGE_DEV) +PACKAGE_DOC := $(shell dpkg-parsechangelog | sed -r 's/^Source: //; t; d') INSTDIR_DOC := debian/$(PACKAGE_DOC) -DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -r 's/^Version: //; t; d') -UPSTREAM_VERSION := $(shell echo $(DEBIAN_VERSION) | sed -r 's/^[0-9]*://; s/-[^-]*$$//') - -doc-orig: - cp -R doc doc-orig - -build-indep: build-indep-stamp -build-indep-stamp: doc-orig patch - dh_testdir - cd libextl && $(MAKE) libextl-mkexports - #cd doc && $(MAKE) all all-pdf - - touch build-indep-stamp - -build-arch: build-arch-stamp -build-arch-stamp: doc-orig patch - dh_testdir +build-indep: - $(MAKE) - - touch build-arch-stamp +build-arch: build: build-indep build-arch -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-indep-stamp build-arch-stamp - - $(MAKE) realclean - - if [ -d doc-orig ]; then \ - rm -rf doc; \ - mv doc-orig doc; \ - fi - dh_clean install-indep: build-indep @@ -59,35 +27,11 @@ install-indep: build-indep dh_installdirs -i dh_install -i -# install headers - find . \( -name debian -o -name config.h -o -name snprintf.h \) \ - -prune -o -name '*.h' -exec install -m644 -D {} \ - $(INSTDIR_DEV)/usr/include/$(PACKAGE)/{} \; - install-arch: build-arch - dh_testdir - dh_testroot - dh_clean -a -k - dh_installdirs -a - - $(MAKE) install \ - PREFIX=$(CURDIR)/$(INSTDIR)/usr \ - ETCDIR=$(CURDIR)/$(INSTDIR)/etc/X11/$(PACKAGE) - -# install other things (mainly -dev) - dh_install -a - -# fix the installation - rm -f $(INSTDIR)/etc/X11/$(PACKAGE)/draw.lua binary-indep: build-indep install-indep dh_testdir dh_testroot - -# automatically keep track of api version - echo Ion:ApiVersion=$$((cat version.h; echo ION_API_VERSION) \ - | cpp -P | tail -1 | sed 's/"//g') >>debian/$(PACKAGE_DEV).substvars - dh_installchangelogs -i dh_installdocs -i # remove empty images and TeX droppings @@ -96,81 +40,20 @@ binary-indep: build-indep install-indep -o -name '*.aux' -o -name '*.idx' -o -name '*.log' \ -o -name '*.out' -o -name '*.pl' -o -name WARNINGS \ | xargs rm -- - -# dh_installexamples -i -# dh_install -i -# dh_installmenu -i -# dh_installdebconf -i -# dh_installlogrotate -i -# dh_installemacsen -i -# dh_installpam -i -# dh_installmime -i -# dh_installinit -i -# dh_installcron -i -# dh_installinfo -i -# dh_undocumented -i -# dh_installman -i dh_link -i -# dh_strip -i dh_compress -i dh_fixperms -i -# dh_perl -i -# dh_python -i -# dh_makeshlibs -i dh_installdeb -i -# dh_shlibdeps -i dh_gencontrol -i dh_md5sums -i dh_builddeb -i binary-arch: build-arch install-arch - dh_testdir - dh_testroot - -# automatically keep track of api version - echo Ion:ApiVersion=$$((cat version.h; echo ION_API_VERSION) \ - | cpp -P | tail -1 | sed 's/"//g') >>debian/$(PACKAGE).substvars - - dh_installchangelogs -a - dh_installdocs -a - rm -f $(INSTDIR)/usr/share/doc/$(PACKAGE)/LICENSE - mv $(INSTDIR)/usr/share/doc/$(PACKAGE)/ChangeLog $(INSTDIR)/usr/share/doc/$(PACKAGE)/changelog -# dh_installexamples -a -# dh_install -a - dh_installmenu -a - install -m644 debian/$(PACKAGE).menu-method.i18n \ - $(INSTDIR)/etc/menu-methods/$(PACKAGE)-i18n - - dh_installdebconf -a -# dh_installlogrotate -a -# dh_installemacsen -a -# dh_installpam -a -# dh_installmime -a -# dh_installinit -a -# dh_installcron -a -# dh_installinfo -a -# dh_undocumented -a -# dh_installman -a - dh_link -a - dh_strip -a - dh_compress -a -X.lua - dh_fixperms -a -# dh_perl -a -# dh_python -a -# dh_makeshlibs -a - dh_installdeb -a - sed -i 's/^DEBIAN_VERSION=/&$(DEBIAN_VERSION)/; s/^UPSTREAM_VERSION=/&$(UPSTREAM_VERSION)/' \ - $(INSTDIR)/DEBIAN/postinst - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a binary: binary-indep binary-arch get-orig-source: - chmod +x debian/get-orig-source - debian/get-orig-source + uscan --force-download .PHONY: build-indep build-arch build clean binary-indep binary-arch binary \ - install-indep install-arch unpatch get-orig-source + install-indep install-arch get-orig-source diff --git a/debian/watch b/debian/watch index fe93fbc..adc2f64 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 http://modeemi.fi/~tuomov/ion/download.html \ -http://iki.fi/tuomov/dl/ion-3(?:rc)?-(\d{8})\.tar\.gz +http://iki.fi/tuomov/dl/ion-doc-3(?:rc)?-(\d{8})\.tar\.gz -- 2.39.5