r5086 - in /packages/trunk/doc-debian: debian/changelog debian/control debian/copyright debian/postinst debian/prerm debian/rules doc-base/debian-faq
Author: joostvb
Date: Wed Apr 2 06:11:14 2008
New Revision: 5086
URL: http://svn.debian.org/wsvn/?sc=1&rev=5086
Log:
remove Debian FAQ stuff
Removed:
packages/trunk/doc-debian/doc-base/debian-faq
Modified:
packages/trunk/doc-debian/debian/changelog
packages/trunk/doc-debian/debian/control
packages/trunk/doc-debian/debian/copyright
packages/trunk/doc-debian/debian/postinst
packages/trunk/doc-debian/debian/prerm
packages/trunk/doc-debian/debian/rules
Modified: packages/trunk/doc-debian/debian/changelog
URL: http://svn.debian.org/wsvn/packages/trunk/doc-debian/debian/changelog?rev=5086&op=diff
==============================================================================
--- packages/trunk/doc-debian/debian/changelog (original)
+++ packages/trunk/doc-debian/debian/changelog Wed Apr 2 06:11:14 2008
@@ -1,3 +1,14 @@
+doc-debian (3.1.6) UNRELEASED; urgency=high
+
+ * FIXME
+ * This package now is maintained using Subversion at ... IFXME
+ * The Debian GNU/Linux FAQ no longer is shipped with this package, but
+ via the new debian-faq source package.
+ - debian/{control,postinst,prerm,changelog,copyright,rules},
+ doc-base/debian-faq: remove Debian FAQ stuff.
+
+ -- Joost van Baal <joostvb@debian.org> Wed, 02 Apr 2008 08:05:14 +0200
+
doc-debian (3.1.5) unstable; urgency=high
[ High urgency, since the previous version was shipping out of date
Modified: packages/trunk/doc-debian/debian/control
URL: http://svn.debian.org/wsvn/packages/trunk/doc-debian/debian/control?rev=5086&op=diff
==============================================================================
--- packages/trunk/doc-debian/debian/control (original)
+++ packages/trunk/doc-debian/debian/control Wed Apr 2 06:11:14 2008
@@ -9,7 +9,7 @@
Package: doc-debian
Architecture: all
Suggests: www-browser, postscript-viewer
-Description: Debian Project documentation, Debian FAQ and other documents
+Description: Debian Project documentation and other documents
The Debian Project is an association of individuals who have made
common cause to create a free operating system.
.
@@ -20,7 +20,6 @@
* Debian Free Software Guidelines.
.
Additionally provided are:
- * Debian GNU/Linux Frequently Asked Questions (FAQ),
* Debian Bug Tracking System documentation, and
* Introduction to the Debian mailing lists.
.
Modified: packages/trunk/doc-debian/debian/copyright
URL: http://svn.debian.org/wsvn/packages/trunk/doc-debian/debian/copyright?rev=5086&op=diff
==============================================================================
--- packages/trunk/doc-debian/debian/copyright (original)
+++ packages/trunk/doc-debian/debian/copyright Wed Apr 2 06:11:14 2008
@@ -3,25 +3,6 @@
This package was first put together by Sven Rudolph, and later maintained
by Santiago Vila. Current maintainer is Josip Rodin <joy-packages@debian.org>.
-
-The copyright and license statement for the Debian FAQ:
-
- Copyright (C) 1996-2003 Software in the Public Interest
-
- Permission is granted to make and distribute verbatim copies of
- this document provided the copyright notice and this permission notice
- are preserved on all copies.
-
- Permission is granted to copy and distribute modified versions of
- this document under the conditions for verbatim copying, provided that
- the entire resulting derived work is distributed under the terms of
- a permission notice identical to this one.
-
- Permission is granted to copy and distribute translations of this
- document into another language, under the above conditions for
- modified versions, except that this permission notice may be included
- in translations approved by the Free Software Foundation instead of
- in the original English.
The copyright and license statement for the BTS (applies to docs):
Modified: packages/trunk/doc-debian/debian/postinst
URL: http://svn.debian.org/wsvn/packages/trunk/doc-debian/debian/postinst?rev=5086&op=diff
==============================================================================
--- packages/trunk/doc-debian/debian/postinst (original)
+++ packages/trunk/doc-debian/debian/postinst Wed Apr 2 06:11:14 2008
@@ -1,7 +1,6 @@
#!/bin/sh -e
if which install-docs >/dev/null 2>&1; then
- install-docs -i /usr/share/doc-base/debian-faq
install-docs -i /usr/share/doc-base/debian-constitution-text
install-docs -i /usr/share/doc-base/debian-reporting-bugs
install-docs -i /usr/share/doc-base/debian-manifesto
Modified: packages/trunk/doc-debian/debian/prerm
URL: http://svn.debian.org/wsvn/packages/trunk/doc-debian/debian/prerm?rev=5086&op=diff
==============================================================================
--- packages/trunk/doc-debian/debian/prerm (original)
+++ packages/trunk/doc-debian/debian/prerm Wed Apr 2 06:11:14 2008
@@ -1,7 +1,6 @@
#!/bin/sh -e
if which install-docs >/dev/null 2>&1; then
- install-docs -r debian-faq
install-docs -r debian-constitution-text
install-docs -r debian-reporting-bugs
install-docs -r debian-manifesto
Modified: packages/trunk/doc-debian/debian/rules
URL: http://svn.debian.org/wsvn/packages/trunk/doc-debian/debian/rules?rev=5086&op=diff
==============================================================================
--- packages/trunk/doc-debian/debian/rules (original)
+++ packages/trunk/doc-debian/debian/rules Wed Apr 2 06:11:14 2008
@@ -6,17 +6,14 @@
build: stamp-build
stamp-build:
- test -d FAQ -a -f debian/rules
- cd FAQ && $(MAKE) html text ps pdf
- cd FAQ && gzip -9 debian-faq.en.txt debian-faq.en.ps debian-faq.en.pdf
+ test -f debian/rules
touch $@
clean:
- test -d FAQ -a -f debian/rules
+ test -f debian/rules
test "`id -u`" -eq 0
- cd FAQ && $(MAKE) clean
rm -rf $(tmp)
- rm -f FAQ/*.gz stamp-build debian/files `find . -name "*~"`
+ rm -f stamp-build debian/files `find . -name "*~"`
refresh:
cd doc && $(MAKE)
@@ -26,27 +23,17 @@
binary-arch:
binary-indep: build
- test -d FAQ -a -f debian/rules
+ test -f debian/rules
test "`id -u`" -eq 0
rm -rf $(tmp)
- install -m 755 -d $(tmp)/DEBIAN $(docdir)/FAQ \
+ install -m 755 -d $(tmp)/DEBIAN \
$(tmp)/usr/share/doc-base $(tmp)/usr/share/doc/doc-debian
# Copy all the contents of doc/
cp -p doc/* $(docdir)
# Save for the files that are used to auto-generate them
rm -f $(docdir)/*wml
rm -f $(docdir)/Makefile
- cd FAQ && install -m 644 debian-faq.en.txt.gz debian-faq.en.ps.gz \
- debian-faq.en.pdf.gz debian-faq.en.html/* $(docdir)/FAQ
- cd $(docdir)/FAQ && for file in *.en.html; do \
- ln -s $$file $${file%$${file#$${file%.en.html}}}.html; \
- done
-# Make links for the byhands
- ln -sf debian-faq.en.txt.gz $(docdir)/FAQ/debian-faq.txt.gz
- ln -sf debian-faq.en.ps.gz $(docdir)/FAQ/debian-faq.ps.gz
- ln -sf debian-faq.en.pdf.gz $(docdir)/FAQ/debian-faq.pdf.gz
- ln -sf debian-faq.en.pdf.gz $(docdir)/FAQ/debian-faq.pdf.gz
install -m 755 debian/prerm debian/postinst $(tmp)/DEBIAN
install -m 644 doc-base/* $(tmp)/usr/share/doc-base
@@ -57,18 +44,9 @@
dpkg --build $(tmp) ..
# The extra-package files:
- mv $(docdir)/FAQ/debian-faq.*txt.gz \
- $(docdir)/FAQ/debian-faq.*ps.gz \
- $(docdir)/FAQ/debian-faq.*pdf.gz \
- ../
- cd $(docdir)/FAQ/ && GZIP=-9 tar czf $(CURDIR)/../debian-faq.en.html.tar.gz *
mv $(docdir)/constitution.1.2.txt ../constitution.txt
mv $(docdir)/social-contract.1.1.txt ../social-contract.txt
- dpkg-distaddfile debian-faq.en.html.tar.gz byhand -
- dpkg-distaddfile debian-faq.en.txt.gz byhand -
- dpkg-distaddfile debian-faq.en.ps.gz byhand -
- dpkg-distaddfile debian-faq.en.pdf.gz byhand -
dpkg-distaddfile constitution.txt byhand -
dpkg-distaddfile social-contract.txt byhand -
Reply to: