[Python-apps-commits] r12509 - in packages/rubber/trunk/debian (4 files)

[hilmar-guest at users.alioth.debian.org]

    Date: Wednesday, October 21, 2015 @ 20:32:10
  Author: hilmar-guest
Revision: 12509

Start packeting rubber 1.3. #2

Modified:
  packages/rubber/trunk/debian/changelog
  packages/rubber/trunk/debian/patches/09_doc_makefile.diff
  packages/rubber/trunk/debian/patches/series
  packages/rubber/trunk/debian/rules

Modified: packages/rubber/trunk/debian/changelog
===================================================================
--- packages/rubber/trunk/debian/changelog	2015-10-21 20:27:56 UTC (rev 12508)
+++ packages/rubber/trunk/debian/changelog	2015-10-21 20:32:10 UTC (rev 12509)
@@ -1,3 +1,21 @@
+rubber (1.3-1) UNRELEASED; urgency=medium
+
+  New upstream release
+  * more Debian-specific patches are obsolete
+    - 02_rubber_bibtext_20120807.diff
+    - 03_rubber_makeindex_20150708.diff
+    - 05_rubber-push_vars-bug.diff
+    - 08_lst-depends-wrong-parse.diff
+  * some Debian-specific modules are shipped in upstream
+    - biblatex.py
+    - ltxtable.py
+    - glossaries.rub
+  * etex.rub not shipped in upstream any more
+
+  * fix last changelog entry (document obsolete Debian patches)
+
+ -- Hilmar Preuße <hille42 at web.de>  Wed, 21 Oct 2015 21:16:42 +0200
+
 rubber (1.2-1) unstable; urgency=medium
 
   I re-animated my upstream!!! rubber 1.2 is there.
@@ -3,4 +21,8 @@
 
   * some Debian specific modules/patches are now in upstream
+    - 01_fix_category_of_info_page.diff
+    - 04_borken_image_conversion.diff
+    - 06_multibib_borken.diff
+    - 07_wrong_arguments.diff
   * shell_escape feature to enable -shell-escape in LaTeX.
     (see upstream changelog for details)

Modified: packages/rubber/trunk/debian/patches/09_doc_makefile.diff
===================================================================
--- packages/rubber/trunk/debian/patches/09_doc_makefile.diff	2015-10-21 20:27:56 UTC (rev 12508)
+++ packages/rubber/trunk/debian/patches/09_doc_makefile.diff	2015-10-21 20:32:10 UTC (rev 12509)
@@ -1,9 +1,9 @@
-Index: rubber-1.2/doc/Makefile
+Index: rubber-1.3/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
-@@ -16,4 +16,4 @@
- distclean clean:
+--- rubber-1.3.orig/doc/Makefile	2015-10-21 21:31:08.000000000 +0200
++++ rubber-1.3/doc/Makefile	2015-10-21 21:31:08.000000000 +0200
+@@ -13,4 +13,4 @@
+ 	rm -f rubber.html
  	rm -f rubber.aux rubber.cp rubber.dvi rubber.fn rubber.fns \
  		rubber.info rubber.ky rubber.log rubber.pg \
 -		rubber.toc rubber.tp rubber.vr rubber.vrs

Modified: packages/rubber/trunk/debian/patches/series
===================================================================
--- packages/rubber/trunk/debian/patches/series	2015-10-21 20:27:56 UTC (rev 12508)
+++ packages/rubber/trunk/debian/patches/series	2015-10-21 20:32:10 UTC (rev 12509)
@@ -1,10 +1,11 @@
 #01_fix_category_of_info_page.diff
-02_rubber_bibtext_20120807.diff
+#02_rubber_bibtext_20120807.diff
 #03_rubber_makeindex_20120808.diff
-03_rubber_makeindex_20150708.diff
+#03_rubber_makeindex_20150708.diff
 #04_borken_image_conversion.diff
-05_rubber-push_vars-bug.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
+#08_lst-depends-wrong-parse.diff
+#09_doc_makefile.diff
+11_modify_makefile_for_install.diff

Modified: packages/rubber/trunk/debian/rules
===================================================================
--- packages/rubber/trunk/debian/rules	2015-10-21 20:27:56 UTC (rev 12508)
+++ packages/rubber/trunk/debian/rules	2015-10-21 20:32:10 UTC (rev 12509)
@@ -22,9 +22,13 @@
 	# 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.
+	find . \( -name '*~' -or -name '*.py[co]' \)
 	-$(MAKE) distclean
-	cd doc; make clean
+	find . \( -name '*~' -or -name '*.py[co]' \)
+	#cd doc; make clean
+	#$(MAKE) distclean
 	dh_clean
+	find . \( -name '*~' -or -name '*.py[co]' \)
 
 install: build
 	dh_testdir
@@ -33,12 +37,12 @@
 	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
-	install -p --mode=644 debian/new_modules/ltxtable.py $(CURDIR)/debian/rubber/usr/lib/python2.7/site-packages/rubber/latex_modules
-	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/ltxtable.py $(CURDIR)/debian/rubber/usr/lib/python2.7/site-packages/rubber/latex_modules
+	#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
-	install -p --mode=644 debian/new_modules/glossaries.rub $(CURDIR)/debian/rubber/usr/share/rubber/modules
+	#install -p --mode=644 debian/new_modules/glossaries.rub $(CURDIR)/debian/rubber/usr/share/rubber/modules
 	#install -p --mode=755 debian/new_modules/rubb $(CURDIR)/debian/rubber/usr/bin
-	rm $(CURDIR)/debian/rubber/usr/share/rubber/modules/etex.rub
+	#rm $(CURDIR)/debian/rubber/usr/share/rubber/modules/etex.rub
 
 # Build architecture-independent files here.
 binary-indep: build install