[Reproducible-commits] [texlive-bin] 84/400: swtich back to source format 3.0, but keep the patches outside of debian/patches and in debian/quilt, and patch manually with quilt that gets us rid of brain damaged dpkg-source behaviour
Maria Valentina Marin Rodrigues
akira-guest at moszumanska.debian.org
Thu Jul 9 21:39:37 UTC 2015
This is an automated email from the git hooks/post-receive script.
akira-guest pushed a commit to branch master
in repository texlive-bin.
commit 89e8c114b2440151db76589149a5d7660ea0cb7e
Author: Norbert Preining <preining at debian.org>
Date: Tue May 15 23:12:29 2012 +0000
swtich back to source format 3.0, but keep the patches outside of
debian/patches and in debian/quilt, and patch manually with quilt
that gets us rid of brain damaged dpkg-source behaviour
---
debian/changelog | 10 ++++++----
debian/{patches => quilt}/12_fix_epstopdf_invocation | 0
debian/{patches => quilt}/12a_fix_thumbpdf_invocation | 0
debian/{patches => quilt}/12b_fix_a2ping_invocation | 0
debian/{patches => quilt}/12e_fix_vpe_invocation | 0
debian/{patches => quilt}/23_use_xdvi.bin | 0
debian/{patches => quilt}/41_maketexmf | 0
debian/{patches => quilt}/50_fmtutil_deb | 0
debian/{patches => quilt}/51_fmtutil_keep_failedlog | 0
debian/{patches => quilt}/53_builtin-searchpath-fix | 0
debian/{patches => quilt}/55_texconfig_stuff | 0
debian/{patches => quilt}/57_texconfig_papersizes_for_upstream | 0
debian/{patches => quilt}/58_texconfig_papersizes_use_ucf | 0
debian/{patches => quilt}/60_unneeded_linking | 0
debian/{patches => quilt}/61_path_max.diff | 0
debian/{patches => quilt}/build-wovp2ovf | 0
debian/{patches => quilt}/debian-no-linked-scripts | 0
debian/{patches => quilt}/partial_lfs_support.diff | 0
debian/{patches => quilt}/pmpost-20120415-tl11.diff | 0
debian/{patches => quilt}/pmpost-svg-20120119-tl11.diff | 0
debian/{patches => quilt}/series | 0
debian/{patches => quilt}/set-e-in-various-scripts | 0
debian/{patches => quilt}/updmap-search-path | 0
debian/{patches => quilt}/xdvi-zoom-with-eps-figures.patch | 0
debian/rules | 7 +------
debian/source/format | 1 +
26 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9abf230..7ad4c60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,18 @@
texlive-bin (2012.20120516-1) unstable; urgency=low
- * UNRELEASED
* new upstream snapshot based on TL2012 tlpretest
* remove outdated and not needed patches
* remove traces of debian internal mupdmap, we use the one that is now
shipped by default in TeX Live
* patch shipped updmap for correct perl module search path
- * switch back to source format 1.0 to get rid of the quilt versus
- dpkg-source madness. A big toast to the dpkg devs for that!
+ * move patches from debian/patches to debian/quilt, add quilt as
+ build dep, and include quilt patching in debian/rules
+ this gets us rid of the "strange" parts of the 3.0 format
+ (see quilt vs dpkg-source fuzzyness acceptance).
+ Thanks to an unnamed dev who gave me the hint!
* disable build-wovp2ovf patch, included upstream
- -- Norbert Preining <preining at debian.org> Mon, 14 May 2012 09:44:50 +0900
+ -- Norbert Preining <preining at debian.org> Wed, 16 May 2012 08:09:32 +0900
texlive-bin (2011.20120510-1) unstable; urgency=low
diff --git a/debian/patches/12_fix_epstopdf_invocation b/debian/quilt/12_fix_epstopdf_invocation
similarity index 100%
rename from debian/patches/12_fix_epstopdf_invocation
rename to debian/quilt/12_fix_epstopdf_invocation
diff --git a/debian/patches/12a_fix_thumbpdf_invocation b/debian/quilt/12a_fix_thumbpdf_invocation
similarity index 100%
rename from debian/patches/12a_fix_thumbpdf_invocation
rename to debian/quilt/12a_fix_thumbpdf_invocation
diff --git a/debian/patches/12b_fix_a2ping_invocation b/debian/quilt/12b_fix_a2ping_invocation
similarity index 100%
rename from debian/patches/12b_fix_a2ping_invocation
rename to debian/quilt/12b_fix_a2ping_invocation
diff --git a/debian/patches/12e_fix_vpe_invocation b/debian/quilt/12e_fix_vpe_invocation
similarity index 100%
rename from debian/patches/12e_fix_vpe_invocation
rename to debian/quilt/12e_fix_vpe_invocation
diff --git a/debian/patches/23_use_xdvi.bin b/debian/quilt/23_use_xdvi.bin
similarity index 100%
rename from debian/patches/23_use_xdvi.bin
rename to debian/quilt/23_use_xdvi.bin
diff --git a/debian/patches/41_maketexmf b/debian/quilt/41_maketexmf
similarity index 100%
rename from debian/patches/41_maketexmf
rename to debian/quilt/41_maketexmf
diff --git a/debian/patches/50_fmtutil_deb b/debian/quilt/50_fmtutil_deb
similarity index 100%
rename from debian/patches/50_fmtutil_deb
rename to debian/quilt/50_fmtutil_deb
diff --git a/debian/patches/51_fmtutil_keep_failedlog b/debian/quilt/51_fmtutil_keep_failedlog
similarity index 100%
rename from debian/patches/51_fmtutil_keep_failedlog
rename to debian/quilt/51_fmtutil_keep_failedlog
diff --git a/debian/patches/53_builtin-searchpath-fix b/debian/quilt/53_builtin-searchpath-fix
similarity index 100%
rename from debian/patches/53_builtin-searchpath-fix
rename to debian/quilt/53_builtin-searchpath-fix
diff --git a/debian/patches/55_texconfig_stuff b/debian/quilt/55_texconfig_stuff
similarity index 100%
rename from debian/patches/55_texconfig_stuff
rename to debian/quilt/55_texconfig_stuff
diff --git a/debian/patches/57_texconfig_papersizes_for_upstream b/debian/quilt/57_texconfig_papersizes_for_upstream
similarity index 100%
rename from debian/patches/57_texconfig_papersizes_for_upstream
rename to debian/quilt/57_texconfig_papersizes_for_upstream
diff --git a/debian/patches/58_texconfig_papersizes_use_ucf b/debian/quilt/58_texconfig_papersizes_use_ucf
similarity index 100%
rename from debian/patches/58_texconfig_papersizes_use_ucf
rename to debian/quilt/58_texconfig_papersizes_use_ucf
diff --git a/debian/patches/60_unneeded_linking b/debian/quilt/60_unneeded_linking
similarity index 100%
rename from debian/patches/60_unneeded_linking
rename to debian/quilt/60_unneeded_linking
diff --git a/debian/patches/61_path_max.diff b/debian/quilt/61_path_max.diff
similarity index 100%
rename from debian/patches/61_path_max.diff
rename to debian/quilt/61_path_max.diff
diff --git a/debian/patches/build-wovp2ovf b/debian/quilt/build-wovp2ovf
similarity index 100%
rename from debian/patches/build-wovp2ovf
rename to debian/quilt/build-wovp2ovf
diff --git a/debian/patches/debian-no-linked-scripts b/debian/quilt/debian-no-linked-scripts
similarity index 100%
rename from debian/patches/debian-no-linked-scripts
rename to debian/quilt/debian-no-linked-scripts
diff --git a/debian/patches/partial_lfs_support.diff b/debian/quilt/partial_lfs_support.diff
similarity index 100%
rename from debian/patches/partial_lfs_support.diff
rename to debian/quilt/partial_lfs_support.diff
diff --git a/debian/patches/pmpost-20120415-tl11.diff b/debian/quilt/pmpost-20120415-tl11.diff
similarity index 100%
rename from debian/patches/pmpost-20120415-tl11.diff
rename to debian/quilt/pmpost-20120415-tl11.diff
diff --git a/debian/patches/pmpost-svg-20120119-tl11.diff b/debian/quilt/pmpost-svg-20120119-tl11.diff
similarity index 100%
rename from debian/patches/pmpost-svg-20120119-tl11.diff
rename to debian/quilt/pmpost-svg-20120119-tl11.diff
diff --git a/debian/patches/series b/debian/quilt/series
similarity index 100%
rename from debian/patches/series
rename to debian/quilt/series
diff --git a/debian/patches/set-e-in-various-scripts b/debian/quilt/set-e-in-various-scripts
similarity index 100%
rename from debian/patches/set-e-in-various-scripts
rename to debian/quilt/set-e-in-various-scripts
diff --git a/debian/patches/updmap-search-path b/debian/quilt/updmap-search-path
similarity index 100%
rename from debian/patches/updmap-search-path
rename to debian/quilt/updmap-search-path
diff --git a/debian/patches/xdvi-zoom-with-eps-figures.patch b/debian/quilt/xdvi-zoom-with-eps-figures.patch
similarity index 100%
rename from debian/patches/xdvi-zoom-with-eps-figures.patch
rename to debian/quilt/xdvi-zoom-with-eps-figures.patch
diff --git a/debian/rules b/debian/rules
index f5f84dc..38dcae6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
export SHELL=/bin/bash
export CONFIG_SHELL=/bin/sh
+export QUILT_PATCHES=debian/quilt
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -64,14 +65,8 @@ override_dh_install:
dh_install --sourcedir=$(CURDIR)/debian/tmp
# remove texlive directories, they should not be shipped here
rm -rf debian/texlive-binaries/usr/share/texlive
- # we have to do something with updmap ...
- echo "WARNING WARNING WARNING UPDMAP MUST BE FIXED!!!"
- #rm -f debian/texlive-binaries/usr/bin/updmap
- #rm -f debian/texlive-binaries/usr/bin/updmap-sys
- #rm -rf debian/texlive-binaries/usr/share/info
# remove wrongly added info/dir.gz
rm -f debian/texlive-binaries/usr/share/info/dir*
- #rm -rf debian/texlive-binaries/usr/share/man
rm debian/texlive-binaries/usr/share/man/man1/latex.1*
rm debian/texlive-binaries/usr/share/man/man1/pdflatex.1*
rm debian/texlive-binaries/usr/share/man/man1/thumbpdf.1*
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/texlive-bin.git
More information about the Reproducible-commits
mailing list