Followup-For: Bug #689773
Hi,
I just uploaded a NMU to DELAYED/5 that removes the install-info calls.
Please let me know if I should delay it longer.
A fixed elib package is required to be included in jessie since the
current wheezy package fails to remove after a wheezy->jessie upgrade.
Andreas
diff -u elib-1.0/elib.texi elib-1.0/elib.texi
--- elib-1.0/elib.texi
+++ elib-1.0/elib.texi
@@ -38,9 +38,9 @@
@sp 4
@comment The title is printed in a large font.
@center @titlefont{User's Guide}
-@sp
+@sp 1
@center @titlefont{to}
-@sp
+@sp 1
@center @titlefont{Elib - The Emacs Lisp Library}
@sp 2
@center version 1.0
diff -u elib-1.0/debian/control elib-1.0/debian/control
--- elib-1.0/debian/control
+++ elib-1.0/debian/control
@@ -2,12 +2,13 @@
Section: editors
Priority: extra
Maintainer: Joerg Jaspert <[email protected]>
-Build-Depends-Indep: debhelper (>> 4.0.0), texinfo, texi2html
+Build-Depends: debhelper (>> 4.0.0)
+Build-Depends-Indep: texinfo, texi2html
Standards-Version: 3.5.2
Package: elib
Architecture: all
-Depends: emacs21 | emacsen, make
+Depends: emacs | emacsen, make, ${misc:Depends}
Description: Library of commonly-used Emacs functions
Elib is designed to be for Elisp programs what libg++ is
for C++ programs: a collection of useful routines which don't have to
diff -u elib-1.0/debian/rules elib-1.0/debian/rules
--- elib-1.0/debian/rules
+++ elib-1.0/debian/rules
@@ -4,8 +4,6 @@
#export DH_VERBOSE=1
-export DH_COMPAT=4
-
PACKAGE := elib
pwd=$(shell pwd)
diff -u elib-1.0/debian/changelog elib-1.0/debian/changelog
--- elib-1.0/debian/changelog
+++ elib-1.0/debian/changelog
@@ -1,3 +1,15 @@
+elib (1.0-11.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rebuild with current debhelper. (Closes: #689773, #476252)
+ * elib.texi: s/^@sp$/@sp 1/ (Closes: #712317)
+ * Use unversioned Depends: emacs | emacsen. (Closes: #433985)
+ * Fix doc-base section.
+ * d/copyright: Update FSF address and point to common-licenses/GPL-2.
+ * Fix some debhelper issues.
+
+ -- Andreas Beckmann <[email protected]> Sat, 18 Jan 2014 20:30:59 +0100
+
elib (1.0-11.1) unstable; urgency=low
* Non-maintainer upload.
diff -u elib-1.0/debian/copyright elib-1.0/debian/copyright
--- elib-1.0/debian/copyright
+++ elib-1.0/debian/copyright
@@ -21,11 +21,11 @@
You should have received a copy of the GNU General Public License
along with GNU Elib; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA
+the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+Boston, MA 02110-1301, USA.
On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL file.
+License can be found in /usr/share/common-licenses/GPL-2 file.
diff -u elib-1.0/debian/doc-base elib-1.0/debian/doc-base
--- elib-1.0/debian/doc-base
+++ elib-1.0/debian/doc-base
@@ -5,7 +5,7 @@
elib. Elib is somewhat akin to C++'s libstdc++, only for emacs lisp. Elib will work
with all flavours of emacsen, although xemacs already includes a very small subset as
part of pcl-cvs.
-Section: Apps/Programming
+Section: Programming
Format: HTML
Index: /usr/share/doc/elib/html-info/elib_toc.html
only in patch2:
unchanged:
--- elib-1.0.orig/debian/compat
+++ elib-1.0/debian/compat
@@ -0,0 +1 @@
+4
