[SCM] Debian packaging of texlive-bin) branch, master, updated. upstream/2012.20120628-10-g2acf873
The following commit has been merged in the master branch:
commit b9cb90af0a2f836d093774316766a32f7e67844f
Author: Norbert Preining <preining@debian.org>
Date: Wed Nov 7 13:04:58 2012 +0900
go back to normal quilt 3.0 format with patches in debian/patches
diff --git a/debian/quilt/12a_fix_thumbpdf_invocation b/debian/patches/12a_fix_thumbpdf_invocation
similarity index 100%
rename from debian/quilt/12a_fix_thumbpdf_invocation
rename to debian/patches/12a_fix_thumbpdf_invocation
diff --git a/debian/quilt/12b_fix_a2ping_invocation b/debian/patches/12b_fix_a2ping_invocation
similarity index 100%
rename from debian/quilt/12b_fix_a2ping_invocation
rename to debian/patches/12b_fix_a2ping_invocation
diff --git a/debian/quilt/12e_fix_vpe_invocation b/debian/patches/12e_fix_vpe_invocation
similarity index 100%
rename from debian/quilt/12e_fix_vpe_invocation
rename to debian/patches/12e_fix_vpe_invocation
diff --git a/debian/quilt/23_use_xdvi.bin b/debian/patches/23_use_xdvi.bin
similarity index 100%
rename from debian/quilt/23_use_xdvi.bin
rename to debian/patches/23_use_xdvi.bin
diff --git a/debian/quilt/50_fmtutil_deb b/debian/patches/50_fmtutil_deb
similarity index 100%
rename from debian/quilt/50_fmtutil_deb
rename to debian/patches/50_fmtutil_deb
diff --git a/debian/quilt/51_fmtutil_keep_failedlog b/debian/patches/51_fmtutil_keep_failedlog
similarity index 100%
rename from debian/quilt/51_fmtutil_keep_failedlog
rename to debian/patches/51_fmtutil_keep_failedlog
diff --git a/debian/quilt/53_builtin-searchpath-fix b/debian/patches/53_builtin-searchpath-fix
similarity index 100%
rename from debian/quilt/53_builtin-searchpath-fix
rename to debian/patches/53_builtin-searchpath-fix
diff --git a/debian/quilt/55_texconfig_stuff b/debian/patches/55_texconfig_stuff
similarity index 100%
rename from debian/quilt/55_texconfig_stuff
rename to debian/patches/55_texconfig_stuff
diff --git a/debian/quilt/57_texconfig_papersizes_for_upstream b/debian/patches/57_texconfig_papersizes_for_upstream
similarity index 100%
rename from debian/quilt/57_texconfig_papersizes_for_upstream
rename to debian/patches/57_texconfig_papersizes_for_upstream
diff --git a/debian/quilt/58_texconfig_papersizes_use_ucf b/debian/patches/58_texconfig_papersizes_use_ucf
similarity index 100%
rename from debian/quilt/58_texconfig_papersizes_use_ucf
rename to debian/patches/58_texconfig_papersizes_use_ucf
diff --git a/debian/quilt/60_unneeded_linking b/debian/patches/60_unneeded_linking
similarity index 100%
rename from debian/quilt/60_unneeded_linking
rename to debian/patches/60_unneeded_linking
diff --git a/debian/quilt/61_path_max.diff b/debian/patches/61_path_max.diff
similarity index 100%
rename from debian/quilt/61_path_max.diff
rename to debian/patches/61_path_max.diff
diff --git a/debian/quilt/build-wovp2ovf b/debian/patches/build-wovp2ovf
similarity index 100%
rename from debian/quilt/build-wovp2ovf
rename to debian/patches/build-wovp2ovf
diff --git a/debian/quilt/cweave-fix-too-short-names b/debian/patches/cweave-fix-too-short-names
similarity index 100%
rename from debian/quilt/cweave-fix-too-short-names
rename to debian/patches/cweave-fix-too-short-names
diff --git a/debian/quilt/debian-no-linked-scripts b/debian/patches/debian-no-linked-scripts
similarity index 100%
rename from debian/quilt/debian-no-linked-scripts
rename to debian/patches/debian-no-linked-scripts
diff --git a/debian/quilt/partial_lfs_support.diff b/debian/patches/partial_lfs_support.diff
similarity index 100%
rename from debian/quilt/partial_lfs_support.diff
rename to debian/patches/partial_lfs_support.diff
diff --git a/debian/quilt/patch-dvi2tty b/debian/patches/patch-dvi2tty
similarity index 100%
rename from debian/quilt/patch-dvi2tty
rename to debian/patches/patch-dvi2tty
diff --git a/debian/quilt/patch-lacheck b/debian/patches/patch-lacheck
similarity index 100%
rename from debian/quilt/patch-lacheck
rename to debian/patches/patch-lacheck
diff --git a/debian/quilt/patch-update-updmap-manpage b/debian/patches/patch-update-updmap-manpage
similarity index 100%
rename from debian/quilt/patch-update-updmap-manpage
rename to debian/patches/patch-update-updmap-manpage
diff --git a/debian/quilt/pmpost-20120415-tl11.diff b/debian/patches/pmpost-20120415-tl11.diff
similarity index 100%
rename from debian/quilt/pmpost-20120415-tl11.diff
rename to debian/patches/pmpost-20120415-tl11.diff
diff --git a/debian/quilt/pmpost-svg-20120119-tl11.diff b/debian/patches/pmpost-svg-20120119-tl11.diff
similarity index 100%
rename from debian/quilt/pmpost-svg-20120119-tl11.diff
rename to debian/patches/pmpost-svg-20120119-tl11.diff
diff --git a/debian/quilt/series b/debian/patches/series
similarity index 100%
rename from debian/quilt/series
rename to debian/patches/series
diff --git a/debian/quilt/set-e-fmtutil b/debian/patches/set-e-fmtutil
similarity index 100%
rename from debian/quilt/set-e-fmtutil
rename to debian/patches/set-e-fmtutil
diff --git a/debian/quilt/set-e-in-various-scripts b/debian/patches/set-e-in-various-scripts
similarity index 100%
rename from debian/quilt/set-e-in-various-scripts
rename to debian/patches/set-e-in-various-scripts
diff --git a/debian/quilt/upstream-fix-ptex-scanning b/debian/patches/upstream-fix-ptex-scanning
similarity index 100%
rename from debian/quilt/upstream-fix-ptex-scanning
rename to debian/patches/upstream-fix-ptex-scanning
diff --git a/debian/quilt/xdvi-upupstream-fixes b/debian/patches/xdvi-upupstream-fixes
similarity index 100%
rename from debian/quilt/xdvi-upupstream-fixes
rename to debian/patches/xdvi-upupstream-fixes
diff --git a/debian/quilt/xdvi-zoom-with-eps-figures.patch b/debian/patches/xdvi-zoom-with-eps-figures.patch
similarity index 100%
rename from debian/quilt/xdvi-zoom-with-eps-figures.patch
rename to debian/patches/xdvi-zoom-with-eps-figures.patch
diff --git a/debian/rules b/debian/rules
index cda5f11..b4fbcd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,12 +4,6 @@
export SHELL=/bin/bash
export CONFIG_SHELL=/bin/sh
-# this is for dh_quilt_patch (--with quilt) which reads this
-# variable and sets QUILT_PATCHES accordingly
-# we set both in case ...
-export QUILT_PATCH_DIR=debian/quilt
-export QUILT_PATCHES=debian/quilt
-
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
ifeq ($(DEB_HOST_ARCH), alpha)
@@ -30,7 +24,7 @@ endif
# must be adapted to also patch the Makefile.in!
%:
- dh $@ --with quilt --with autoreconf --builddirectory Work
+ dh $@ --with autoreconf --builddirectory Work
override_dh_autoreconf:
dh_autoreconf --as-needed
@@ -124,5 +118,4 @@ override_dh_shlibdeps:
-l debian/libptexenc1/usr/lib
override_dh_clean:
- dh_quilt_unpatch
dh_clean -X.orig
--
Debian packaging of texlive-bin)
Reply to: