r1304 - in glibc-package/branches/glibc-2.4/debian: . control.in debhelper.in patches rules.d
Author: barbier
Date: 2006-03-23 21:47:56 +0000 (Thu, 23 Mar 2006)
New Revision: 1304
Added:
glibc-package/branches/glibc-2.4/debian/patches/remove-manual.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/control
glibc-package/branches/glibc-2.4/debian/control.in/main
glibc-package/branches/glibc-2.4/debian/copyright
glibc-package/branches/glibc-2.4/debian/debhelper.in/glibc-doc.links
glibc-package/branches/glibc-2.4/debian/patches/series
glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
Log:
- Remove the GNU Libc Reference manual from glibc-doc because it is
not DFSG-free. (Closes: #181494)
The whole glibc-2.4/manual directory is removed from glibc-2.4.tar.bz2.
- debian/control: Drop Build-Depends: texinfo, texi2html.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-03-23 21:35:08 UTC (rev 1303)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-03-23 21:47:56 UTC (rev 1304)
@@ -24,6 +24,10 @@
- debian/rules.d/tarball.mk: glibc-<foo>-2.4.tar.bz2 add-on unpacks
into either <foo> or glibc-<foo>-2.4, in which case it is renamed
into <foo>.
+ - Remove the GNU Libc Reference manual from glibc-doc because it is
+ not DFSG-free. (Closes: #181494)
+ The whole glibc-2.4/manual directory is removed from glibc-2.4.tar.bz2.
+ - debian/control: Drop Build-Depends: texinfo, texi2html.
-- Clint Adams <schizo@debian.org> Mon, 6 Mar 2006 16:49:38 -0500
Modified: glibc-package/branches/glibc-2.4/debian/control
===================================================================
--- glibc-package/branches/glibc-2.4/debian/control 2006-03-23 21:35:08 UTC (rev 1303)
+++ glibc-package/branches/glibc-2.4/debian/control 2006-03-23 21:47:56 UTC (rev 1304)
@@ -1,8 +1,7 @@
Source: glibc
Section: libs
Priority: required
-Build-Depends: gettext, make (>= 3.80-1), dpkg-dev (>= 1.13.5), bzip2,
- texinfo, texi2html, file,
+Build-Depends: gettext, make (>= 3.80-1), dpkg-dev (>= 1.13.5), bzip2, file,
linux-kernel-headers (>= 2.6.13+0rc3-2) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
@@ -22,10 +21,11 @@
Conflicts: libc-doc
Replaces: libc-doc
Provides: libc-doc
+Recommands: glibc-doc-reference
Description: GNU C Library: Documentation
- Contains The GNU C Library Reference manual in info and html format as
- well as man pages for libpthread functions. Also included is the complete
- GNU C Library ChangeLog.
+ Contains man pages for libpthread functions and the complete GNU C Library
+ ChangeLog. The GNU C Library Reference manual has been moved into
+ glibc-doc-reference for licensing reasons.
Package: locales
Architecture: all
Modified: glibc-package/branches/glibc-2.4/debian/control.in/main
===================================================================
--- glibc-package/branches/glibc-2.4/debian/control.in/main 2006-03-23 21:35:08 UTC (rev 1303)
+++ glibc-package/branches/glibc-2.4/debian/control.in/main 2006-03-23 21:47:56 UTC (rev 1304)
@@ -1,8 +1,7 @@
Source: @glibc@
Section: libs
Priority: required
-Build-Depends: gettext, make (>= 3.80-1), dpkg-dev (>= 1.13.5), bzip2,
- texinfo, texi2html, file,
+Build-Depends: gettext, make (>= 3.80-1), dpkg-dev (>= 1.13.5), bzip2, file,
linux-kernel-headers (>= 2.6.13+0rc3-2) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
@@ -22,10 +21,11 @@
Conflicts: libc-doc
Replaces: libc-doc
Provides: libc-doc
+Recommands: @glibc@-doc-reference
Description: GNU C Library: Documentation
- Contains The GNU C Library Reference manual in info and html format as
- well as man pages for libpthread functions. Also included is the complete
- GNU C Library ChangeLog.
+ Contains man pages for libpthread functions and the complete GNU C Library
+ ChangeLog. The GNU C Library Reference manual has been moved into
+ @glibc@-doc-reference for licensing reasons.
Package: locales
Architecture: all
Modified: glibc-package/branches/glibc-2.4/debian/copyright
===================================================================
--- glibc-package/branches/glibc-2.4/debian/copyright 2006-03-23 21:35:08 UTC (rev 1303)
+++ glibc-package/branches/glibc-2.4/debian/copyright 2006-03-23 21:47:56 UTC (rev 1304)
@@ -27,20 +27,6 @@
On Debian systems, the complete text of the GNU Library
General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
-The following applies to the GNU C Library Reference Manual (libc.info):
-
- Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003 Free
- Software Foundation, Inc.
-
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.1 or
- any later version published by the Free Software Foundation; with the
- Invariant Sections being "Free Software Needs Free Documentation" and
- "GNU Lesser General Public License", the Front-Cover texts being (a)
- (see below), and with the Back-Cover Texts being (b) (see below). A
- copy of the license is included in the section entitled "GNU Free
- Documentation License".
-
Additional Details (the following is taken from `info libc
Contributors' which also contains a list of credits):
Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/glibc-doc.links
===================================================================
--- glibc-package/branches/glibc-2.4/debian/debhelper.in/glibc-doc.links 2006-03-23 21:35:08 UTC (rev 1303)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/glibc-doc.links 2006-03-23 21:47:56 UTC (rev 1304)
@@ -1,4 +1,3 @@
-usr/share/doc/glibc-doc/html/libc.html usr/share/doc/glibc-doc/html/index.html
usr/share/man/man3/pthread_key_create.3.gz usr/share/man/man3/pthread_getspecific.3.gz
usr/share/man/man3/pthread_key_create.3.gz usr/share/man/man3/pthread_key_delete.3.gz
usr/share/man/man3/pthread_key_create.3.gz usr/share/man/man3/pthread_setspecific.3.gz
Added: glibc-package/branches/glibc-2.4/debian/patches/remove-manual.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/remove-manual.diff 2006-03-23 21:35:08 UTC (rev 1303)
+++ glibc-package/branches/glibc-2.4/debian/patches/remove-manual.diff 2006-03-23 21:47:56 UTC (rev 1304)
@@ -0,0 +1,290 @@
+The GNU Libc Reference manual has to be removed for licensing reasons.
+But some files have a dependency on manual/errno.texi; the easiest
+solution is to drop those dependencies and make sure that MAKEINFO=:
+so that no target depends on manual/*.texi files.
+
+Index: glibc-2.4/manual/Makefile
+===================================================================
+--- /dev/null
++++ glibc-2.4/manual/Makefile
+@@ -0,0 +1,254 @@
++# Copyright (C) 1992-1999,2000,2001,2002,2003,2004,2006
++# Free Software Foundation, Inc.
++# This file is part of the GNU C Library.
++
++# The GNU C 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.
++
++# The GNU C Library is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# Lesser General Public License for more details.
++
++# You should have received a copy of the GNU Lesser General Public
++# License along with the GNU C Library; if not, write to the Free
++# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++# 02111-1307 USA.
++
++# Makefile for the GNU C Library manual.
++
++subdir := manual
++export subdir := $(subdir)
++
++# Allow override
++INSTALL_INFO = install-info
++
++.PHONY: all dvi pdf info html
++all: dvi
++dvi: libc.dvi
++pdf: libc.pdf
++
++# Get glibc's configuration info.
++ifneq (,$(wildcard ../Makeconfig))
++include ../Makeconfig
++else
++MAKEINFO = makeinfo
++TEXI2DVI = texi2dvi
++AWK = gawk
++endif
++
++TEXI2PDF = texi2dvi --pdf
++
++ifneq ($(strip $(MAKEINFO)),:)
++all: info
++info: libc.info
++endif
++
++# scripts we use
++ifndef move-if-change
++move-if-change = ./move-if-change
++endif
++mkinstalldirs = $(..)scripts/mkinstalldirs
++
++chapters = $(addsuffix .texi, \
++ intro errno memory ctype string charset locale \
++ message search pattern io stdio llio filesys \
++ pipe socket terminal syslog math arith time \
++ resource setjmp signal startup process job nss \
++ users sysinfo conf crypt debug)
++add-chapters = $(wildcard $(foreach d, $(add-ons), ../$d/$d.texi))
++appendices = lang.texi header.texi install.texi maint.texi contrib.texi \
++ freemanuals.texi
++
++-include texis
++texis: texis.awk $(chapters) $(add-chapters) $(appendices) lesser.texi fdl.texi
++ $(AWK) -f $^ > $@.T
++ mv -f $@.T $@
++
++nonexamples = $(filter-out $(add-chapters) %.c.texi, $(texis))
++examples = $(filter-out $(foreach d, $(add-ons), ../$d/%.c.texi), \
++ $(filter %.c.texi, $(texis)))
++
++# Kludge: implicit rule so Make knows the one command does it all.
++chapters.% top-menu.%: libc-texinfo.sh $(texis) Makefile
++ AWK=$(AWK) $(SHELL) $< '$(chapters)' '$(add-chapters)' '$(appendices)'
++
++libc.dvi libc.pdf libc.info: chapters.texi top-menu.texi dir-add.texi \
++ libm-err.texi
++libc.dvi libc.pdf: texinfo.tex
++
++html: libc/index.html
++libc/index.html: chapters.texi top-menu.texi dir-add.texi libm-err.texi
++ $(MAKEINFO) --html libc.texinfo
++
++# Generate the summary from the Texinfo source files for each chapter.
++summary.texi: stamp-summary ;
++stamp-summary: summary.awk $(filter-out summary.texi, $(texis))
++ $(AWK) -f $^ | sort -t' ' -df -k 1,1 | tr '\014' '\012' > summary-tmp
++ $(move-if-change) summary-tmp summary.texi
++ touch $@
++
++# Generate a file which can be added to the `dir' content to provide direct
++# access to the documentation of the function, variables, and other
++# definitions.
++dir-add.texi: xtract-typefun.awk $(texis)
++ (echo "@dircategory GNU C library functions and macros"; \
++ echo "@direntry"; \
++ $(AWK) -f $^ | sort; \
++ echo "@end direntry") > $@.new
++ mv -f $@.new $@
++
++# The table with the math errors is generated.
++libm-err.texi: stamp-libm-err
++stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
++ $(dir)/libm-test-ulps))
++ pwd=`pwd`; \
++ $(PERL) $< $$pwd/.. > libm-err-tmp
++ $(move-if-change) libm-err-tmp libm-err.texi
++ touch $@
++
++# Generate Texinfo files from the C source for the example programs.
++%.c.texi: examples/%.c
++ sed -e 's,[{}],@&,g' \
++ -e 's,/\*\(@.*\)\*/,\1,g' \
++ -e 's,/\* *,/* @r{,g' -e 's, *\*/,} */,' \
++ -e 's/\(@[a-z][a-z]*\)@{\([^}]*\)@}/\1{\2}/g'\
++ $< | expand > $@.new
++ mv -f $@.new $@
++
++%.info: %.texinfo
++ LANGUAGE=C LC_ALL=C $(MAKEINFO) $<
++
++%.dvi: %.texinfo
++ $(TEXI2DVI) $<
++
++%.pdf: %.texinfo
++ $(TEXI2PDF) $<
++
++# Distribution.
++minimal-dist = summary.awk texis.awk tsort.awk libc-texinfo.sh libc.texinfo \
++ libm-err.texi stamp-libm-err \
++ $(filter-out summary.texi, $(nonexamples)) \
++ $(patsubst %.c.texi,examples/%.c, $(examples))
++
++doc-only-dist = Makefile COPYING.LIB
++distribute = $(minimal-dist) $(examples) stdio-fp.c \
++ libc.info* libc.?? libc.??s texinfo.tex \
++ xtract-typefun.awk dir-add.texi dir libm-err-tab.pl
++export distribute := $(distribute)
++
++tar-it = tar chovf $@ $^
++
++manual.tar: $(doc-only-dist) $(minimal-dist) ; $(tar-it)
++mandist.tar: $(doc-only-dist) $(distribute) ; $(tar-it)
++
++edition := $(shell sed -n 's/^@set EDITION \([0-9][0-9.]*\)[^0-9.]*.*$$/\1/p' \
++ libc.texinfo)
++
++glibc-doc-$(edition).tar: $(doc-only-dist) $(distribute)
++ @rm -f glibc-doc-$(edition)
++ ln -s . glibc-doc-$(edition)
++ tar chovf $@ $(addprefix glibc-doc-$(edition)/,$^)
++ rm -f glibc-doc-$(edition)
++
++%.Z: %
++ compress -c $< > $@.new
++ mv -f $@.new $@
++%.gz: %
++ gzip -9 -c $< > $@.new
++ mv -f $@.new $@
++%.uu: %
++ uuencode $< < $< > $@.new
++ mv -f $@.new $@
++
++.PHONY: mostlyclean distclean realclean clean
++mostlyclean:
++ -rm -f libc.dvi libc.pdf libc.tmp libc.info*
++ -rm -f $(objpfx)stubs
++ -rm -f $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o)
++clean: mostlyclean
++distclean: clean
++indices = cp fn pg tp vr ky
++realclean: distclean
++ -rm -f texis summary.texi stamp-summary *.c.texi dir-add.texi
++ -rm -f $(foreach index,$(indices),libc.$(index) libc.$(index)s)
++ -rm -f libc.log libc.aux libc.toc dir-add.texinfo
++ -rm -f top-menu.texi chapters.texi
++
++.PHONY: install subdir_install installdirs install-data
++install-data subdir_install: install
++ifneq ($(strip $(MAKEINFO)),:)
++install: $(inst_infodir)/libc.info
++ @if $(SHELL) -c '$(INSTALL_INFO) --version' >/dev/null 2>&1; then \
++ test -f $(inst_infodir)/dir || $(INSTALL_DATA) dir $(inst_infodir);\
++ $(INSTALL_INFO) --info-dir=$(inst_infodir) $(inst_infodir)/libc.info;\
++ else : ; fi
++endif
++# Catchall implicit rule for other installation targets from the parent.
++install-%: ;
++
++$(inst_infodir)/libc.info: libc.info installdirs
++ for file in $<*; do \
++ $(INSTALL_DATA) $$file $(@D)/$$file; \
++ done
++
++installdirs:
++ $(mkinstalldirs) $(inst_infodir)
++
++.PHONY: dist
++dist: # glibc-doc-$(edition).tar.gz
++
++ifneq (,$(wildcard ../Make-dist))
++dist: ../Make-dist
++ $(MAKE) -f $< $(Make-dist-args)
++endif
++
++ifndef ETAGS
++ETAGS = etags -T
++endif
++TAGS: $(minimal-dist)
++ $(ETAGS) -o $@ $^
++
++# The parent makefile sometimes invokes us with targets `subdir_REAL-TARGET'.
++subdir_%: % ;
++# For targets we don't define, do nothing.
++subdir_%: ;
++
++# These are targets that each glibc subdirectory is expected to understand.
++# ../Rules defines them for code subdirectories; for us, they are no-ops.
++# None of these should be `subdir_TARGET'; those targets are transformed
++# by the implicit rule above into `TARGET' deps.
++glibc-targets := lib objects objs others tests xtests lint.out echo-headers
++.PHONY: $(glibc-targets)
++$(glibc-targets):
++
++# Create stamp files if they don't exist, so the parent makefile's rules for
++# updating the library archives are happy with us, and never think we have
++# changed the library.
++lib: $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o)
++ifdef objpfx
++.PHONY: stubs
++stubs: $(objpfx)stubs
++endif
++$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
++ $(make-target-directory)
++ touch $@
++
++# Make the target directory if it doesn't exist, using the `mkinstalldirs'
++# script that does `mkdir -p' even if `mkdir' doesn't support that flag.
++define make-target-directory
++$(addprefix $(mkinstalldirs) ,\
++ $(filter-out $(wildcard $(@D:%/=%)),$(@D:%/=%)))
++endef
++
++# The top-level glibc Makefile expects subdir_install to update the stubs file.
++subdir_install: stubs
++
++# Get rid of these variables if they came from the parent.
++routines =
++aux =
++sources =
++objects =
++headers =
+Index: glibc-2.4/sysdeps/gnu/Makefile
+===================================================================
+--- glibc-2.4.orig/sysdeps/gnu/Makefile
++++ glibc-2.4/sysdeps/gnu/Makefile
+@@ -20,7 +20,7 @@
+ # Generate the list of strings for errno codes from the section of the
+ # manual which documents the codes.
+
+-$(..)sysdeps/gnu/errlist.c: $(..)sysdeps/gnu/errlist.awk \
++$(..)sysdeps/gnu/errlist-disabled.c: $(..)sysdeps/gnu/errlist.awk \
+ $(..)manual/errno.texi
+ $(AWK) -f $^ > $@-tmp
+ # Make it unwritable so noone will edit it by mistake.
+Index: glibc-2.4/sysdeps/mach/hurd/Makefile
+===================================================================
+--- glibc-2.4.orig/sysdeps/mach/hurd/Makefile
++++ glibc-2.4/sysdeps/mach/hurd/Makefile
+@@ -87,7 +87,7 @@
+ -e 's, \.\./, $(..),g' > $@t
+ mv -f $@t $@
+
+-$(hurd)/bits/errno.h: $(common-objpfx)stamp-errnos ;
++$(hurd)/bits/errno-disabled.h: $(common-objpfx)stamp-errnos ;
+ $(common-objpfx)stamp-errnos: $(hurd)/errnos.awk $(errno.texinfo) \
+ $(mach-errnos-deps) $(common-objpfx)errnos.d
+ $(AWK) -f $^ > $(hurd)/bits/errno.h-tmp
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-03-23 21:35:08 UTC (rev 1303)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-03-23 21:47:56 UTC (rev 1304)
@@ -115,6 +115,7 @@
hurd-ioctl-decode-argument.diff -p0
ld-multiarch.diff -p1
ldconfig-multiarch.diff -p1
+remove-manual.diff
#rtld.diff -p1
#resource_h.diff -p1
#hppa-inlining.diff -p1
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-03-23 21:35:08 UTC (rev 1303)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-03-23 21:47:56 UTC (rev 1304)
@@ -61,6 +61,7 @@
cd $(DEB_BUILDDIR) && \
CC="$(call xx,CC)" \
AUTOCONF=false \
+ MAKEINFO=: \
$(CURDIR)/$(DEB_SRCDIR)/configure \
--host=$(call xx,configure_target) \
--build=$$configure_build --prefix=/usr --without-cvs \
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk 2006-03-23 21:35:08 UTC (rev 1303)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk 2006-03-23 21:47:56 UTC (rev 1304)
@@ -61,7 +61,6 @@
dh_installdirs -p$(curpass)
dh_install -p$(curpass)
dh_installman -p$(curpass)
- dh_installinfo -p$(curpass)
dh_installdebconf -p$(curpass)
dh_installchangelogs -p$(curpass)
dh_installinit -p$(curpass)
Reply to: