Control: -1 tags patch As far as I can tell there are two things that need fixing:
1) all but the first dh_* calls in binary-indep and binary-arch need to be appended with either -i or -a 2) the documentation of cmucl-clm (debian/cmucl-clm.docs) need to be moved to a arch:all package. Especially for item 2 there are multiple ways of doing that. I propose the following: a) let cmucl-clm suggest cmucl-docs b) install the documentation in /usr/share/doc/cmucl-docs/cmucl-clm in the cmucl-docs package c) make symbolic links in /usr/share/doc/cmucl-cml/ to the documentation in cmucl-docs. I tried to implement that in the attached debdiff (build against my other proposed debdiff in bug 714655). To be honest, I am unsure about which packages really can go into Build-Depends-Indep, and as the build is still running (djee, that really takes ages), I haven't actually tested this yet. Paul
diff -Nru cmucl-20c/debian/changelog cmucl-20c/debian/changelog
--- cmucl-20c/debian/changelog 2013-10-26 20:46:26.000000000 +0200
+++ cmucl-20c/debian/changelog 2013-10-26 20:47:08.000000000 +0200
@@ -1,3 +1,11 @@
+cmucl (20c-2.2) UNRELEASED; urgency=low
+
+ * Non-maintainer upload
+ * Move documentation from cmucl-cml to cmucl-docs to allow binNMU's but
+ provide symlinks to the files (Closes: #683398)
+
+ -- Paul Gevers <elb...@debian.org> Sat, 26 Oct 2013 20:41:16 +0200
+
cmucl (20c-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru cmucl-20c/debian/cmucl-clm.docs cmucl-20c/debian/cmucl-clm.docs
--- cmucl-20c/debian/cmucl-clm.docs 2013-10-26 20:46:26.000000000 +0200
+++ cmucl-20c/debian/cmucl-clm.docs 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-src/docs/interface/internals.dvi
-src/docs/interface/internals.ps
-src/docs/interface/toolkit.dvi
-src/docs/interface/toolkit.ps
diff -Nru cmucl-20c/debian/cmucl-clm.links cmucl-20c/debian/cmucl-clm.links
--- cmucl-20c/debian/cmucl-clm.links 1970-01-01 01:00:00.000000000 +0100
+++ cmucl-20c/debian/cmucl-clm.links 2013-10-26 20:47:08.000000000 +0200
@@ -0,0 +1,4 @@
+/usr/share/docs/cmucl-docs/cmucl-clm/internals.dvi
/usr/share/docs/cmucl-clm/internals.dvi
+/usr/share/docs/cmucl-docs/cmucl-clm/internals.ps
/usr/share/docs/cmucl-clm/internals.ps
+/usr/share/docs/cmucl-docs/cmucl-clm/toolkit.dvi
/usr/share/docs/cmucl-clm/toolkit.dvi
+/usr/share/docs/cmucl-docs/cmucl-clm/toolkit.ps
/usr/share/docs/cmucl-clm/toolkit.ps
diff -Nru cmucl-20c/debian/cmucl-docs.install
cmucl-20c/debian/cmucl-docs.install
--- cmucl-20c/debian/cmucl-docs.install 1970-01-01 01:00:00.000000000 +0100
+++ cmucl-20c/debian/cmucl-docs.install 2013-10-26 20:47:08.000000000 +0200
@@ -0,0 +1,4 @@
+src/docs/interface/internals.dvi cmucl-clm
+src/docs/interface/internals.ps cmucl-clm
+src/docs/interface/toolkit.dvi cmucl-clm
+src/docs/interface/toolkit.ps cmucl-clm
diff -Nru cmucl-20c/debian/control cmucl-20c/debian/control
--- cmucl-20c/debian/control 2013-10-26 20:46:26.000000000 +0200
+++ cmucl-20c/debian/control 2013-10-26 20:47:08.000000000 +0200
@@ -1,6 +1,7 @@
Source: cmucl
Section: lisp
-Build-Depends: debhelper (>= 7), libmotif-dev, libxt-dev, cmucl (>= 20c),
hevea, tidy, a2ps, x11proto-core-dev, bc, texlive-extra-utils, texlive,
texlive-latex-extra, po-debconf
+Build-Depends: debhelper (>= 7), libmotif-dev, libxt-dev, cmucl (>= 20c),
hevea, tidy, a2ps, x11proto-core-dev, bc, po-debconf
+Build-Depends-Indep: texlive-extra-utils, texlive, texlive-latex-extra
Priority: optional
Maintainer: Debian Common Lisp Team
<pkg-common-lisp-devel@lists.alioth.debian.org>
Uploaders: Peter Van Eynde <pvane...@debian.org>
@@ -36,6 +37,7 @@
Architecture: i386
Conflicts: cmucl (<< 18e)
Depends: ${shlibs:Depends}, ${misc:Depends}, cmucl (>= 18e) , cmucl-source
+Suggests: cmucl-docs
Description: Motif interface for CMUCL
This package contains the lisp interface to motif and
the motifd server program that actually does the processing.
diff -Nru cmucl-20c/debian/rules cmucl-20c/debian/rules
--- cmucl-20c/debian/rules 2013-10-26 20:46:26.000000000 +0200
+++ cmucl-20c/debian/rules 2013-10-26 20:47:08.000000000 +0200
@@ -36,6 +36,7 @@
# Add here commands to compile the arch part of the package.
$(MAKE) -f debian/Makefile
echo build done
+ touch build-arch-stamp
build-indep: build-indep-stamp
build-indep-stamp: #CONFIGURE_STAMP# #CONFIG_STATUS#
@@ -43,6 +44,7 @@
# Add here commands to compile the indep part of the package.
$(MAKE) -f debian/Makefile doc
echo doc build done
+ touch build-indep-stamp
clean:
dh_testdir
@@ -87,37 +89,37 @@
binary-indep: build-indep install-indep
dh_testdir
dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
+ dh_installchangelogs -i
+ dh_installdocs -i
+ dh_installexamples -i
find debian/cmucl-source -type d -and -name CVS -print0 | xargs -0 rm
-rf
- dh_installdebconf
- dh_installman
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_installdebconf -i
+ dh_installman -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
# Build architecture dependant packages using the common target.
binary-arch: build-arch install-arch
dh_testdir
dh_testroot
- dh_installchangelogs src/general-info/release-20c.txt
- dh_installdocs
- dh_installexamples
- dh_installdebconf
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_shlibdeps
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_installchangelogs -a src/general-info/release-20c.txt
+ dh_installdocs -a
+ dh_installexamples -a
+ dh_installdebconf -a
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_makeshlibs -a
+ dh_shlibdeps -a
+ dh_installdeb -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
binary: binary-arch binary-indep
.PHONY: build clean binary-indep binary-arch binary install install-indep
install-arch #PHONY_CONFIGURE#
signature.asc
Description: OpenPGP digital signature
_______________________________________________ pkg-common-lisp-devel mailing list pkg-common-lisp-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-common-lisp-devel
