Bug#778757: Close

Vincent Lefevre vincent at vinc17.net
Thu Jun 25 11:05:54 UTC 2015 

On 2015-06-18 11:29:58 +0200, Vincent Lefevre wrote:
> On 2015-06-18 09:31:09 +0200, Anton Gladky wrote:
> > Well, I tried to install emacs, but the error was still there.
> 
> Thanks for the information. I'll try with pbuilder, and see the
> difference with debuild (which I'm currently using and for which
> I do not get any error).

Indeed, pbuilder showed a missing build dependency, so that I had to
add emacs24. With this dependency, there isn't an error any longer.
However my patch mixed upstream/debian changes and could yield an
error in some cases (this is fine to apply local changes and rebuild
the package with debuild, but not for quilt, which I had to use to
refresh the patch in order to regenerate the dsc file for pbuilder).

I followed some suggestions on:
  https://raphaelhertzog.com/2011/07/04/how-to-prepare-patches-for-debian-packages/

I've attached the debdiff output on the dsc files.

-- 
Vincent Lefèvre <vincent at vinc17.net> - Web: <https://www.vinc17.net/>
100% accessible validated (X)HTML - Blog: <https://www.vinc17.net/blog/>
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)
-------------- next part --------------
diff -Nru gnuplot5-5.0.1+dfsg1/debian/changelog gnuplot5-5.0.1+dfsg1/debian/changelog
--- gnuplot5-5.0.1+dfsg1/debian/changelog	2015-06-17 17:54:52.000000000 +0200
+++ gnuplot5-5.0.1+dfsg1/debian/changelog	2015-06-25 12:19:29.000000000 +0200
@@ -1,3 +1,10 @@
+gnuplot5 (5.0.1+dfsg1-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Provide gnuplot5.info file. (Closes: #778757)
+
+ -- Vincent Lefevre <vincent at vinc17.net>  Thu, 25 Jun 2015 12:17:34 +0200
+
 gnuplot5 (5.0.1+dfsg1-1) unstable; urgency=medium
 
   * [c0fd77e] Imported Upstream version 5.0.1+dfsg
diff -Nru gnuplot5-5.0.1+dfsg1/debian/control gnuplot5-5.0.1+dfsg1/debian/control
--- gnuplot5-5.0.1+dfsg1/debian/control	2015-04-28 20:31:33.000000000 +0200
+++ gnuplot5-5.0.1+dfsg1/debian/control	2015-06-25 12:20:33.000000000 +0200
@@ -31,7 +31,8 @@
                texlive-latex-extra,
                texlive-latex-recommended,
                libwxgtk3.0-dev,
-               zlib1g-dev
+               zlib1g-dev,
+               emacs24
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/gnuplot5.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/gnuplot5.git
diff -Nru gnuplot5-5.0.1+dfsg1/debian/patches/12_info.patch gnuplot5-5.0.1+dfsg1/debian/patches/12_info.patch
--- gnuplot5-5.0.1+dfsg1/debian/patches/12_info.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnuplot5-5.0.1+dfsg1/debian/patches/12_info.patch	2015-06-25 12:20:42.000000000 +0200
@@ -0,0 +1,85 @@
+Index: gnuplot5-5.0.1+dfsg1/docs/Makefile.am
+===================================================================
+--- gnuplot5-5.0.1+dfsg1.orig/docs/Makefile.am
++++ gnuplot5-5.0.1+dfsg1/docs/Makefile.am
+@@ -81,7 +81,7 @@ ELCS = gnuplot-eldoc.elc
+ CLEANFILES = allterm.h gnuplot.tex gnuplot.dvi gnuplot.aux gnuplot.log	\
+ gnuplot.toc gnuplot.ps gpcard.dvi gpcard.log gpcard.ps alldoc2gih	\
+ doc2gih gnuplot.gih doc2hlp gnuplot.hlp gnuplot.idx gnuplot.ilg		\
+-gnuplot.ind gnuplot.info* gnuplot.out doc2ipf gnuplot.ipf doc2ms	\
++gnuplot.ind gnuplot5.info* gnuplot.out doc2ipf gnuplot.ipf doc2ms	\
+ gnuplot.ms doc2rnh gnuplot.rnh doc2rtf gnuplot.rtf gnuplot.nroff	\
+ checkdoc gnuplot.txt gnuplot.tmp VERSION gnuplot.4tc gnuplot.4ct	\
+ gnuplot.idv gnuplot.xref gnuplot.lg figures pdffigures.aux		\
+@@ -301,7 +301,7 @@ wxhelp/doc2html: wxhelp/doc2html.o termd
+ 	$(LINK) $^
+ 
+ ### GNU info format
+-info: gnuplot.info
++info: gnuplot5.info
+ 
+ # Thanks to Bruce Ravel for doc2texi.el!
+ gnuplot.texi gnuplot-eldoc.el: $(srcdir)/doc2texi.el $(srcdir)/gnuplot.doc
+@@ -324,16 +324,16 @@ ${ELCS}: gnuplot-eldoc.el
+ 	   echo "No emacs found - cannot create gnuplot-eldoc.elc file" ; \
+ 	fi
+ 
+-gnuplot.info: gnuplot.texi
+-	$(MAKEINFO) -I$(srcdir) $(srcdir)/gnuplot.texi --no-split --force --output=$@
++gnuplot5.info: gnuplot.texi
++	$(MAKEINFO) -I$(srcdir) gnuplot.texi --no-split --force --output=$@
+ 
+-install-info: gnuplot.info
++install-info: gnuplot5.info
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
+-	$(INSTALL_DATA) gnuplot.info $(DESTDIR)$(infodir)/gnuplot.info
++	$(INSTALL_DATA) gnuplot5.info $(DESTDIR)$(infodir)/gnuplot5.info
+ 	@if (install-info --version && \
+ 	     install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
+-	  echo "install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot.info";\
+-	  install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot.info || :;\
++	  echo "install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot5.info";\
++	  install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot5.info || :;\
+ 	else : ; fi
+ 
+ # this is how to make OS/2 ipfc documentation
+Index: gnuplot5-5.0.1+dfsg1/docs/doc2texi.el
+===================================================================
+--- gnuplot5-5.0.1+dfsg1.orig/docs/doc2texi.el
++++ gnuplot5-5.0.1+dfsg1/docs/doc2texi.el
+@@ -79,7 +79,7 @@
+ ;;
+ ;; Then you can do
+ ;;
+-;;      makeinfo gnuplot.info
++;;      makeinfo gnuplot5.info
+ ;;
+ ;; You may want to use the --no-split option.
+ ;;
+@@ -155,7 +155,7 @@ If PATTERN is omitted, it defaults to \"
+   "\\input texinfo   @c -*-texinfo-*-
+ 
+ @c %**start of header
+- at setfilename gnuplot.info
++ at setfilename gnuplot5.info
+ @settitle Gnuplot: An Interactive Plotting Program
+ @setchapternewpage odd
+ @c %**end of header
+@@ -167,7 +167,7 @@ If PATTERN is omitted, it defaults to \"
+ 
+ @dircategory Math
+ @direntry
+-* GNUPLOT: (gnuplot).             An Interactive Plotting Program
++* GNUPLOT5: (gnuplot5).           An Interactive Plotting Program
+ @end direntry
+ 
+ @ifnottex
+@@ -460,7 +460,7 @@ particular conversion chore."
+     ("sun" "sun")
+     ("vms" "vws"))
+ 
+-  "Additional terminals to add to the converted gnuplot.info file.
++  "Additional terminals to add to the converted gnuplot5.info file.
+ 
+ The CARs of the items are strings to match against
+ `system-configuration', and the CDRs are the elements to add to
diff -Nru gnuplot5-5.0.1+dfsg1/debian/patches/series gnuplot5-5.0.1+dfsg1/debian/patches/series
--- gnuplot5-5.0.1+dfsg1/debian/patches/series	2015-04-28 20:30:03.000000000 +0200
+++ gnuplot5-5.0.1+dfsg1/debian/patches/series	2015-06-25 12:17:06.000000000 +0200
@@ -5,3 +5,4 @@
 09_remove_beos.patch
 10_removepicins.patch
 11_fix_linkage_wx.patch
+12_info.patch
diff -Nru gnuplot5-5.0.1+dfsg1/debian/rules gnuplot5-5.0.1+dfsg1/debian/rules
--- gnuplot5-5.0.1+dfsg1/debian/rules	2015-06-16 22:54:39.000000000 +0200
+++ gnuplot5-5.0.1+dfsg1/debian/rules	2015-06-25 12:20:19.000000000 +0200
@@ -42,7 +42,7 @@
 	dh_auto_build -a -- -C $(BUILDDIR_NOX)/src
 	dh_auto_build -a -- -C $(BUILDDIR_X11) pkglibexecdir='$$(libexecdir)'
 	dh_auto_build -a -- -C $(BUILDDIR_QT) pkglibexecdir='$$(libexecdir)'
-	cd $(BUILDDIR_X11)/docs; $(MAKE) pdf; $(MAKE) ps; $(MAKE) html; ls
+	cd $(BUILDDIR_X11)/docs; $(MAKE) pdf; $(MAKE) ps; $(MAKE) html; $(MAKE) info; ls
 	cd $(BUILDDIR_X11)/tutorial; $(MAKE) pdf; $(MAKE) ps; ls
 
 override_dh_auto_install:
@@ -62,6 +62,9 @@
 	mv $(CURDIR)/debian/tmp/QT/usr/share/man/man1/gnuplot.1 $(CURDIR)/debian/tmp/QT/usr/share/man/man1/gnuplot5-qt.1
 	mv $(CURDIR)/debian/tmp/QT/usr/share/gnuplot5/gnuplot.gih $(CURDIR)/debian/tmp/QT/usr/share/gnuplot5/gnuplot5-qt.gih
 
+override_dh_installinfo:
+	dh_installinfo -pgnuplot5-doc $(BUILDDIR_X11)/docs/gnuplot5.info
+
 override_installchangelogs:
 	dh_installchangelogs -pgnuplot5-doc ChangeLog

More information about the debian-science-maintainers mailing list