[Reproducible-commits] [texlive-bin] 60/400: remove included patch

[Maria Valentina Marin Rodrigues]

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 91df6d456a6de304246dfd8972357a337958844b
Author: Norbert Preining <preining at debian.org>
Date:   Sun Apr 8 12:38:30 2012 +0000

    remove included patch
---
 debian/changelog                        |  4 +-
 debian/make-orig-tar                    |  5 +++
 debian/patches/dvips-config-c-directive | 67 ---------------------------------
 debian/patches/series                   |  1 -
 4 files changed, 7 insertions(+), 70 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eaf7f05..6e4e860 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,11 @@ texlive-bin (2011.20120328-2) unstable; urgency=low
 
   * UNRELEASED
   * add patches (maybe to be included upstream) that allows inclusion of
-    one config file in another for dvips and (x)dvipdfmx. This will be
+    one config file in another for (x)dvipdfmx. This will be
     used by the paper code.
   * fix description of libptexenc-dev package (Closes: #667694)
 
- -- Norbert Preining <preining at debian.org>  Fri, 06 Apr 2012 12:57:27 +0900
+ -- Norbert Preining <preining at debian.org>  Sun, 08 Apr 2012 21:37:48 +0900
 
 texlive-bin (2011.20120328-1) unstable; urgency=low
 
diff --git a/debian/make-orig-tar b/debian/make-orig-tar
index 9e6b7f3..f3a92c0 100644
--- a/debian/make-orig-tar
+++ b/debian/make-orig-tar
@@ -1,9 +1,11 @@
 
 verstr=texlive-bin-2011.`date +%Y%m%d`
+pkgstr=texlive-bin_2011.`date +%Y%m%d`
 if [ -r $verstr ] ; then
   echo "already existing: $verstr, exit!"
   exit 1
 fi
+echo "copying"
 cp -a /src/TeX/texlive-svn/Build/source $verstr
 rm -rf $verstr/inst
 rm -rf $verstr/Work
@@ -16,3 +18,6 @@ done
 find $verstr -name \.svn -exec rm -rf '{}' \;
 find $verstr -name autom4te.cache -exec rm -rf '{}' \;
 
+echo "packing up"
+tar -czf $pkgstr.orig.tar.gz $verstr
+
diff --git a/debian/patches/dvips-config-c-directive b/debian/patches/dvips-config-c-directive
deleted file mode 100644
index 77594f5..0000000
--- a/debian/patches/dvips-config-c-directive
+++ /dev/null
@@ -1,67 +0,0 @@
----
- texk/dvipsk/ChangeLog            |    7 +++++++
- texk/dvipsk/contrib/config.proto |    4 ++++
- texk/dvipsk/dvips.texi           |    5 +++++
- texk/dvipsk/resident.c           |    6 ++++++
- 4 files changed, 22 insertions(+)
-
-Index: texlive-bin-2011.20120328/texk/dvipsk/ChangeLog
-===================================================================
---- texlive-bin-2011.20120328.orig/texk/dvipsk/ChangeLog	2012-03-16 15:55:48.000000000 +0900
-+++ texlive-bin-2011.20120328/texk/dvipsk/ChangeLog	2012-03-30 10:31:33.854669863 +0900
-@@ -1,3 +1,10 @@
-+2012-03-30  Norbert Preining  <preining at logic.at>
-+
-+	* resident.c: add new directive "c<filename> to config files, allowing
-+	to include other config files:
-+	* contrib/config.proto: add exmaple "c<filename>" directive
-+	* dvips.texi: document "c" config file directive
-+	 
- 2012-03-15  Peter Breitenlohner  <peb at mppmu.mpg.de>
- 
- 	* Makefile.am: Fixed a typo (in comment).
-Index: texlive-bin-2011.20120328/texk/dvipsk/contrib/config.proto
-===================================================================
---- texlive-bin-2011.20120328.orig/texk/dvipsk/contrib/config.proto	2009-12-25 03:38:47.000000000 +0900
-+++ texlive-bin-2011.20120328/texk/dvipsk/contrib/config.proto	2012-03-30 10:31:33.850669876 +0900
-@@ -44,3 +44,7 @@
- % You will also want definitions for alternative paper sizes -- A4,
- % legal, and such.  Examples in @file{contrib/papersize.level2} and
- % @file{contrib/papersize.simple}.
-+
-+%
-+% Inclusion of additional configuration files
-+%c<filename>
-Index: texlive-bin-2011.20120328/texk/dvipsk/dvips.texi
-===================================================================
---- texlive-bin-2011.20120328.orig/texk/dvipsk/dvips.texi	2011-07-26 23:14:39.000000000 +0900
-+++ texlive-bin-2011.20120328/texk/dvipsk/dvips.texi	2012-03-30 10:31:33.850669876 +0900
-@@ -1419,6 +1419,11 @@
- @opindex b @r{config command (#copies)}
- Multiple copies.  Same as @samp{-b}, @pxref{Option details}.
- 
-+ at item c @var{name}
-+ at opindex c @r{include additional config file}
-+Include an additional config file as if the additional config file's
-+content would be included literally.
-+
- @item D @var{dpi}
- @opindex D @r{config command (dpi)}
- Output resolution.  Same as @samp{-D}, @pxref{Option details}.
-Index: texlive-bin-2011.20120328/texk/dvipsk/resident.c
-===================================================================
---- texlive-bin-2011.20120328.orig/texk/dvipsk/resident.c	2011-07-20 16:00:05.000000000 +0900
-+++ texlive-bin-2011.20120328/texk/dvipsk/resident.c	2012-03-30 10:31:33.850669876 +0900
-@@ -765,6 +765,12 @@
-                paperfmt = newstring(PSname);
-          }
-          break;
-+case 'c' :
-+         if (sscanf(was_inline+1, "%s", PSname) != 1)
-+           bad_config("missing arg to c");
-+         else
-+           getdefaults(PSname);
-+         break;
- default:
-          bad_config("strange line");
-       }
diff --git a/debian/patches/series b/debian/patches/series
index 0e4404d..b15e7ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,6 +43,5 @@ debian-no-linked-scripts
 build-wovp2ovf
 60_unneeded_linking
 61_path_max.diff
-dvips-config-c-directive
 dvipdfmx-config-i-directive
 xdvipdfmx-config-i-directive

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/texlive-bin.git