Package: scons
Version: 0.96.91-1
Severity: normal
Tags: experimental patch

I noticed that scons installs the manual pages twice, once using
dh_manpages and once from setup.py (into the wrong location). The
attached patch fixes this and several other problems reported by lintian
and linda. You should apply it like so to remove the empty .manpages:

patch -E -p1 < scons-linda-lintian-fixups.patch

-- System Information:
Debian Release: unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.14-1-k7
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)

Versions of packages scons depends on:
ii  python                        2.3.5-3    An interactive high-level object-o

-- 
bye,
pabs

http://wiki.debian.org/PaulWise
diff -u scons-0.96.91/debian/changelog scons-0.96.91/debian/changelog
--- scons-0.96.91/debian/changelog
+++ scons-0.96.91/debian/changelog
@@ -1,3 +1,15 @@
+scons (0.96.91-2) experimental; urgency=low
+
+  * Only install manual pages in /usr/share/man (not /usr/man)
+  * Update Standards-Version (no changes)
+  * Ship RELEASE.txt (equivalent of NEWS for scons)
+  * Add symlinks for the manual pages of the versioned scripts
+  * Use --symlink-scons to reduce space in the package
+  * Use $(CURDIR) instead of `pwd` to save a fork()
+  * Use --standard-lib to install scons stuff into standard python dirs
+
+ -- Mark Brown <[EMAIL PROTECTED]>  Thu, 10 Nov 2005 13:48:09 +0800
+
 scons (0.96.91-1) experimental; urgency=low
 
   * New upstream release.
diff -u scons-0.96.91/debian/control scons-0.96.91/debian/control
--- scons-0.96.91/debian/control
+++ scons-0.96.91/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Mark Brown <[EMAIL PROTECTED]>
 Build-Depends-Indep: debhelper (>= 4.1.25), python-dev
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2
 
 Package: scons
 Architecture: all
diff -u scons-0.96.91/debian/rules scons-0.96.91/debian/rules
--- scons-0.96.91/debian/rules
+++ scons-0.96.91/debian/rules
@@ -33,7 +33,7 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/scons.
-	python setup.py install --root=`pwd`/debian/scons --no-compile
+	python setup.py install --root=$(CURDIR)/debian/scons --no-compile --symlink-scons --standard-lib
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -41,7 +41,6 @@
 	dh_testroot
 	dh_installdocs
 	dh_python
-	dh_installman
 	dh_installchangelogs CHANGES.txt
 	dh_link
 	dh_strip
diff -u scons-0.96.91/debian/scons.docs scons-0.96.91/debian/scons.docs
--- scons-0.96.91/debian/scons.docs
+++ scons-0.96.91/debian/scons.docs
@@ -1,0 +2 @@
+RELEASE.txt
reverted:
--- scons-0.96.91/debian/scons.manpages
+++ scons-0.96.91.orig/debian/scons.manpages
@@ -1,2 +0,0 @@
-scons.1
-sconsign.1
only in patch2:
unchanged:
--- scons-0.96.91.orig/scons.1
+++ scons-0.96.91/scons.1
@@ -582,7 +582,7 @@
 This provides more accurate counts of the
 underlying function calls in the 
 Python profiler output when using the
-.R --profile=
+.RI --profile=
 option.
 (When the Memoizer is used,
 the profiler counts all
only in patch2:
unchanged:
--- scons-0.96.91.orig/debian/scons.links
+++ scons-0.96.91/debian/scons.links
@@ -0,0 +1,2 @@
+usr/share/man/man1/scons.1 usr/share/man/man1/scons-0.96.91.1
+usr/share/man/man1/sconsign.1 usr/share/man/man1/sconsign-0.96.91.1
only in patch2:
unchanged:
--- scons-0.96.91.orig/setup.py
+++ scons-0.96.91/setup.py
@@ -330,7 +330,7 @@
             if is_win32:
                 dir = 'Doc'
             else:
-                dir = os.path.join('man', 'man1')
+                dir = os.path.join('share', 'man', 'man1')
             self.data_files = [(dir, ["scons.1", "sconsign.1"])]
             man_dir = os.path.join(self.install_dir, dir)
             msg = "Installed SCons man pages into %s" % man_dir

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to