[SCM] Debian packaging for sketch 3D line drawing software branch, build, updated. debian/0.2.89-1-71-gf030446
David Bremner
bremner at unb.ca
Mon Jul 5 13:06:36 UTC 2010
The following commit has been merged in the build branch:
commit f030446c09b860dda78fe4e1694903342fe4cef7
Author: David Bremner <bremner at unb.ca>
Date: Sun Jul 4 22:25:16 2010 -0300
purge old patches. Re-export remaining patch from topgit.
diff --git a/debian/patches/debian/Doc-make-pl.diff b/debian/patches/debian/Doc-make-pl.diff
deleted file mode 100644
index 5b28454..0000000
--- a/debian/patches/debian/Doc-make-pl.diff
+++ /dev/null
@@ -1,139 +0,0 @@
-From: David Bremner <bremner at unb.ca>
-Subject: [PATCH] debian/Doc-make-pl
-
-convert doc making script for linux and add debugging output
-
-Signed-off-by: David Bremner <bremner at unb.ca>
-
-
----
- Doc/make.pl | 58 +++++++++++++++++++++++++++++++++++++---------------------
- 1 files changed, 37 insertions(+), 21 deletions(-)
-
-diff --git a/Doc/make.pl b/Doc/make.pl
-index f43bcfd..5b2eb78 100644
---- a/Doc/make.pl
-+++ b/Doc/make.pl
-@@ -4,7 +4,6 @@
- use strict;
- use File::Copy;
-
--our $GS = "gswin32.exe";
- our $MEM_OPTION = "--extra-mem-top=5000000"; # MikTeX 2.7
- # our $MEM_OPTION = ""; # MikTeX 2.6
-
-@@ -13,34 +12,36 @@ sub make_example {
- die "missing example name" unless $ex;
- my %arg = map { $_ => 1 } @_;
-
-+ my $GS=$arg{linux} ? "gs" :"gs.exe";
- unless ($arg{nosketch}) {
-- my $cmd = "sketch -D $ex manexamples.sk > $ex.tex";
-+ my $cmd = "../sketch -D $ex manexamples.sk > $ex.tex";
- print STDERR "$cmd\n";
-- system($cmd) == 0 or die;
-+ system($cmd) == 0 or die "$!";
- }
- unless ($arg{nobitmaps}) {
- print STDERR "latex example '$ex-tmp.tex':\n";
-- system("sed -e s/TEXFILE/$ex/ makeex-tmp.tex > $ex-tmp.tex") == 0 or die;
-- system("latex $MEM_OPTION $ex-tmp.tex") == 0 or die;
-- system("dvips -E $ex-tmp -o tmp.eps") == 0 or die;
-+ system("sed -e s/TEXFILE/$ex/ makeex-tmp.tex > $ex-tmp.tex") == 0 or die "$!";
-+ system("latex $MEM_OPTION $ex-tmp.tex") == 0 or die "$!";
-+ system("dvips -E $ex-tmp -o tmp.eps") == 0 or die "$!";
- # fix up bounding box (originally this was not necessary; something was "improved")
-- system("epstool --copy --bbox tmp.eps $ex.eps") == 0 or die;
-+ system("epstool --copy --bbox tmp.eps $ex.eps") == 0 or die "$!";
- unlink "tmp.eps";
-- local *F;
-- open(F, "> $ex.txt") or die;
-- print F "Image $ex omitted in text version of this document.";
-- close F;
-- system("$GS -q -dQUIET -dNOPAUSE -dBATCH -dEPSCrop -sDEVICE=pdfwrite -sOutputFile=$ex.pdf -r120 $ex.eps") == 0 or die;
-- system("$GS -q -dQUIET -dNOPAUSE -dBATCH -dEPSCrop -sDEVICE=png256 -sOutputFile=$ex.png -r120 $ex.eps") == 0 or die;
-+ system("$GS -q -dQUIET -dNOPAUSE -dBATCH -dEPSCrop -sDEVICE=pdfwrite -sOutputFile=$ex.pdf -r120 $ex.eps") == 0 or die "$!";
-+ system("$GS -q -dQUIET -dNOPAUSE -dBATCH -dEPSCrop -sDEVICE=png256 -sOutputFile=$ex.png -r120 $ex.eps") == 0 or die "$!";
- unlink <$ex-tmp.*>;
- }
-+ local *F;
-+ open(F, "> $ex.txt") or die "$!";
-+ print F "Image $ex omitted in text version of this document.";
-+ close F;
-+
- }
-
- sub make_all {
- my %arg = map { $_ => 1 } @_;
- if ($arg{examples}) {
- local *F;
-- open(F, "tags.sk") or die;
-+ open(F, "tags.sk") or die "$!";
- while (<F>) {
- if (/<([^>]*)>/) {
- make_example $1, @_;
-@@ -48,26 +49,36 @@ sub make_all {
- }
- close(F);
- }
-+ if ($arg{linux}){
-+ rename("sketch.texi","sketch.texi.dist") || die "$!";
-+ open (IN,"<sketch.texi.dist") || die "$!";
-+ open (OUT,">sketch.texi") || die "$!";
-+ while(<IN>){
-+ tr/\r//d;
-+ print OUT;
-+ }
-+ }
-+
- unless ($arg{notypeset}) {
- print "info:\n";
-- system("makeinfo sketch.texi") == 0 or die;
-+ system("makeinfo sketch.texi") == 0 or die "$!";
-
- print "html, one page per node:\n";
-- system("makeinfo --html sketch.texi") == 0 or die;
-+ system("makeinfo --html sketch.texi") == 0 or die "$!";
- while (<*.png>) {
- copy($_, "sketch/$_");
- }
-
- print "html, single page:\n";
-- system("makeinfo --html --no-split sketch.texi") == 0 or die;
-+ system("makeinfo --html --no-split sketch.texi") == 0 or die "$!";
-
- # run twice to ensure labels are ok
- print "TeX DVI\n";
-- system("texi2dvi sketch.texi") == 0 or die;
-- system("texi2dvi sketch.texi") == 0 or die;
-+ system("texi2dvi sketch.texi") == 0 or die "$!";
-+ system("texi2dvi sketch.texi") == 0 or die "$!";
-
- print "Postscript:\n";
-- system("dvips sketch.dvi -o sketch.ps") == 0 or die;
-+ system("dvips sketch.dvi -o sketch.ps") == 0 or die "$!";
-
- # texi2dvi finds PNG before the PDF graphics, so delete...
- my @unlink_list = <ex???.png>;
-@@ -75,13 +86,18 @@ sub make_all {
-
- # make PDF manual
- print "PDF:\n";
-- system("texi2dvi --pdf sketch.texi") == 0 or die;
-+ system("texi2dvi --pdf sketch.texi") == 0 or die "$!";
-
- # ... and restore
- for (@unlink_list) {
- copy("sketch/$_", $_);
- }
- }
-+ if ($arg{linux}){
-+ unlink "sketch.texi" || die "$!";
-+ rename "sketch.texi.dist","sketch.texi" || die "$!";
-+ }
-+
- }
-
- if (grep { /help/ } @ARGV) {
---
-tg: (24509a9..) debian/Doc-make-pl (depends on: upstream)
diff --git a/debian/patches/debian/disable-reconfig.diff b/debian/patches/debian/disable-reconfig.diff
deleted file mode 100644
index 14232ab..0000000
--- a/debian/patches/debian/disable-reconfig.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From: David Bremner <bremner at unb.ca>
-Subject: [PATCH] debian/disable-reconfig
-
-disable forced reconfiguration
-
-Signed-off-by: David Bremner <bremner at unb.ca>
-
----
- makefile | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/makefile b/makefile
-index 5593731..e47b457 100644
---- a/makefile
-+++ b/makefile
-@@ -46,9 +46,9 @@ y.tab.c y.tab.h : sketch.y
- lex.yy.c : sketch.l
- $(LEX) $<
-
--version.h : version.dat FORCE
-+version.h : version.dat #FORCE
- perl makever.pl
--FORCE:
-+#FORCE:
-
- .PHONY : dist
- dist : clean
---
-tg: (b622fe6..) debian/disable-reconfig (depends on: master)
diff --git a/debian/patches/debian/disable-src-mods.diff b/debian/patches/debian/disable-src-mods.diff
index cda4e90..da8a924 100644
--- a/debian/patches/debian/disable-src-mods.diff
+++ b/debian/patches/debian/disable-src-mods.diff
@@ -12,10 +12,10 @@ Signed-off-by: David Bremner <bremner at unb.ca>
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/makefile b/makefile
-index 5593731..e47b457 100644
+index 8dad3d1..a08a0fb 100644
--- a/makefile
+++ b/makefile
-@@ -46,9 +46,9 @@ y.tab.c y.tab.h : sketch.y
+@@ -48,9 +48,9 @@ y.tab.c y.tab.h : sketch.y
lex.yy.c : sketch.l
$(LEX) $<
@@ -45,4 +45,4 @@ index c816cf8..75bcf36 100644
run;
--
-tg: (24509a9..) debian/disable-src-mods (depends on: upstream)
+tg: (db99ef1..) debian/disable-src-mods (depends on: upstream)
diff --git a/debian/patches/debian/disable-ver-dat-update.diff b/debian/patches/debian/disable-ver-dat-update.diff
deleted file mode 100644
index f43b54e..0000000
--- a/debian/patches/debian/disable-ver-dat-update.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-From: David Bremner <bremner at unb.ca>
-Subject: [PATCH] debian/disable-ver-dat-update
-
-patch out lines which write a new ver.dat file
-
-Signed-off-by: David Bremner <bremner at unb.ca>
-
----
- makever.pl | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/makever.pl b/makever.pl
-index c816cf8..75bcf36 100644
---- a/makever.pl
-+++ b/makever.pl
-@@ -68,9 +68,9 @@ sub run {
- }
-
- # update the version header
-- open(F, "> version.dat") || die "can't open version.dat for output";
-- print F join('', map { "$_ = $pairs{$_}\n" } keys %pairs);
-- close F;
-+# open(F, "> version.dat") || die "can't open version.dat for output";
-+# print F join('', map { "$_ = $pairs{$_}\n" } keys %pairs);
-+# close F;
- }
-
- run;
---
-tg: (47a62a7..) debian/disable-ver-dat-update (depends on: master)
diff --git a/debian/patches/debian/oldpstricks.diff b/debian/patches/debian/oldpstricks.diff
deleted file mode 100644
index f67f2aa..0000000
--- a/debian/patches/debian/oldpstricks.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From: David Bremner <bremner at unb.ca>
-Subject: [PATCH] debian/oldpstricks
-
-Make the default PsTricks version consistent with that shipped in
-Debian. Note that this patch should be removed when texlive is
-upgraded to 2008/2009.
-
-Signed-off-by: David Bremner <bremner at unb.ca>
-
----
- langver.h | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/langver.h b/langver.h
-index 31c33e2..64d5c64 100644
---- a/langver.h
-+++ b/langver.h
-@@ -38,10 +38,11 @@ int pst_version_cmp(PST_VERSION *a, PST_VERSION *b);
- /* Version 1.20 added linejoin option, where pstverb was
- needed previously. */
- #define PST_LINEJOIN_VERSION 1.20
--
-+#define PST_TEXLIVE_2007_VERSION 1.15
- /* This should be set to the latest version that
- makes a difference for Sketch output. */
--#define ASSUMED_PST_VERSION PST_LINEJOIN_VERSION
-+/* Use version currently in Debian */
-+#define ASSUMED_PST_VERSION PST_TEXLIVE_2007_VERSION
-
- /* TikZ versions are just like PSTricks versions (except
- no letter qualifiers yet */
---
-tg: (c62d897..) debian/oldpstricks (depends on: master)
diff --git a/debian/patches/feature/info-dir.diff b/debian/patches/feature/info-dir.diff
deleted file mode 100644
index 7ea97ab..0000000
--- a/debian/patches/feature/info-dir.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From: David Bremner <bremner at unb.ca>
-Subject: [PATCH] feature/info-dir
-
-add a directory entry to the info file.
-
-Signed-off-by: David Bremner <bremner at unb.ca>
-
----
- Doc/sketch.texi | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/Doc/sketch.texi b/Doc/sketch.texi
-index b85d780..a18d319 100644
---- a/Doc/sketch.texi
-+++ b/Doc/sketch.texi
-@@ -4,6 +4,11 @@
- @include version.texi
- @settitle Sketch
-
-+ at dircategory Graphics
-+ at direntry
-+* Sketch: (sketch). Produce 3D line drawings from scene description language.
-+ at end direntry
-+
- @c an index for sketch commands
- @defcodeindex sx
- @defcodeindex op
---
-tg: (24509a9..) feature/info-dir (depends on: upstream)
diff --git a/debian/patches/series b/debian/patches/series
index cb5e48e..fe92c4f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-debian/Doc-make-pl.diff -p1
debian/disable-src-mods.diff -p1
-feature/info-dir.diff -p1
--
Debian packaging for sketch 3D line drawing software
More information about the debian-science-commits
mailing list