tags 714655 + pending tags 728044 + pending thanks Dear maintainer,
I've prepared an NMU for cmucl (versioned as 20c-2.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards. diff -Nru cmucl-20c/debian/changelog cmucl-20c/debian/changelog --- cmucl-20c/debian/changelog 2012-01-23 12:33:24.000000000 +0100 +++ cmucl-20c/debian/changelog 2013-10-29 22:10:17.000000000 +0100 @@ -1,3 +1,18 @@ +cmucl (20c-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Transition from lesstif2 to motif (Closes: #714655) + * Build depend on libxt-dev (was pulled in by lesstif2 until now) + * Add patch to not link against libXp (it is going to be removed + from Debian, see bug #657253) and other unnecessary libraries + (libXext was no build dependency anyways) + * Add patch to prevent endless loop during build (Closes: #728044) + * Prevent building twice by touching build-*-stamp + * Prevent dublicate control entries by calling dh_builddeb only on the + proper target + + -- Paul Gevers <elb...@debian.org> Tue, 29 Oct 2013 22:10:09 +0100 + cmucl (20c-2) unstable; urgency=low * Actually reference the changelog for 20c, not 19d! diff -Nru cmucl-20c/debian/control cmucl-20c/debian/control --- cmucl-20c/debian/control 2012-01-17 14:47:33.000000000 +0100 +++ cmucl-20c/debian/control 2013-10-27 21:54:00.000000000 +0100 @@ -1,6 +1,6 @@ Source: cmucl Section: lisp -Build-Depends: debhelper (>= 7), lesstif2-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, texlive-extra-utils, texlive, texlive-latex-extra, po-debconf Priority: optional Maintainer: Debian Common Lisp Team <pkg-common-lisp-de...@lists.alioth.debian.org> Uploaders: Peter Van Eynde <pvane...@debian.org> @@ -40,8 +40,6 @@ This package contains the lisp interface to motif and the motifd server program that actually does the processing. . - The motifd server is based on lesstif. - . Included in this package is an X based replacement for the tty based debugger and inspector. diff -Nru cmucl-20c/debian/patches/dont-link-unnessary-libs.patch cmucl-20c/debian/patches/dont-link-unnessary-libs.patch --- cmucl-20c/debian/patches/dont-link-unnessary-libs.patch 1970-01-01 01:00:00.000000000 +0100 +++ cmucl-20c/debian/patches/dont-link-unnessary-libs.patch 2013-10-26 13:32:55.000000000 +0200 @@ -0,0 +1,32 @@ +Description: libXp isn't doing anything and going to be removed from Debian + Don't link against Xp as Xprint already has been removed and libXp isn't + doing anything useful anymore. + . + See bug http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657253 + . + Remove other unnecessary dependencies at the same time (build dependency on + libXext-dev was missing from debian/control anyways): + dpkg-shlibdeps: warning: package could avoid a useless dependency if + debian/cmucl-clm/usr/lib/cmucl/motifd was not linked against libICE.so.6 + (it uses none of the library's symbols) + dpkg-shlibdeps: warning: package could avoid a useless dependency if + debian/cmucl-clm/usr/lib/cmucl/motifd was not linked against libSM.so.6 + (it uses none of the library's symbols) + dpkg-shlibdeps: warning: package could avoid a useless dependency if + debian/cmucl-clm/usr/lib/cmucl/motifd was not linked against libdl.so.2 + (it uses none of the library's symbols) + dpkg-shlibdeps: warning: package could avoid a useless dependency if + debian/cmucl-clm/usr/lib/cmucl/motifd was not linked against libXext.so.6 + (it uses none of the library's symbols) +Author: Paul Gevers <elb...@debian.org> + +--- cmucl-20c.orig/src/motif/server/Config.x86 ++++ cmucl-20c/src/motif/server/Config.x86 +@@ -1,6 +1,6 @@ + CFLAGS += -O2 -I/usr/X11R6/include -I. -I$(VPATH) + LDFLAGS += -L/usr/X11R6/lib +-LIBS = -lXm -lXt -lXext -lX11 -lSM -lICE -lXp -ldl -lpthread ++LIBS = -lXm -lXt -lX11 -lpthread + # This def assumes you are building in the same or parallel + # tree to the CVS souce layout. Sites may need to customize + # this path. diff -Nru cmucl-20c/debian/patches/prevent_infinite_loop_during_doc_build.patch cmucl-20c/debian/patches/prevent_infinite_loop_during_doc_build.patch --- cmucl-20c/debian/patches/prevent_infinite_loop_during_doc_build.patch 1970-01-01 01:00:00.000000000 +0100 +++ cmucl-20c/debian/patches/prevent_infinite_loop_during_doc_build.patch 2013-10-27 21:45:32.000000000 +0100 @@ -0,0 +1,24 @@ +Description: with the current tools, building the docs results in endless loop +Author: Paul Gevers <elb...@debian.org> +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=728044 + +--- cmucl-20c.orig/src/docs/cmu-user/Makefile ++++ cmucl-20c/src/docs/cmu-user/Makefile +@@ -53,7 +53,7 @@ all: cmu-user.ps + # been modified. + %.dvi : %.tex $(FILES) + $(LATEX) $< +- @while ( grep Rerun $*.log > /dev/null ); do \ ++ @while ( grep "Rerun to" $*.log > /dev/null ); do \ + $(LATEX) $<; \ + done + if [ "$<" = "cmu-user.tex" ]; then $(MAKE) index; else $(MAKE) index-letter; fi +@@ -62,7 +62,7 @@ all: cmu-user.ps + + %.pdf : %.tex $(FILES) + $(PDFLATEX) $< +- @while ( grep Rerun $*.log > /dev/null ); do \ ++ @while ( grep "Rerun to" $*.log > /dev/null ); do \ + $(PDFLATEX) $<; \ + done + if [ "$<" = "cmu-user.tex" ]; then $(MAKE) index; else $(MAKE) index-letter; fi diff -Nru cmucl-20c/debian/patches/series cmucl-20c/debian/patches/series --- cmucl-20c/debian/patches/series 2012-01-16 14:30:04.000000000 +0100 +++ cmucl-20c/debian/patches/series 2013-10-27 21:45:32.000000000 +0100 @@ -10,3 +10,5 @@ fix-cmu-user-html-output.patch texlive-pdf-output-fixes.patch workaround-for-gcc-4.6-overoptimization +dont-link-unnessary-libs.patch +prevent_infinite_loop_during_doc_build.patch diff -Nru cmucl-20c/debian/rules cmucl-20c/debian/rules --- cmucl-20c/debian/rules 2012-01-23 07:20:37.000000000 +0100 +++ cmucl-20c/debian/rules 2013-10-29 22:08:01.000000000 +0100 @@ -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 @@ -98,7 +100,7 @@ dh_installdeb dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb -i # Build architecture dependant packages using the common target. binary-arch: build-arch install-arch @@ -117,7 +119,7 @@ dh_installdeb dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb -a binary: binary-arch binary-indep .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch #PHONY_CONFIGURE# -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
