--- Begin Message ---
Hello.
Please consider the attached suggestions.
As long as the source package only builds an -indep package, it is far
from trivial, and completely unneeded, to split the targets.
(configure-arch? -indep? both?).
I have the feeling that the call to setup.py may be adapted to stick
to the current debian-python-policy.
Feel free to contact me when/if you need a sponsor for rubber, either
for this version or for 1.3-1 once it is released.
Thanks for your work.
>From 4e2f17eff70c6ffc5e551ad66ca8f80ac60b4bb7 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sat, 1 Aug 2015 13:36:39 +0200
Subject: [PATCH 1/6] * document and refresh patches. Removed:
01_fix_category_of_info_page.diff: revision 432.
04_borken_image_conversion.diff: revision 419. 06_multibib_borken.diff:
revision 413. 07_wrong_arguments.diff: revision 428.
---
debian/changelog | 10 ++++++++++
debian/patches/01_fix_category_of_info_page.diff | 15 ---------------
debian/patches/02_rubber_bibtext_20120807.diff | 8 ++++----
debian/patches/03_rubber_makeindex_20120808.diff | 15 ---------------
debian/patches/03_rubber_makeindex_20150708.diff | 10 ++++++----
debian/patches/04_borken_image_conversion.diff | 13 -------------
debian/patches/05_rubber-push_vars-bug.diff | 14 ++++++++++----
debian/patches/06_multibib_borken.diff | 13 -------------
debian/patches/07_wrong_arguments.diff | 13 -------------
debian/patches/08_lst-depends-wrong-parse.diff | 12 ++++++++----
debian/patches/09_doc_makefile.diff | 10 ++++++----
debian/patches/series | 5 -----
12 files changed, 44 insertions(+), 94 deletions(-)
delete mode 100644 debian/patches/01_fix_category_of_info_page.diff
delete mode 100644 debian/patches/03_rubber_makeindex_20120808.diff
delete mode 100644 debian/patches/04_borken_image_conversion.diff
delete mode 100644 debian/patches/06_multibib_borken.diff
delete mode 100644 debian/patches/07_wrong_arguments.diff
diff --git a/debian/changelog b/debian/changelog
index 527b889..2d07921 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+rubber (1.2-2) UNRELEASED; urgency=medium
+
+ * document and refresh patches. Removed:
+ 01_fix_category_of_info_page.diff: revision 432.
+ 04_borken_image_conversion.diff: revision 419.
+ 06_multibib_borken.diff: revision 413.
+ 07_wrong_arguments.diff: revision 428.
+
+ -- Nicolas Boulenguez <[email protected]> Sat, 01 Aug 2015 12:44:04 +0200
+
rubber (1.2-1) unstable; urgency=medium
I re-animated my upstream!!! rubber 1.2 is there.
diff --git a/debian/patches/01_fix_category_of_info_page.diff b/debian/patches/01_fix_category_of_info_page.diff
deleted file mode 100644
index c3fa2d0..0000000
--- a/debian/patches/01_fix_category_of_info_page.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-This patch fixes the section of the rubber info page (teTeX -> TeX).
-The section teTeX does not exist any more (#424946).
-Index: rubber-1.1+20100306/doc/rubber.texi
-===================================================================
---- rubber-1.1+20100306.orig/doc/rubber.texi 2012-06-25 18:41:10.000000000 +0200
-+++ rubber-1.1+20100306/doc/rubber.texi 2012-08-08 14:13:37.000000000 +0200
-@@ -42,7 +42,7 @@
-
- @c --- Introduction ---
-
--@dircategory teTeX
-+@dircategory TeX
- @direntry
- * Rubber: (rubber). A building system for LaTeX documents.
- @end direntry
diff --git a/debian/patches/02_rubber_bibtext_20120807.diff b/debian/patches/02_rubber_bibtext_20120807.diff
index 7ef0aea..2753757 100644
--- a/debian/patches/02_rubber_bibtext_20120807.diff
+++ b/debian/patches/02_rubber_bibtext_20120807.diff
@@ -1,7 +1,7 @@
-Index: rubber-1.2/src/latex_modules/bibtex.py
-===================================================================
---- rubber-1.2.orig/src/latex_modules/bibtex.py 2015-07-08 09:14:29.000000000 +0200
-+++ rubber-1.2/src/latex_modules/bibtex.py 2015-07-08 09:14:29.000000000 +0200
+Applied-Upstream: obsoleted by next version 1.3.
+
+--- a/src/latex_modules/bibtex.py
++++ b/src/latex_modules/bibtex.py
@@ -410,7 +410,7 @@
def setup (doc, context):
diff --git a/debian/patches/03_rubber_makeindex_20120808.diff b/debian/patches/03_rubber_makeindex_20120808.diff
deleted file mode 100644
index 11df211..0000000
--- a/debian/patches/03_rubber_makeindex_20120808.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- rubber-1.1+20100306.orig/src/latex_modules/index.py 2010-08-12 09:46:10.000000000 -0400
-+++ rubber-1.1+20100306/latex_modules/index.py 2012-08-08 11:38:57.000000000 -0400
-@@ -54,9 +54,9 @@
- (e.g. .ilg) file. Transcript is used by glosstex.py.
- """
- self.doc = doc
-- self.source = doc.target + "." + source
-- self.target = doc.target + "." + target
-- self.transcript = doc.target + "." + transcript
-+ self.source = os.path.basename(doc.target) + "." + source
-+ self.target = os.path.basename(doc.target) + "." + target
-+ self.transcript = os.path.basename(doc.target) + "." + transcript
- if os.path.exists(self.source):
- self.md5 = md5_file(self.source)
- else:
diff --git a/debian/patches/03_rubber_makeindex_20150708.diff b/debian/patches/03_rubber_makeindex_20150708.diff
index 441058d..f4ef967 100644
--- a/debian/patches/03_rubber_makeindex_20150708.diff
+++ b/debian/patches/03_rubber_makeindex_20150708.diff
@@ -1,7 +1,9 @@
-Index: rubber-1.2/src/latex_modules/index.py
-===================================================================
---- rubber-1.2.orig/src/latex_modules/index.py 2015-07-07 23:15:21.000000000 +0200
-+++ rubber-1.2/src/latex_modules/index.py 2015-07-08 09:10:28.000000000 +0200
+Description: Do not call makeindex with absolute paths
+Author: Benjamin Mako Hill
+Applied-Upstream: http://bazaar.launchpad.net/~rubber-devs/rubber/main/revision/468
+
+--- a/src/latex_modules/index.py
++++ b/src/latex_modules/index.py
@@ -55,9 +55,10 @@
(e.g. .ilg) file. Transcript is used by glosstex.py.
"""
diff --git a/debian/patches/04_borken_image_conversion.diff b/debian/patches/04_borken_image_conversion.diff
deleted file mode 100644
index ef83529..0000000
--- a/debian/patches/04_borken_image_conversion.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rubber-1.1+20100306/src/convert.py
-===================================================================
---- rubber-1.1+20100306.orig/src/convert.py 2015-05-18 09:40:30.000000000 +0200
-+++ rubber-1.1+20100306/src/convert.py 2015-05-18 09:40:30.000000000 +0200
-@@ -216,7 +216,7 @@
-
- candidates.sort()
- for cost, source, target, rule in candidates:
-- instance = Variables(context, rule)
-+ instance = Variables(context, dict(rule))
- instance['source'] = source
- instance['target'] = target
- if check is not None and not check(instance):
diff --git a/debian/patches/05_rubber-push_vars-bug.diff b/debian/patches/05_rubber-push_vars-bug.diff
index 0f286e6..5f446db 100644
--- a/debian/patches/05_rubber-push_vars-bug.diff
+++ b/debian/patches/05_rubber-push_vars-bug.diff
@@ -1,7 +1,13 @@
-Index: rubber-1.2/src/converters/latex.py
-===================================================================
---- rubber-1.2.orig/src/converters/latex.py 2015-07-08 09:15:12.000000000 +0200
-+++ rubber-1.2/src/converters/latex.py 2015-07-08 09:15:12.000000000 +0200
+Description: Fix read directive broken by obsolete LaTeXDeppush_vars.
+ Replace calls to LaTeXDep.{push,pop}_vars with the appropriate scheme
+ based onlocally saving self.vars (similar to what was done in revision
+ 391 for, e.g., LaTeXDep.process).
+Author: Lionel Vaux <[email protected]>
+Bug-Debian: https://bugs.debian.org/701898
+Applied-Upstream: http://bazaar.launchpad.net/~rubber-devs/rubber/main/revision/488
+
+--- a/src/converters/latex.py
++++ b/src/converters/latex.py
@@ -568,7 +568,6 @@
"ext": None,
"job": None,
diff --git a/debian/patches/06_multibib_borken.diff b/debian/patches/06_multibib_borken.diff
deleted file mode 100644
index 33cd654..0000000
--- a/debian/patches/06_multibib_borken.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rubber-1.1+20100306/src/latex_modules/multibib.py
-===================================================================
---- rubber-1.1+20100306.orig/src/latex_modules/multibib.py 2010-08-12 15:46:10.000000000 +0200
-+++ rubber-1.1+20100306/src/latex_modules/multibib.py 2014-03-30 22:40:59.000000000 +0200
-@@ -62,7 +62,7 @@
- doc.hook_macro('bibliography' + name, 'a',
- bib.hook_bibliography)
- doc.hook_macro('bibliographystyle' + name, 'a',
-- bib.hook_bibligraphystyle)
-+ bib.hook_bibliographystyle)
- for cmd in defaults:
- bib.command(*cmd)
- if name in commands:
diff --git a/debian/patches/07_wrong_arguments.diff b/debian/patches/07_wrong_arguments.diff
deleted file mode 100644
index 3acbbf2..0000000
--- a/debian/patches/07_wrong_arguments.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rubber-1.1+20100306/src/converters/latex.py
-===================================================================
---- rubber-1.1+20100306.orig/src/converters/latex.py 2015-05-17 23:29:02.000000000 +0200
-+++ rubber-1.1+20100306/src/converters/latex.py 2015-05-17 23:29:02.000000000 +0200
-@@ -580,7 +580,7 @@
- "RequirePackage" : ("oa", self.h_usepackage),
- "documentclass" : ("oa", self.h_documentclass),
- "LoadClass" : ("oa", self.h_documentclass),
-- "LoadClassWithOptions" : ("a", self.h_documentclass),
-+ "LoadClassWithOptions" : ("oa", self.h_documentclass),
- "tableofcontents" : ("", self.h_tableofcontents),
- "listoffigures" : ("", self.h_listoffigures),
- "listoftables" : ("", self.h_listoftables),
diff --git a/debian/patches/08_lst-depends-wrong-parse.diff b/debian/patches/08_lst-depends-wrong-parse.diff
index 2cdcf0b..d5bb51b 100644
--- a/debian/patches/08_lst-depends-wrong-parse.diff
+++ b/debian/patches/08_lst-depends-wrong-parse.diff
@@ -1,7 +1,11 @@
-Index: rubber-1.1+20100306/src/latex_modules/listings.py
-===================================================================
---- rubber-1.1+20100306.orig/src/latex_modules/listings.py 2010-08-12 15:46:10.000000000 +0200
-+++ rubber-1.1+20100306/src/latex_modules/listings.py 2015-05-17 23:34:47.000000000 +0200
+Description: fix TeX parser: handle \macro(spaces and
+ comments)[optional](spaces and comments){argument}
+ This solves the issue for all packages, not only listings.py.
+Author: Sebastian Kapfer
+Applied-Upstream: http://bazaar.launchpad.net/~rubber-devs/rubber/main/revision/465
+
+--- a/src/latex_modules/listings.py
++++ b/src/latex_modules/listings.py
@@ -13,6 +13,8 @@
lambda loc: doc.h_begin_verbatim(loc, env='lstlisting'))
diff --git a/debian/patches/09_doc_makefile.diff b/debian/patches/09_doc_makefile.diff
index dfc37ce..c016e96 100644
--- a/debian/patches/09_doc_makefile.diff
+++ b/debian/patches/09_doc_makefile.diff
@@ -1,7 +1,9 @@
-Index: rubber-1.2/doc/Makefile
-===================================================================
---- rubber-1.2.orig/doc/Makefile 2015-06-25 00:39:51.000000000 +0200
-+++ rubber-1.2/doc/Makefile 2015-07-08 09:27:52.000000000 +0200
+Description: clean doc/rubber.texi, now generated by configure.
+Origin: vendor, Debian
+Forwarded: yes
+
+--- a/doc/Makefile
++++ b/doc/Makefile
@@ -16,4 +16,4 @@
distclean clean:
rm -f rubber.aux rubber.cp rubber.dvi rubber.fn rubber.fns \
diff --git a/debian/patches/series b/debian/patches/series
index 17b7484..63cd3e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,5 @@
-#01_fix_category_of_info_page.diff
02_rubber_bibtext_20120807.diff
-#03_rubber_makeindex_20120808.diff
03_rubber_makeindex_20150708.diff
-#04_borken_image_conversion.diff
05_rubber-push_vars-bug.diff
-#06_multibib_borken.diff
-#07_wrong_arguments.diff
08_lst-depends-wrong-parse.diff
09_doc_makefile.diff
--
2.4.6
>From b5c32e8a6987ae19ce201289022e3cca3317962a Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sat, 1 Aug 2015 13:37:51 +0200
Subject: [PATCH 2/6] * document and refresh new modules. Removed: xelatex:
revision 420 pythontex: revision 438
---
debian/changelog | 3 +
debian/new_modules/biblatex.py_orig | 100 ---------------------------------
debian/new_modules/pythontex.py | 49 ----------------
debian/new_modules/xelatex.py | 13 -----
debian/new_modules/xelatex_20100430.py | 19 -------
debian/rules | 17 +++++-
6 files changed, 17 insertions(+), 184 deletions(-)
delete mode 100644 debian/new_modules/biblatex.py_orig
delete mode 100644 debian/new_modules/pythontex.py
delete mode 100644 debian/new_modules/xelatex.py
delete mode 100644 debian/new_modules/xelatex_20100430.py
diff --git a/debian/changelog b/debian/changelog
index 2d07921..d714841 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ rubber (1.2-2) UNRELEASED; urgency=medium
04_borken_image_conversion.diff: revision 419.
06_multibib_borken.diff: revision 413.
07_wrong_arguments.diff: revision 428.
+ * document and refresh new modules. Removed:
+ xelatex: revision 420
+ pythontex: revision 438
-- Nicolas Boulenguez <[email protected]> Sat, 01 Aug 2015 12:44:04 +0200
diff --git a/debian/new_modules/biblatex.py_orig b/debian/new_modules/biblatex.py_orig
deleted file mode 100644
index ceed819..0000000
--- a/debian/new_modules/biblatex.py_orig
+++ /dev/null
@@ -1,100 +0,0 @@
-# This file is part of Rubber and thus covered by the GPL
-# (c) Sebastian Reichel, 2014
-"""
-basic BibLaTeX support for Rubber
-"""
-
-from os.path import exists, getmtime
-from rubber.util import parse_keyval, md5_file
-from rubber import _, msg
-from string import split
-
-def setup (document, context):
- global doc
- doc = document
-
- opt = context['opt'] or None
- options = parse_keyval(opt) if opt != None else {}
-
- if "backend" in options and options["backend"] != "biber":
- msg.warn(_("rubber's biblatex plugin only supports the biber backend"))
-
- doc.hook_macro('addbibresource', 'oa', hook_bibresource)
- doc.hook_macro('addglobalbib', 'oa', hook_bibresource)
- doc.hook_macro('addsectionbib', 'oa', hook_bibresource)
- doc.hook_macro('bibliography', 'a', hook_bibliography)
-
- get_initial_hashes()
-
-def get_initial_hashes ():
- global bcfhash
- global bblhash
-
- bcfhash = None
-
- bbl = doc.target + "." + "bbl"
- if exists(bbl):
- bblhash = md5_file(bbl)
- else:
- bblhash = None
-
-def hook_bibresource (loc, opt, file):
- options = parse_keyval(opt) if opt != None else {}
-
- # If the file name looks like it contains a control sequence
- # or a macro argument, forget about this resource.
- if file.find('\\') > 0 or file.find('#') > 0:
- return
-
- # skip remote resources
- if 'location' in options and options['location'] == 'remote':
- return
-
- doc.add_source(file)
-
-def hook_bibliography (loc, files):
- for bib in split(files, ","):
- hook_bibresource(loc, None, bib.strip()+".bib")
-
-def biber_needed():
- bcf = doc.target + "." + "bcf"
- bbl = doc.target + "." + "bbl"
- if not exists(bcf):
- msg.info(_("bcf file has not been generated by biblatex!"))
- return False
- if not exists(bbl):
- return True
- if getmtime(bbl) > getmtime(bcf):
- return False
- if bcfhash == md5_file(bcf):
- return False
- return True
-
-def run_biber():
- global bcfhash
- global bblhash
- bcf = doc.target + "." + "bcf"
- bbl = doc.target + "." + "bbl"
- msg.progress(_("running biber on %s") % msg.simplify(bcf));
- if doc.env.execute(["biber", bcf]):
- msg.info(_("There were errors making the bibliography."))
- return False
- bcfhash = md5_file(bcf)
- newbblhash = md5_file(bbl)
- if bblhash != newbblhash:
- bblhash = newbblhash
- doc.must_compile = 1
- else:
- msg.info(_("bbl file styed the same, no recompilation needed."))
- return True
-
-def post_compile ():
- if not biber_needed():
- return True
- return run_biber()
-
-def clean ():
- # generated by the biblatex module
- doc.remove_suffixes([".run.xml", ".bcf"])
- # generated by biber
- doc.remove_suffixes([".bbl", ".blg"])
diff --git a/debian/new_modules/pythontex.py b/debian/new_modules/pythontex.py
deleted file mode 100644
index f0088a0..0000000
--- a/debian/new_modules/pythontex.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# This file is part of Rubber and thus covered by the GPL
-# (c) Ferdinand Schwenk, 2013
-"""
-pythontex support for Rubber
-"""
-
-from rubber import _, msg
-
-import os.path
-import shutil
-import subprocess
-
-
-class PythonTeX (object):
- def __init__ (self, doc, context):
- self.doc = doc
-
- def pre_compile (self):
- if not os.path.exists(self.doc.target + '.pytxcode'):
- msg.info(_("Need compilation!!!!"), pkg="pythontex")
- self.force_compilation()
- msg.info(_("running pythontex..."), pkg="pythontex")
- self.run_pythontex()
- self.doc.watch_file(self.doc.target + ".pytxcode")
- return True
-
- def clean (self):
- self.doc.remove_suffixes([".pytxcode"])
- pythontex_files = 'pythontex-files-' + os.path.basename(self.doc.target)
- if os.path.exists(pythontex_files):
- msg.log(_("removing tree %s") % pythontex_files)
- shutil.rmtree(pythontex_files)
-
- def run_pythontex(self):
- call = ['pythontex', self.doc.target + '.tex', ]
- msg.debug(_("pythontex call is '%s'") % ' '.join(call), pkg="pythontex")
- subprocess.call(call)
-
- def force_compilation(self):
- self.doc.compile()
-
-def setup (doc, context):
- global pytex
- pytex = PythonTeX(doc, context)
-def pre_compile ():
- return pytex.pre_compile()
-def clean ():
- pytex.clean()
-
diff --git a/debian/new_modules/xelatex.py b/debian/new_modules/xelatex.py
deleted file mode 100644
index 9b9ca15..0000000
--- a/debian/new_modules/xelatex.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from rubber import _, msg
-
-
-def setup(doc, context):
- doc.vars['program'] = 'xelatex'
- doc.vars['engine'] = 'XeLaTeX'
-
- if doc.env.final != doc and doc.products[0][-4:] != '.pdf':
- msg.error(_("there is already a post-processor registered"))
- return
-
- doc.reset_products([doc.target + '.pdf'])
-
diff --git a/debian/new_modules/xelatex_20100430.py b/debian/new_modules/xelatex_20100430.py
deleted file mode 100644
index 1c7cb5a..0000000
--- a/debian/new_modules/xelatex_20100430.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file is part of Rubber and thus covered by the GPL
-# (c) Emmanuel Beffara, 2002--2006
-# (c) Wouter Bolsterlee, 2009
-"""
-XeLaTeX support for Rubber.
-"""
-
-import sys
-import rubber
-from rubber import _, msg
-
-class Module (rubber.rules.latex.Module):
- def __init__ (self, doc, dict):
- doc.vars["program"] = "xelatex"
- doc.vars["engine"] = "XeLaTeX"
- if doc.env.final != doc and doc.prods[0][-4:] != ".pdf":
- msg.error(_("there is already a post-processor registered"))
- sys.exit(2)
- doc.prods = [doc.src_base + ".pdf"]
diff --git a/debian/rules b/debian/rules
index 8e67a99..0ba8636 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,8 @@
#!/usr/bin/make -f
# This file was adapted from the sample debian/rules generated by dh_make.
# original file: GNU copyright 1997 to 1999 by Joey Hess.
-# adaptation: (c) 2002--2006 by Emmanuel Beffara.
+# Copyright: 2002--2006 by Emmanuel Beffara.
+# 2015 Nicolas Boulenguez <[email protected]>
settings.py: configure
dh_testdir
@@ -32,12 +33,21 @@ install: build
dh_prep
dh_installdirs
$(MAKE) install prefix=$(CURDIR)/debian/rubber/usr
- #install -p --mode=644 debian/new_modules/xelatex.py $(CURDIR)/debian/rubber/usr/lib/python2.7/site-packages/rubber/latex_modules
+
+ # Applied by upstream revision 455.
install -p --mode=644 debian/new_modules/ltxtable.py $(CURDIR)/debian/rubber/usr/lib/python2.7/site-packages/rubber/latex_modules
+
+ # Applied by upstream revision 453.
install -p --mode=644 debian/new_modules/biblatex.py $(CURDIR)/debian/rubber/usr/lib/python2.7/site-packages/rubber/latex_modules
- #install -p --mode=644 debian/new_modules/pythontex.py $(CURDIR)/debian/rubber/usr/lib/python2.7/site-packages/rubber/latex_modules
+
+ # Applied by upstream revision 456.
install -p --mode=644 debian/new_modules/glossaries.rub $(CURDIR)/debian/rubber/usr/share/rubber/modules
+
+ # FIXME: supported or not?
+ # If so, also install the manpage below.
#install -p --mode=755 debian/new_modules/rubb $(CURDIR)/debian/rubber/usr/bin
+
+ # Forwarded upstream.
rm $(CURDIR)/debian/rubber/usr/share/rubber/modules/etex.rub
# Build architecture-independent files here.
@@ -46,6 +56,7 @@ binary-indep: build install
dh_testroot
dh_python2
dh_installdocs
+ # See above.
#dh_installman debian/new_modules/rubb.1
dh_installman
dh_installinfo doc/rubber.info
--
2.4.6
>From 7c58ea88f466ad7e35b4aede869b7fc619fb6aea Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sat, 1 Aug 2015 13:56:56 +0200
Subject: [PATCH 3/6] * switch copyright to machine-readable format.
---
debian/changelog | 1 +
debian/copyright | 36 +++++++++++++++++++++---------------
2 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d714841..d756d9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ rubber (1.2-2) UNRELEASED; urgency=medium
* document and refresh new modules. Removed:
xelatex: revision 420
pythontex: revision 438
+ * switch copyright to machine-readable format.
-- Nicolas Boulenguez <[email protected]> Sat, 01 Aug 2015 12:44:04 +0200
diff --git a/debian/copyright b/debian/copyright
index 8434a69..e47dfdb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,22 @@
-This package was debianized by: Emmanuel Beffara <[email protected]> on
-Fri, 31 May 2002 11:54:47 +0200. It is maintained by Hilmar Preuße
-since 2012.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Rubber
+Upstream-Contact: https://launchpad.net/~rubber-devs
+Source: https://launchpad.net/rubber
-Original source could be found at: ftp://ftp.beffara.org/soft/
-The program's home page can be found at: https://launchpad.net/rubber
-
-Rubber was originally written by Emmanuel Beffara <[email protected]>
-This software is copyright (c) 2002 by Emmanuel Beffara
-
-It is currently maintained by Sebastian Kapfer <[email protected]>
-
-You are free to distribute this software under the terms of
-the GNU General Public License.
-On Debian systems, the complete text of the GNU General Public
-License can be found in the file /usr/share/common-licenses/GPL.
+Files: *
+Copyright: 2002-2011 Emmanuel Beffara <[email protected]>
+ 2012-2015 Sebastian Kapfer <[email protected]>
+ 2012-2015 Hilmar Preuße
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ On Debian based systems, the full GNU General Public License may be
+ found at /usr/share/common-licenses/GPL-2.
--
2.4.6
>From 342aa97f9873c064290722541fb08e2047281ef0 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sat, 1 Aug 2015 13:59:45 +0200
Subject: [PATCH 4/6] * switch debhelper compat to 9.
---
debian/changelog | 1 +
debian/compat | 2 +-
debian/control | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d756d9c..17b6cbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ rubber (1.2-2) UNRELEASED; urgency=medium
xelatex: revision 420
pythontex: revision 438
* switch copyright to machine-readable format.
+ * switch compat to 9 (no changes).
-- Nicolas Boulenguez <[email protected]> Sat, 01 Aug 2015 12:44:04 +0200
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 9574d4d..23f141f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: tex
Priority: optional
Maintainer: Hilmar Preuße <[email protected]>
Uploaders: Python Apps Team <[email protected]>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: python, texinfo, dh-python
X-Python-Version: >= 2.5
Standards-Version: 3.9.6
--
2.4.6
>From 87626bb7136c5be0d0f48e368b012a4107003a19 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sat, 1 Aug 2015 14:22:31 +0200
Subject: [PATCH 5/6] * document suggested packages.
---
debian/changelog | 1 +
debian/control | 28 +++++++++++++++++++++++++++-
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 17b6cbd..f655230 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ rubber (1.2-2) UNRELEASED; urgency=medium
pythontex: revision 438
* switch copyright to machine-readable format.
* switch compat to 9 (no changes).
+ * document suggested packages.
-- Nicolas Boulenguez <[email protected]> Sat, 01 Aug 2015 12:44:04 +0200
diff --git a/debian/control b/debian/control
index 23f141f..b47dbff 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,14 @@ Homepage: https://launchpad.net/rubber
Package: rubber
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}, texlive-latex-base
-Suggests: imagemagick, transfig, sam2p
+Suggests: imagemagick ,sam2p
+ ,texlive-binaries
+ ,texlive-extra-utils
+ ,texlive-latex-extra
+ ,texlive-latex-recommended
+ ,texlive-omega
+ ,texlive-pictures
+ ,transfig
XB-Python-Version: ${python:Versions}
Description: automated system for building LaTeX documents
This is a building system for LaTeX documents. It is based on a routine that
@@ -23,3 +30,22 @@ Description: automated system for building LaTeX documents
pdftex, makeindex. A good number of standard packages are supported,
including graphics/graphicx with automatic conversion between various
graphics formats and Metapost compilation.
+ .
+ Some optional parts require the installation of suggested Debian packages.
+ .
+ graphics conversion: imagemagick and/or sam2p
+ .
+ aleph, metapost: texlive-binaries
+ .
+ pythontex: texlive-extra-utils
+ .
+ cweb, minitoc, moreverb, multibib, nomencl, ntheorem: texlive-latex-extra
+ .
+ beamer, index, listings: texlive-latex-recommended
+ .
+ omega: texlive-omega
+ .
+ gnuplottex: texlive-pictures
+ .
+ conversion from XFig format: transfig
+# hyperref, makeidx, natbib, verbatim: texlive-latex-base (via Depends)
--
2.4.6
>From 790f2c3ea2243a1636a148b3194c7ede62150ab3 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sat, 1 Aug 2015 16:40:36 +0200
Subject: [PATCH 6/6] Switch to dh and debhelper overrides. Transmit make
options to doc/Makefile. Only ignore the expected error for make clean.
---
debian/rubber.info | 1 +
debian/rules | 57 +++++++++--------------------------------
debian/source/lintian-overrides | 1 -
3 files changed, 13 insertions(+), 46 deletions(-)
create mode 100644 debian/rubber.info
delete mode 100644 debian/source/lintian-overrides
diff --git a/debian/rubber.info b/debian/rubber.info
new file mode 100644
index 0000000..8cfee15
--- /dev/null
+++ b/debian/rubber.info
@@ -0,0 +1 @@
+doc/rubber.info
diff --git a/debian/rules b/debian/rules
index 0ba8636..c7ada70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,34 +4,22 @@
# Copyright: 2002--2006 by Emmanuel Beffara.
# 2015 Nicolas Boulenguez <[email protected]>
-settings.py: configure
- dh_testdir
- ./configure --python=python --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-build-arch:
-build-indep: build
-build: build-stamp
+DH_TARGETS := clean binary binary-arch binary-indep build build-arch build-indep
+.PHONY: $(DH_TARGETS)
+$(DH_TARGETS):
+ dh $@ --with python2
-build-stamp: settings.py
- dh_testdir
- $(MAKE)
- touch build-stamp
+override_dh_auto_configure:
+ ./configure --python=python --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-clean:
- dh_testdir
- dh_testroot
+override_dh_auto_clean:
# upstream tar ball carries no Makefile in root, hence clean target
# in debian/rules returns exit code != 0, if package was never built.
# Ignoring this here.
- -$(MAKE) distclean
- cd doc; make clean
- dh_clean
+ if text -f Makefile; then $(MAKE) distclean; fi
+ cd doc; $(MAKE) clean
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
+override_dh_auto_install:
$(MAKE) install prefix=$(CURDIR)/debian/rubber/usr
# Applied by upstream revision 455.
@@ -44,32 +32,11 @@ install: build
install -p --mode=644 debian/new_modules/glossaries.rub $(CURDIR)/debian/rubber/usr/share/rubber/modules
# FIXME: supported or not?
- # If so, also install the manpage below.
+ # If so, also install the manpage via rubber.manpages
#install -p --mode=755 debian/new_modules/rubb $(CURDIR)/debian/rubber/usr/bin
# Forwarded upstream.
rm $(CURDIR)/debian/rubber/usr/share/rubber/modules/etex.rub
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_python2
- dh_installdocs
- # See above.
- #dh_installman debian/new_modules/rubb.1
- dh_installman
- dh_installinfo doc/rubber.info
+override_dh_installchangelogs:
dh_installchangelogs NEWS
- dh_link
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-arch:
-
-binary: binary-indep
-.PHONY: build clean binary-indep binary install
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index cb1f83b..0000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-debian-rules-ignores-make-clean-error
--
2.4.6
--- End Message ---
