New documentation structure and format

6 files changed, 34 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index aaf1ad9..27ba5e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 scons-doc (2.3.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * debian/patches/user_guide.patch:
+    - Build User Guide only.
   * debian/control:
     - Build-depends on python-libxml2, python-libxslt1, and fop.
     - Bump Standards-Version to 3.9.5, no changes required.
+  * debian/docs:
+    - PS files are no longer generated.
+  * debian/doc-base:
+    - Refresh doc-base with new file locations.
   * debian/rules:
     - Remove .pyc files on clean.
 
diff --git a/debian/doc-base b/debian/doc-base
index 61ef119..3dcb6db 100644
--- a/debian/doc-base
+++ b/debian/doc-base
@@ -6,6 +6,5 @@ Abstract: This manual describes what SCons is
 Section: Help/Books
 
 Format: HTML
-Index: /usr/share/doc/scons-doc/HTML/scons-user/index.html
-Files: //usr/share/doc/scons-doc/HTML/scons-user/*.html
-
+Index: /usr/share/doc/scons-doc/HTML/scons-user.html
+Files: /usr/share/doc/scons-doc/HTML/scons-user.html
diff --git a/debian/docs b/debian/docs
index 819ff47..748755d 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,2 @@
 build/doc/HTML
 build/doc/PDF
-build/doc/PS
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8914f1d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+user_guide.patch
diff --git a/debian/patches/user_guide.patch b/debian/patches/user_guide.patch
new file mode 100644
index 0000000..f2e143f
--- /dev/null
+++ b/debian/patches/user_guide.patch
@@ -0,0 +1,24 @@
+Description: Build User Guide only
+Author: Luca Falavigna <dktrkranz@debian.org>
+Forwarded: not-needed
+
+Index: scons-doc/doc/SConscript
+===================================================================
+--- scons-doc.orig/doc/SConscript	2014-04-27 11:39:43.567063643 +0200
++++ scons-doc/doc/SConscript	2014-04-27 11:39:59.097875647 +0200
+@@ -195,12 +195,12 @@
+     # of the outputs get installed to the build folder and added to
+     # the different source and binary packages in the end.
+     #
+-    docs = {'design' : ['chtml','pdf'],
++    docs = {#'design' : ['chtml','pdf'],
+             #'python10' : ['chtml','html','pdf'],
+-            'reference' : ['chtml','html','pdf'],
++            #'reference' : ['chtml','html','pdf'],
+             #'developer' : ['chtml','html','pdf'],
+             'user' : ['chtml','html','pdf','epub'],
+-            'man' : ['man','epub']
++            #'man' : ['man','epub']
+            }
+     # The names of the target files for the MAN pages
+     man_page_list = ['scons.1','scons-time.1','sconsign.1']
diff --git a/debian/rules b/debian/rules
index 65a2477..1f18a5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,7 @@ override_dh_auto_clean:
 
 override_dh_auto_install:
 	scons doc
-	rm -rf $(CURDIR)/build/doc/HTML/scons-reference*
-	find $(CURDIR)/build/doc -name "*scons-reference*" -delete
-	find $(CURDIR)/build/doc -name "*-man*" -delete
+	rm -fr $(CURDIR)/build/doc/HTML/scons-user
 
 get-orig-source:
 	wget http://downloads.sourceforge.net/project/scons/scons-src/${VERSION}/scons-src-${VERSION}.tar.gz -O ../scons-src-${VERSION}.tar.gz