proper escaping of single quotes in the pkg description/TOC requires

newest debhelper

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@2176 313b444b-1b9f-4f58-a734-7bb04f332e8d

diff --git a/debian/changelog b/debian/changelog
index 9693006f4139e627a42d0a89202ebaca97161cba..083e2002164d66c0da27c40c5a3111f371d89013 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,7 +26,9 @@ developers-reference (3.3) unstable; urgency=low
       table of contents (TOC) with a new script 'debian/tocsubstvars';
       note that the TOC displayed in the developers-reference-{fr,ja}
       package descriptions are in English until UTF8 control files are
       table of contents (TOC) with a new script 'debian/tocsubstvars';
       note that the TOC displayed in the developers-reference-{fr,ja}
       package descriptions are in English until UTF8 control files are

-      allowed
+      allowed; proper escaping of single quotes here requires newest
+      debhelper
+    - editorial changes on the additions in this release

 
  -- Adam Di Carlo <aph@debian.org>  
 
 
  -- Adam Di Carlo <aph@debian.org>  
 

diff --git a/debian/control b/debian/control
index b5c8727fdc2477fc9c032325bfa4a0a9701a964d..af543bdee2526ceb1c16c0068871138a895dc2e4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Adam Di Carlo <aph@debian.org>
 Uploaders: Manoj Srivastava <srivasta@debian.org>, Raphael Hertzog <hertzog@debian.org>
 Standards-Version: 3.5.8
 Maintainer: Adam Di Carlo <aph@debian.org>
 Uploaders: Manoj Srivastava <srivasta@debian.org>, Raphael Hertzog <hertzog@debian.org>
 Standards-Version: 3.5.8

-Build-Depends-Indep: debiandoc-sgml (>= 1.1.48), tetex-bin, tetex-extra, debhelper (>= 4.0)
+Build-Depends-Indep: debiandoc-sgml (>= 1.1.48), tetex-bin, tetex-extra, debhelper (>= 4.1.32)

 
 Package: developers-reference
 Architecture: all
 
 Package: developers-reference
 Architecture: all

diff --git a/debian/tocsubstvars b/debian/tocsubstvars
index 72bdd0bc63ecae95f9473eead48b2a3b61b8363a..ac7fed636dc561924ad49bc3b27e3830ad595b0f 100755 (executable)
--- a/debian/tocsubstvars
+++ b/debian/tocsubstvars
@@ -30,9 +30,6 @@ verbose_print("found " . $#entoc . " entries in TOC");
 
 my $entoc = "   " . join('${Newline}    ', @entoc);
 
 
 my $entoc = "   " . join('${Newline}    ', @entoc);
 

-# note debhelper Bug#178524: single quote not allowed
-$entoc =~ s/\'//g;
-

 foreach my $package (@{$dh{DOPACKAGES}}) {
     addsubstvar($package, "TOC:en", $entoc);
 }
 foreach my $package (@{$dh{DOPACKAGES}}) {
     addsubstvar($package, "TOC:en", $entoc);
 }