[Crosstoolchain-logs] [SCM] GNU GDB documentation Debian packaging repository branch, master, updated. debian/7.3-2-2-ge739899

Hector Oron hector.oron at gmail.com
Sat Feb 25 17:43:59 UTC 2012


The following commit has been merged in the master branch:
commit e73989918a3b6610a4e5972a1866a8fc5b0c77b1
Merge: d27c8317b315374455ca55b603ecd35ffb82015c 9db4e57c979ed2031bd3e80ace1a0be63b382918
Author: Hector Oron <zumbi at debian.org>
Date:   Sat Feb 25 17:33:14 2012 +0100

    Imported Debian patch 7.4-1

diff --combined debian/changelog
index 6336271,0000000..04da4c8
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,114 -1,0 +1,123 @@@
++gdb-doc (7.4-1) unstable; urgency=low
++
++  * New upstream release.
++  * Update Standards-Version to 3.9.3 (no changes required).
++  * Add patch for fixing documentation build.
++  * Autoregenerate gdb/doc/configure on every build.
++
++ -- Hector Oron <zumbi at debian.org>  Sat, 25 Feb 2012 17:33:14 +0100
++
 +gdb-doc (7.3-2) unstable; urgency=low
 +
 +  * Add missing texlive-latex-base build dependency.
 +    - Thanks Jeremy Bicha (Closes: #642962)
 +
 + -- Hector Oron <zumbi at debian.org>  Mon, 26 Sep 2011 09:53:27 +0100
 +
 +gdb-doc (7.3-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Regenerate gdb/doc/configure.
 +  * Add myself to debian/copyright. 
 +  * Enable PDF format. 
 +  * Drop dir.gz from info directory. 
 +  * Add build dependency on texlive-generic-recommended.
 +
 + -- Hector Oron <zumbi at debian.org>  Wed, 14 Sep 2011 00:36:23 +0200
 +
 +gdb-doc (7.2-2) unstable; urgency=low
 +
 +  * New maintainer. (Closes: #631742: ITA: gdb-doc -- The GNU Debugger
 +    Documentation).
 +  * Add lintian override for description starting with article.
 +  * Force build directory removal when calling clean target.
 +
 + -- Hector Oron <zumbi at debian.org>  Thu, 14 Jul 2011 01:39:03 +0100
 +
 +gdb-doc (7.2-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Daniel Jacobowitz <dan at debian.org>  Mon, 06 Sep 2010 18:57:04 -0400
 +
 +gdb-doc (7.1-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Update Standards-Version to 3.8.4 (no changes required).
 +  * Switch to 3.0 (quilt) source package format.
 +
 + -- Daniel Jacobowitz <dan at debian.org>  Fri, 19 Mar 2010 16:25:16 -0400
 +
 +gdb-doc (7.0-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Daniel Jacobowitz <dan at debian.org>  Tue, 13 Oct 2009 18:21:46 -0400
 +
 +gdb-doc (6.8.50.20090628-1) unstable; urgency=low
 +
 +  * New upstream snapshot.
 +  * Include HTML manuals.
 +  * Update Standards-Version to 3.8.2 (no changes required).
 +  * Added doc-base support.
 +  * Remove the accidentally packaged annotations manual.
 +
 + -- Daniel Jacobowitz <dan at debian.org>  Sun, 05 Jul 2009 19:08:27 -0400
 +
 +gdb-doc (6.8-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Trim changelog from the gdb package.
 +  * Clean up quilt build dependency.
 +  * Update Standards-Version to 3.7.3 (no changes required).
 +
 + -- Daniel Jacobowitz <dan at debian.org>  Thu, 27 Mar 2008 18:13:18 -0400
 +
 +gdb-doc (6.7.1-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Daniel Jacobowitz <dan at debian.org>  Mon, 03 Dec 2007 10:16:12 -0500
 +
 +gdb-doc (6.6.90.20070912-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Update copyright notice.
 +
 + -- Daniel Jacobowitz <dan at debian.org>  Mon, 17 Sep 2007 15:46:47 -0400
 +
 +gdb-doc (6.6-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Change priority to optional.
 +
 + -- Daniel Jacobowitz <dan at debian.org>  Sat, 27 Jan 2007 22:00:26 -0500
 +
 +gdb-doc (6.5-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Update Standards-Version to 3.7.2 (no changes required).
 +
 + -- Daniel Jacobowitz <dan at debian.org>  Fri,  3 Nov 2006 00:48:36 -0500
 +
 +gdb-doc (6.4.90-1) unstable; urgency=low
 +
 +  * New upstream release (GDB 6.5 prerelease).
 +
 + -- Daniel Jacobowitz <dan at debian.org>  Tue,  6 Jun 2006 09:01:23 -0400
 +
 +gdb-doc (6.4.50.20060511-2) unstable; urgency=low
 +
 +  * Correct a typo in debian/gdb-doc.info which caused install-info
 +    to be skipped.
 +
 + -- Daniel Jacobowitz <dan at debian.org>  Fri, 12 May 2006 09:03:07 -0400
 +
 +gdb-doc (6.4.50.20060511-1) unstable; urgency=low
 +
 +  * New package, containing only the GDB manuals, based on the previous
 +    GDB packaging.
 +  * Update debian/copyright for the current version of the FDL and the new
 +    FSF address.
 +
 + -- Daniel Jacobowitz <dan at debian.org>  Thu, 11 May 2006 15:17:33 -0400
diff --combined debian/control
index 3f8b870,0000000..efde391
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,21 -1,0 +1,21 @@@
 +Source: gdb-doc
 +Maintainer: Hector Oron <zumbi at debian.org>
 +Section: non-free/devel
 +Priority: optional
- Standards-Version: 3.9.2
++Standards-Version: 3.9.3
 +Build-Depends: cdbs (>= 0.4.17), debhelper (>= 7)
 +Build-Depends-Indep: autoconf, texinfo (>= 4.7-2.2), texlive-generic-recommended, texlive-latex-base
 +
 +Package: gdb-doc
 +Architecture: all
 +Section: non-free/doc
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Replaces: gdb (<< 6.4.50.20060511-1), insight (<< 6.1+cvs.2004.04.07-1)
 +Description: The GNU Debugger Documentation
 + GDB is a source-level debugger, capable of breaking programs at
 + any specific line, displaying variable values, and determining
 + where errors occurred. Currently, it works for C, C++, Fortran,
 + Modula 2 and Java programs. A must-have for any serious
 + programmer.
 + .
 + This package contains the GDB and GDB Internals manuals.
diff --combined debian/patches/fix-doc-build-configure-makefile.patch
index 0000000,0000000..caa2dcc
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-doc-build-configure-makefile.patch
@@@ -1,0 -1,0 +1,59 @@@
++Description: Fixes documentation build
++ gdb-doc (7.4-1) unstable; urgency=low
++ .
++   * New upstream release.
++   * Update Standards-Version to 3.9.3 (no changes required).
++Author: Hector Oron <zumbi at debian.org>
++
++---
++The information above should follow the Patch Tagging Guidelines, please
++checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
++are templates for supplementary fields that you might want to add:
++
++Origin: <vendor|upstream|other>, <url of original patch>
++Bug: <url in upstream bugtracker>
++Bug-Debian: http://bugs.debian.org/<bugnumber>
++Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
++Forwarded: <no|not-needed|url proving that it has been forwarded>
++Reviewed-By: <name and email of someone who approved the patch>
++Last-Update: <YYYY-MM-DD>
++
++--- /dev/null
+++++ gdb-doc-7.4/gdb/doc/configure.ac
++@@ -0,0 +1,12 @@
+++AC_PREREQ(2.64)
+++AC_INIT(refcard.tex)
+++sinclude(../../config/acx.m4)
+++AC_PROG_INSTALL
+++AC_PROG_LN_S
+++
+++READLINE_TEXI_INCFLAG='-I $(READLINE_DIR)'
+++AC_SUBST(READLINE_TEXI_INCFLAG)
+++
+++ACX_PKGVERSION([GDB])
+++ACX_BUGURL([http://www.gnu.org/software/gdb/bugs/])
+++AC_OUTPUT(Makefile)
++--- gdb-doc-7.4.orig/gdb/doc/Makefile.in
+++++ gdb-doc-7.4/gdb/doc/Makefile.in
++@@ -45,9 +45,9 @@ gdbdir = $(srcdir)/..
++ TEXIDIR=${gdbdir}/../texinfo
++ 
++ # where to find makeinfo, preferably one designed for texinfo-2
++-MAKEINFO = @MAKEINFO@
++-MAKEINFOFLAGS = @MAKEINFOFLAGS@
++-MAKEINFO_EXTRA_FLAGS = @MAKEINFO_EXTRA_FLAGS@
+++MAKEINFO = makeinfo
+++MAKEINFOFLAGS = 
+++MAKEINFO_EXTRA_FLAGS = 
++ MAKEINFO_CMD = $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFO_EXTRA_FLAGS)
++ 
++ MAKEHTML = $(MAKEINFO_CMD) --html
++@@ -526,7 +526,7 @@ annotate/index.html: $(ANNOTATE_DOC_FILE
++ 
++ force:
++ 
++-Makefile: Makefile.in $(host_makefile_frag) ../config.status
+++Makefile: Makefile.in $(host_makefile_frag) ./config.status
++ 	cd .. && $(SHELL) ./config.status doc/Makefile
++ 
++ 
diff --combined debian/patches/series
index f8a7065,0000000..184077d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +34.info-section.patch 
++fix-doc-build-configure-makefile.patch
diff --combined debian/rules
index a4556c8,0000000..d6d1c5b
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,53 -1,0 +1,54 @@@
 +#!/usr/bin/make -f
 +
 +DEB_BUILDDIR = objdir
 +
 +# This implements the .deb package creation using debhelper.
 +include /usr/share/cdbs/1/rules/debhelper.mk
 +
 +# This implements building using a configure script and Makefile.
 +include /usr/share/cdbs/1/class/autotools.mk
 +
 +# Override to only configure documentation.
 +DEB_CONFIGURE_SCRIPT = $(CURDIR)/gdb/doc/configure
 +DEB_CONFIGURE_EXTRA_FLAGS = --srcdir="../gdb/doc"
 +
 +# Rather paranoid than sorry. Make the shell exit with an error if an
 +# untested command fails.
 +SHELL += -e
 +
 +INSTALL = /usr/bin/install -p
 +export INSTALL
 +
 +DEB_MAKE_BUILD_TARGET = all info html pdf
 +
 +build/gdb-doc:: $(DEB_BUILDDIR)/html $(DEB_BUILDDIR)/pdf
 +
 +$(DEB_BUILDDIR)/pdf:
 +	mkdir $(DEB_BUILDDIR)/pdf
 +	mv $(DEB_BUILDDIR)/*.pdf $(DEB_BUILDDIR)/pdf/
 +
 +$(DEB_BUILDDIR)/html:
 +	mkdir $(DEB_BUILDDIR)/html
 +	mv $(DEB_BUILDDIR)/gdb $(DEB_BUILDDIR)/html/
 +	mv $(DEB_BUILDDIR)/gdbint $(DEB_BUILDDIR)/html/
 +	mv $(DEB_BUILDDIR)/stabs $(DEB_BUILDDIR)/html/
 +
 +common-binary-post-install-indep::
 +	rm -f debian/gdb-doc/usr/share/info/annota*
 +	rm -f debian/gdb-doc/usr/share/info/dir*
 +	install -d debian/gdb-doc/usr/share/doc/gdb
 +	ln -s ../gdb-doc/html debian/gdb-doc/usr/share/doc/gdb/html
 +	ln -s ../gdb-doc/pdf debian/gdb-doc/usr/share/doc/gdb/pdf
 +
 +post-patches::
 +	if ! test -f gdb/version.in.backup; then \
 +	  mv -f gdb/version.in gdb/version.in.backup; \
 +	  sed -e 's/$$/-debian/' < gdb/version.in.backup > gdb/version.in; \
 +	fi
++	cd gdb/doc && autoreconf
 +
 +clean::
- 	rm -rf $(DEB_BUILDDIR)
++	rm -rf $(DEB_BUILDDIR) gdb/doc/configure
 +	if test -f gdb/version.in.backup; then \
 +	  mv -f gdb/version.in.backup gdb/version.in; \
 +	fi

-- 
GNU GDB documentation Debian packaging repository



More information about the Crosstoolchain-logs mailing list