[SCM] Debian packaging for sketch 3D line drawing software branch, build, updated. debian/0.2.89-1-61-ga8aafc8
David Bremner
bremner at unb.ca
Sun Jan 10 01:31:04 UTC 2010
The following commit has been merged in the build branch:
commit a8aafc84843b74a12304d1c75d7cbe97f77887ef
Author: David Bremner <bremner at unb.ca>
Date: Sat Jan 9 20:19:26 2010 -0400
re-export patches from topgit
diff --git a/debian/patches/debian/Doc-make-pl.diff b/debian/patches/debian/Doc-make-pl.diff
index 868ef87..5b28454 100644
--- a/debian/patches/debian/Doc-make-pl.diff
+++ b/debian/patches/debian/Doc-make-pl.diff
@@ -5,12 +5,13 @@ convert doc making script for linux and add debugging output
Signed-off-by: David Bremner <bremner at unb.ca>
+
---
- Doc/make.pl | 36 ++++++++++++++++++------------------
- 1 files changed, 18 insertions(+), 18 deletions(-)
+ Doc/make.pl | 58 +++++++++++++++++++++++++++++++++++++---------------------
+ 1 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/Doc/make.pl b/Doc/make.pl
-index f43bcfd..c2f9cce 100644
+index f43bcfd..5b2eb78 100644
--- a/Doc/make.pl
+++ b/Doc/make.pl
@@ -4,7 +4,6 @@
@@ -21,7 +22,7 @@ index f43bcfd..c2f9cce 100644
our $MEM_OPTION = "--extra-mem-top=5000000"; # MikTeX 2.7
# our $MEM_OPTION = ""; # MikTeX 2.6
-@@ -13,25 +12,26 @@ sub make_example {
+@@ -13,34 +12,36 @@ sub make_example {
die "missing example name" unless $ex;
my %arg = map { $_ => 1 } @_;
@@ -45,19 +46,24 @@ index f43bcfd..c2f9cce 100644
- 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;
+- local *F;
- open(F, "> $ex.txt") or die;
-+ open(F, "> $ex.txt") or die "$!";
- print F "Image $ex omitted in text version of this document.";
- close F;
+- 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;
++
}
-@@ -40,7 +40,7 @@ sub make_all {
+
+ sub make_all {
my %arg = map { $_ => 1 } @_;
if ($arg{examples}) {
local *F;
@@ -66,8 +72,20 @@ index f43bcfd..c2f9cce 100644
while (<F>) {
if (/<([^>]*)>/) {
make_example $1, @_;
-@@ -50,24 +50,24 @@ sub make_all {
+@@ -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;
@@ -97,7 +115,7 @@ index f43bcfd..c2f9cce 100644
# texi2dvi finds PNG before the PDF graphics, so delete...
my @unlink_list = <ex???.png>;
-@@ -75,7 +75,7 @@ sub make_all {
+@@ -75,13 +86,18 @@ sub make_all {
# make PDF manual
print "PDF:\n";
@@ -106,5 +124,16 @@ index f43bcfd..c2f9cce 100644
# ... 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: (8d08b2a..) debian/Doc-make-pl (depends on: master)
+tg: (24509a9..) debian/Doc-make-pl (depends on: upstream)
diff --git a/debian/patches/debian/disable-src-mods.diff b/debian/patches/debian/disable-src-mods.diff
new file mode 100644
index 0000000..cda4e90
--- /dev/null
+++ b/debian/patches/debian/disable-src-mods.diff
@@ -0,0 +1,48 @@
+From: David Bremner <bremner at unb.ca>
+Subject: [PATCH] debian/disable-src-mods
+
+Disable several buildtime modifications of the source that complicate
+building the debian package, and are not needed in this context.
+
+Signed-off-by: David Bremner <bremner at unb.ca>
+
+---
+ makefile | 4 ++--
+ makever.pl | 6 +++---
+ 2 files changed, 5 insertions(+), 5 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
+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: (24509a9..) debian/disable-src-mods (depends on: upstream)
diff --git a/debian/patches/feature/info-dir.diff b/debian/patches/feature/info-dir.diff
index 1d2021c..7ea97ab 100644
--- a/debian/patches/feature/info-dir.diff
+++ b/debian/patches/feature/info-dir.diff
@@ -10,7 +10,7 @@ Signed-off-by: David Bremner <bremner at unb.ca>
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Doc/sketch.texi b/Doc/sketch.texi
-index 9e67d75..4470c6c 100644
+index b85d780..a18d319 100644
--- a/Doc/sketch.texi
+++ b/Doc/sketch.texi
@@ -4,6 +4,11 @@
@@ -26,4 +26,4 @@ index 9e67d75..4470c6c 100644
@defcodeindex sx
@defcodeindex op
--
-tg: (5996dda..) feature/info-dir (depends on: upstream)
+tg: (24509a9..) feature/info-dir (depends on: upstream)
diff --git a/debian/patches/series b/debian/patches/series
index 66251ae..cb5e48e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
debian/Doc-make-pl.diff -p1
-debian/disable-reconfig.diff -p1
-debian/disable-ver-dat-update.diff -p1
-debian/oldpstricks.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