[Python-apps-commits] r12648 - in packages/rubber/trunk/debian (9 files)

Wed Dec 16 17:15:01 UTC 2015

Date: Wednesday, December 16, 2015 @ 17:15:00
  Author: hilmar-guest
Revision: 12648

Changes for packaging rubber 1.4.

Added:
  packages/rubber/trunk/debian/clean
  packages/rubber/trunk/debian/setup.cfg
Modified:
  packages/rubber/trunk/debian/changelog
  packages/rubber/trunk/debian/control
  packages/rubber/trunk/debian/rubber.doc-base
  packages/rubber/trunk/debian/rules
Deleted:
  packages/rubber/trunk/debian/patches/11_modify_root_makefile_in.diff
  packages/rubber/trunk/debian/patches/series
  packages/rubber/trunk/debian/rubber.info

Modified: packages/rubber/trunk/debian/changelog
===================================================================

--- packages/rubber/trunk/debian/changelog	2015-12-14 21:00:25 UTC (rev 12647)
+++ packages/rubber/trunk/debian/changelog	2015-12-16 17:15:00 UTC (rev 12648)
@@ -1,11 +1,37 @@
-rubber (1.3-2) UNRELEASED; urgency=medium
+rubber (1.4-1) unstable; urgency=medium
 
+  New upstream release
+
+  List only features/bugs, which close Debian/LP bugs. For full
+  list see changelog of upstream.
+
+  Features:
+  * We have support for embedding R code via knitr. (LP: #1422759)
+
+  Fixes:
+  * Refuse to read logfiles which exceed 1 MB. This avoids out-of-memory
+    situations. The limit may be raised with
+      % rubber: set logfile_limit 1000000
+    (LP: #628150)
+  * Rubber complains properly now for nonexisting directives, and
+    doesn't just print a stacktrace. This probably (Closes: #374908).
+    (LP: #1090115)
+  * The command-line parsing of rubber and rubber-info has been merged.
+    Thus, the --inplace and --into options are not only accepted by
+    Rubber (as they were previously), they also take effect. (LP: #975376)
+  * jpeg2ps is now gone from info file and rules.ini (Closes: #805935)
+
+  Input from Nicolas Boulenguez <nicolas at debian.org>
+  * add doc-base file to register rubber doc files
+  * build and installation is now done using upstreams setup script
+    (Closes: #803747)
+    It uses texi2dvi, which needs a minimal TL installation -> added
+    texlive-latex-base to BD's.
+
   * add Vcs-Browser field
   * add reportbug script to request more information in bug reports
-  * add doc-base file to register rubber info files
-    (See: #803747)
 
- -- Hilmar PreuÃŸe <hille42 at web.de>  Fri, 06 Nov 2015 10:07:30 +0100
+ -- Hilmar PreuÃŸe <hille42 at web.de>  Mon, 14 Dec 2015 18:45:32 +0100
 
 rubber (1.3-1) unstable; urgency=medium
 

Added: packages/rubber/trunk/debian/clean
===================================================================
--- packages/rubber/trunk/debian/clean	                        (rev 0)
+++ packages/rubber/trunk/debian/clean	2015-12-16 17:15:00 UTC (rev 12648)
@@ -0,0 +1 @@
+setup.cfg

Modified: packages/rubber/trunk/debian/control
===================================================================
--- packages/rubber/trunk/debian/control	2015-12-14 21:00:25 UTC (rev 12647)
+++ packages/rubber/trunk/debian/control	2015-12-16 17:15:00 UTC (rev 12648)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Hilmar PreuÃŸe <hille42 at web.de>
 Uploaders: Python Apps Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 9), python, texinfo, dh-python
+Build-Depends: debhelper (>= 9), python, texinfo, dh-python, texlive-latex-base
 X-Python-Version: >= 2.5
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/viewvc/python-apps/packages/rubber/trunk/

Deleted: packages/rubber/trunk/debian/patches/11_modify_root_makefile_in.diff
===================================================================
--- packages/rubber/trunk/debian/patches/11_modify_root_makefile_in.diff	2015-12-14 21:00:25 UTC (rev 12647)
+++ packages/rubber/trunk/debian/patches/11_modify_root_makefile_in.diff	2015-12-16 17:15:00 UTC (rev 12648)
@@ -1,22 +0,0 @@
-Description:
-- remove settings.pyc forgotten by upstream Makefile.
-- @prefix@ -> ${prefix} in Makefile.in
-Author: Hilmar PreuÃŸe <hille42 at web.de>
-Applied-Upstream: commit 680
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -16,11 +16,11 @@
- 
- distclean: clean-local
- 	@python@ setup.py rm_sub_files
--	rm -f settings.py
-+	rm -f settings.py settings.pyc
- 	cd doc && $(MAKE) distclean
- 
- install:
--	@python@ setup.py inst @prefix@
-+	@python@ setup.py inst @prefix@
- 
- tar:
- 	git archive --format=tar HEAD | gzip -9 > rubber- at version@.tar.gz

Deleted: packages/rubber/trunk/debian/patches/series
===================================================================
--- packages/rubber/trunk/debian/patches/series	2015-12-14 21:00:25 UTC (rev 12647)
+++ packages/rubber/trunk/debian/patches/series	2015-12-16 17:15:00 UTC (rev 12648)
@@ -1 +0,0 @@
-11_modify_root_makefile_in.diff

Modified: packages/rubber/trunk/debian/rubber.doc-base
===================================================================
--- packages/rubber/trunk/debian/rubber.doc-base	2015-12-14 21:00:25 UTC (rev 12647)
+++ packages/rubber/trunk/debian/rubber.doc-base	2015-12-16 17:15:00 UTC (rev 12648)
@@ -8,6 +8,16 @@
  files.
 Section: Typesetting
 
+Format: HTML
+Index: /usr/share/doc/rubber/rubber.html
+Files: /usr/share/doc/rubber/rubber.html
+
+Format: PDF
+Files: /usr/share/doc/rubber/rubber.pdf.gz
+
+Format: Text
+Files: /usr/share/doc/rubber/rubber.txt.gz
+
 Format: Info
 Index: /usr/share/info/rubber.info.gz
 Files: /usr/share/info/rubber.info.gz
\ No newline at end of file

Deleted: packages/rubber/trunk/debian/rubber.info
===================================================================
--- packages/rubber/trunk/debian/rubber.info	2015-12-14 21:00:25 UTC (rev 12647)
+++ packages/rubber/trunk/debian/rubber.info	2015-12-16 17:15:00 UTC (rev 12648)
@@ -1 +0,0 @@
-doc/rubber.info

Modified: packages/rubber/trunk/debian/rules
===================================================================
--- packages/rubber/trunk/debian/rules	2015-12-14 21:00:25 UTC (rev 12647)
+++ packages/rubber/trunk/debian/rules	2015-12-16 17:15:00 UTC (rev 12648)
@@ -10,19 +10,14 @@
 	dh $@ --with python2
 
 # Don't replace /usr/bin/python by /usr/bin/python2 in python scripts
-override_dh_auto_configure:
-	./configure --python=python --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+#override_dh_auto_configure:
+#	./configure --python=python --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
-# Ignore setup.py even if there is no Makefile yet.
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-	dh_auto_clean --buildsystem=autoconf
+$(POLICY_TARGETS): setup.cfg
+setup.cfg:
+	ln -s debian/$@
+# This symlink is listed by debian/clean.
 
-# Circumvent Makefile that does not allow to set DESTDIR.
-.PHONY: override_dh_auto_install
-override_dh_auto_install:
-	dh_auto_install --buildsystem=python_distutils
-
 # Install NEWS as upstream changelog.
 .PHONY: override_dh_installchangelogs
 override_dh_installchangelogs:

Added: packages/rubber/trunk/debian/setup.cfg
===================================================================
--- packages/rubber/trunk/debian/setup.cfg	                        (rev 0)
+++ packages/rubber/trunk/debian/setup.cfg	2015-12-16 17:15:00 UTC (rev 12648)
@@ -0,0 +1,5 @@
+[build]
+txt = 1
+[install]
+mandir  = $base/share/man
+infodir = $base/share/info
\ No newline at end of file


