Package: debian-policy
Version: 3.9.2.0
Severity: wishlist
Dear all,
here is a tentative patch following discussion on http://640737#65, to
distribute the machine-readable debian/copyright specification version 1.0 (DEP
5) in the debian-policy binary package, as the following files, so that they
can be installed on www.debian.org at the URL decided in http://640737.
/usr/share/doc/debian-policy/copyright-format-1.0.html
/usr/share/doc/debian-policy/copyright-format-1.0.xml.tar.gz
/usr/share/doc/debian-policy/copyright-format-1.0.txt.gz
With this patch, the source package will contain a file called
copyright-format/copyright-format.xml that contains the working draft of the
next version (if any), which is not built nor distributed in the binary
package, and a file called copyright-format/copyright-format-1.0.xml that is
the source of the published version.
As you can see, this patch does not attempt to establish a generic way to
build and install multiple versions in parallel.
Have a nice week-end,
--
Charles Plessy
Tsurumi, Kanagawa, Japan
>From 1fee3d3e3a01425ad982543ac35f23c931f6f02d Mon Sep 17 00:00:00 2001
From: Charles Plessy <ple...@debian.org>
Date: Fri, 21 Oct 2011 22:20:36 +0900
Subject: [PATCH] Publish the copyright format specification version 1.0 (DEP
5).
---
.gitignore | 1 +
copyright-format-1.0.desc | 14 ++++++++++++++
copyright-format.desc | 14 --------------
copyright-format/Makefile | 8 ++++----
copyright-format/copyright-format-1.0.xml | 2 +-
debian/rules | 12 ++++++------
6 files changed, 26 insertions(+), 25 deletions(-)
create mode 100644 copyright-format-1.0.desc
delete mode 100644 copyright-format.desc
diff --git a/.gitignore b/.gitignore
index 5b2eb84..a0df3e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
/README.html
/body.tmp
/copyright-format/copyright-format.html
+/copyright-format/copyright-format-1.0.html
/debconf_spec/debconf_specification.html
/debconf_spec/debconf_specification.txt.gz
/head.tmp
diff --git a/copyright-format-1.0.desc b/copyright-format-1.0.desc
new file mode 100644
index 0000000..8a3b214
--- /dev/null
+++ b/copyright-format-1.0.desc
@@ -0,0 +1,14 @@
+Document: copyright-format-1.0
+Title: Machine-readable debian/copyright file
+Author: The Debian Project
+Abstract: Standard, machine-readable format for debian/copyright files within
+ packages, to facilitate automated checking and reporting of licenses for
+ packages and sets of packages.
+Section: Debian
+
+Format: text
+Files: /usr/share/doc/debian-policy/copyright-format-1.0.txt.gz
+
+Format: HTML
+Index: /usr/share/doc/debian-policy/copyright-format-1.0.html
+Files: /usr/share/doc/debian-policy/copyright-format-1.0.html
diff --git a/copyright-format.desc b/copyright-format.desc
deleted file mode 100644
index 724bc7b..0000000
--- a/copyright-format.desc
+++ /dev/null
@@ -1,14 +0,0 @@
-Document: copyright-format
-Title: Machine-readable debian/copyright file
-Author: The Debian Project
-Abstract: Standard, machine-readable format for debian/copyright files within
- packages, to facilitate automated checking and reporting of licenses for
- packages and sets of packages.
-Section: Debian
-
-Format: text
-Files: /usr/share/doc/debian-policy/copyright-format.txt.gz
-
-Format: HTML
-Index: /usr/share/doc/debian-policy/copyright-format.html
-Files: /usr/share/doc/debian-policy/copyright-format.html
diff --git a/copyright-format/Makefile b/copyright-format/Makefile
index 27d8f5b..92ef4f3 100644
--- a/copyright-format/Makefile
+++ b/copyright-format/Makefile
@@ -1,14 +1,14 @@
-all: copyright-format.txt.gz copyright-format.html
+all: copyright-format-1.0.txt.gz copyright-format-1.0.html
-%.html: %.xml html.dsl
+copyright-format-1.0.html: copyright-format-1.0.xml html.dsl
jade -V nochunks -t sgml -d html.dsl \
/usr/share/xml/declaration/xml.dcl $< > $@
-tidy -q -i -m -f /dev/null $@
-%.txt: %.html
+copyright-format-1.0.txt: copyright-format-1.0.html
links -dump $< | perl -pe 's/[\r\0]//g' > $@
-%.txt.gz: %.txt
+copyright-format-1.0.txt.gz: copyright-format-1.0.txt
gzip -cf9 $< > $@
clean:
diff --git a/copyright-format/copyright-format-1.0.xml
b/copyright-format/copyright-format-1.0.xml
index d6790aa..f42b2a2 100644
--- a/copyright-format/copyright-format-1.0.xml
+++ b/copyright-format/copyright-format-1.0.xml
@@ -10,7 +10,7 @@
<!DOCTYPE article PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN'
'http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd'>
-<article class="specification" status="draft" lang="en" id="copyright-format">
+<article class="specification" lang="en" id="copyright-format-1.0">
<articleinfo>
<title>
Machine-readable <filename>debian/copyright</filename> file.
diff --git a/debian/rules b/debian/rules
index 96565f0..bf94f4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ LIBDIR := $(TMPTOP)/usr/share/doc-base
sanitycheck := debian/rules policy.sgml
SGML_FILES := policy menu-policy mime-policy perl-policy upgrading-checklist
-DESC_FILES := copyright-format debian-policy debian-menu-policy
debian-perl-policy \
+DESC_FILES := copyright-format-1.0 debian-policy debian-menu-policy
debian-perl-policy \
debian-mime-policy debconf-spec fhs
# While we have two versions of the FHS installed in the source package,
@@ -49,8 +49,8 @@ FHS_NEW_FILES :=
POLICY_FILES = $(SGML_FILES:=.sgml) $(SGML_FILES:=.txt.gz) \
virtual-package-names-list.txt \
libc6-migration.txt version.ent \
- copyright-format/copyright-format.html \
- copyright-format/copyright-format.txt.gz \
+ copyright-format/copyright-format-1.0.html \
+ copyright-format/copyright-format-1.0.txt.gz \
debconf_spec/debconf_specification.html \
debconf_spec/debconf_specification.txt.gz \
policy.ps.gz policy.pdf.gz README.txt README.html \
@@ -59,7 +59,7 @@ POLICY_FILES = $(SGML_FILES:=.sgml) $(SGML_FILES:=.txt.gz) \
FILES_FROM_ORG := Process.html Process.txt README.txt README.html
# policy.{pdf,ps,tpt,txt} are generated files
-FILES_TO_CLEAN = copyright-format.xml.tar.gz \
+FILES_TO_CLEAN = copyright-format-1.0.xml.tar.gz \
debian/files debian/buildinfo debian/substvars \
debian/postinst debian/prerm \
version.ent \
@@ -142,8 +142,8 @@ stamp-policy: build $(sanitycheck)
$(install_file) $(FHS_FILES) $(DOCDIR)/fhs/
$(install_file) debian/copyright $(DOCDIR)/
GZIP=-9 cd copyright-format && \
- tar -zcf ../copyright-format.xml.tar.gz *
- $(install_file) copyright-format.xml.tar.gz $(DOCDIR)/
+ tar -zcf ../copyright-format-1.0.xml.tar.gz *
+ $(install_file) copyright-format-1.0.xml.tar.gz $(DOCDIR)/
@set -ex; \
GZIP=-9 cd debconf_spec && \
tar -zcf ../debconf_specification.xml.tar.gz *
--
1.7.5.4
