[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Freeze exception for pyxplot



On 08/12/2010 06:41 PM, Stuart Prescott wrote:
> 
> I delayed making this request until the buildd logs could show me 
> that #591538 was truly fixed on all archs not just the ones I could 
> test it on myself. Now that the autobuilding has completed, could
> you please unblock pyxplot for me?
> 

The "doc" target in your debian/rules file is executed no matter which
packages dh will act on. On buildds, arch:all packages are not uploaded
since dpkg-genchanges is called with "-B" flag. In your case, it "might"
allow it to build¹ on ia64 (and will save resources on buildd machines).
Could you please generate the documentation only when needed?

A solution might be the attached patch (not tested). Note that some build
dependencies may be moved to "Build-Depends-Indep" if they are used only
to generate the documentation. "imagemagick", "libmagickcore-extra" and
"ghostscript" seem like good candidates but I didn't really check.

¹: It's just a guess… not that I've actually tested it.

Regards,

-- 
Mehdi Dogguy مهدي الدڤي
http://dogguy.org/
diff -Nru pyxplot-0.8.1/debian/changelog pyxplot-0.8.1/debian/changelog
--- pyxplot-0.8.1/debian/changelog	2010-07-22 00:51:24.000000000 +0200
+++ pyxplot-0.8.1/debian/changelog	2010-08-14 07:30:28.000000000 +0200
@@ -1,3 +1,10 @@
+pyxplot (0.8.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Don't unconditionally build documentation
+
+ -- Mehdi Dogguy <mehdi@debian.org>  Sat, 14 Aug 2010 07:17:37 +0200
+
 pyxplot (0.8.1-2) unstable; urgency=low
 
   * Fix configure script to correctly handle the case where ghostview is not
diff -Nru pyxplot-0.8.1/debian/patches/debian-changes-0.8.1-2.1 pyxplot-0.8.1/debian/patches/debian-changes-0.8.1-2.1
--- pyxplot-0.8.1/debian/patches/debian-changes-0.8.1-2.1	1970-01-01 01:00:00.000000000 +0100
+++ pyxplot-0.8.1/debian/patches/debian-changes-0.8.1-2.1	2010-08-14 07:36:21.000000000 +0200
@@ -0,0 +1,49 @@
+--- pyxplot-0.8.1.orig/Makefile.skel
++++ pyxplot-0.8.1/Makefile.skel
+@@ -185,16 +185,18 @@ pyxplot_watch.1: manpage_pyxplot_watch.p
+ #
+ 
+ install: all
+-	install -d ${SRCDIR} ${BINDIR} ${BINDIR_PRIVATE} ${DOCDIR} ${MANDIR}
++	install -d ${SRCDIR} ${BINDIR} ${BINDIR_PRIVATE} ${MANDIR}
+ 	install -m644 ${LOCAL_SRCDIR}/ppl_help.xml               ${SRCDIR}
+ 	install -m755 ${LOCAL_BINDIR}/install/pyxplot            ${BINDIR}/pyxplot
+ 	install -m755 ${LOCAL_BINDIR}/install/pyxplot_watch      ${BINDIR}/pyxplot_watch
+ 	install -m755 ${LOCAL_BINDIR}/install/pyxplot_fitshelper ${BINDIR_PRIVATE}/pyxplot_fitshelper
+ 	install -m755 ${LOCAL_BINDIR}/install/pyxplot_timehelper ${BINDIR_PRIVATE}/pyxplot_timehelper
+-	install -m644 doc/*.tex doc/pyxplot.pdf  ${DOCDIR}
+ 	install -m644 pyxplot.1                  ${MANDIR}/pyxplot.1
+ 	install -m644 pyxplot_watch.1            ${MANDIR}/pyxplot_watch.1
+ 
++install-doc:
++	install -d ${DOCDIR}
++	install -m644 doc/*.tex doc/pyxplot.pdf  ${DOCDIR}
+ 
+ #
+ # Clean macros
diff -Nru pyxplot-0.8.1/debian/patches/series pyxplot-0.8.1/debian/patches/series
--- pyxplot-0.8.1/debian/patches/series	2010-07-20 13:33:51.000000000 +0200
+++ pyxplot-0.8.1/debian/patches/series	2010-08-14 07:29:02.000000000 +0200
@@ -1 +1,2 @@
 gv-not-found.patch
+debian-changes-0.8.1-2.1
diff -Nru pyxplot-0.8.1/debian/rules pyxplot-0.8.1/debian/rules
--- pyxplot-0.8.1/debian/rules	2010-07-22 01:25:18.000000000 +0200
+++ pyxplot-0.8.1/debian/rules	2010-08-14 07:28:56.000000000 +0200
@@ -34,10 +34,16 @@
 
 override_dh_auto_build:
 	sed -i 's,^GV_COMMAND=/bin/false,GV_COMMAND=/usr/bin/gv\nGV_OPT=--,' Makefile
-	make USRDIR=/usr
+	$(MAKE) USRDIR=/usr
+ifneq (,$(findstring pyxplot-doc,$(shell dh_listpackages)))
+	$(MAKE) -f debian/rules doc
+endif
 
-override_dh_auto_install: doc
-	make install USRDIR=/usr DESTDIR=$(CURDIR)/debian/tmp
+override_dh_auto_install:
+	$(MAKE) install USRDIR=/usr DESTDIR=$(CURDIR)/debian/tmp
+ifneq (,$(findstring pyxplot-doc,$(shell dh_listpackages)))
+	$(MAKE) install-doc USRDIR=/usr DESTDIR=$(CURDIR)/debian/tmp
+endif
 	sh debian/mkicons $(CURDIR)/debian/pyxplot
 
 override_dh_installdocs:

Reply to: