Commit a9e51779 authored by Ximin Luo's avatar Ximin Luo

Update changelog and patches

parent 12062e43
giac (1.4.9.69+dfsg1-1~exp1) UNRELEASED; urgency=medium
* New upstream release.
-- Ximin Luo <infinity0@debian.org> Sun, 29 Jul 2018 03:23:14 -0700
giac (1.2.3.57+dfsg1-2) unstable; urgency=medium
* Fix shell syntax typo, fixes the doc build.
......
This diff is collapsed.
......@@ -10,7 +10,7 @@ Forwarded: TODO
- std::string cmd="hevea -fix "+infile_+" &";
+ std::string cmd="hevea -fix "+infile_;
COUT << "Running " << cmd << endl;
system(cmd.c_str());
giac::system_no_deprecation(cmd.c_str());
}
@@ -749,8 +749,8 @@
if (pos>=0 && pos<ss){
......@@ -20,6 +20,6 @@ Forwarded: TODO
- std::string cmd="hevea -fix "+giac::remove_extension(infile)+" &";
+ COUT << "File " << outfile << " created, now running hevea and pgiac " << outfile << endl << "Then I will run pdflatex " << giac::remove_extension(outfile) << endl << "For HTML5 output, you can run\nhevea -fix " << giac::remove_extension(infile) << endl;
+ std::string cmd="hevea -fix "+giac::remove_extension(infile);
system(cmd.c_str());
giac::system_no_deprecation(cmd.c_str());
cmd=("pgiac "+outfile+" && pdflatex "+giac::remove_extension(outfile)+" && mv "+giac::remove_extension(outfile)+".pdf "+giac::remove_extension(infile)+".pdf");
COUT << cmd << endl;
......@@ -6,16 +6,16 @@ Forwarded: not-needed
@@ -1,6 +1,6 @@
-SUBDIRS = src check intl po debianold debian doc examples
-DIST_SUBDIRS = src check intl po debianold debian doc examples
-EXTRA_DIST = path.h.in setup inst TROUBLES Init.scm compte INSTALACION LEAME.WIN LEAME.ipaq giac.specs giac.specs32 fltk.1.1.changes README.MACOSX pariinl.h changeversion mkosx mkosx10 mkosx3 mkdebian mkdebian2 win2unix.cc addu.cc xcas*.nsi xcas.desktop xcas.xpm xcas.applications README.visualcpp java.README config.h.win win64 mkiphone build_for_iphoneos path.iphone simupath.iphone config.h.iphone config.h.64 config.h.mingw path.mingw configure.mingw README.mingw archive.mingw compile.android mkrpm icons/*
-EXTRA_DIST = path.h.in setup inst TROUBLES Init.scm compte INSTALACION LEAME.WIN LEAME.ipaq giac.specs giac.specs32 fltk.1.1.changes README.MACOSX pariinl.h changeversion mkosx mkosx10 mkosx3 mkdebian mkdebian2 win2unix.cc addu.cc xcas*.nsi xcas.desktop xcas.xpm xcas.applications README.visualcpp java.README config.h.win win64 mkiphone build_for_iphoneos path.iphone simupath.iphone config.h.iphone config.h.64 config.h.mingw path.mingw configure.mingw README.mingw archive.mingw compile.android mkrpm LISEZMOI.numworks icons/*
+SUBDIRS = src check intl po doc examples
+DIST_SUBDIRS = src check intl po doc examples
+EXTRA_DIST = path.h.in setup inst TROUBLES Init.scm compte INSTALACION LEAME.WIN LEAME.ipaq giac.specs giac.specs32 fltk.1.1.changes README.MACOSX pariinl.h changeversion mkosx mkosx10 mkosx3 win2unix.cc addu.cc xcas*.nsi xcas.desktop xcas.xpm xcas.applications README.visualcpp java.README config.h.win win64 mkiphone build_for_iphoneos path.iphone simupath.iphone config.h.iphone config.h.64 config.h.mingw path.mingw configure.mingw README.mingw archive.mingw compile.android mkrpm icons/*
+EXTRA_DIST = path.h.in setup inst TROUBLES Init.scm compte INSTALACION LEAME.WIN LEAME.ipaq giac.specs giac.specs32 fltk.1.1.changes README.MACOSX pariinl.h changeversion mkosx mkosx10 mkosx3 win2unix.cc addu.cc xcas*.nsi xcas.desktop xcas.xpm xcas.applications README.visualcpp java.README config.h.win win64 mkiphone build_for_iphoneos path.iphone simupath.iphone config.h.iphone config.h.64 config.h.mingw path.mingw configure.mingw README.mingw archive.mingw compile.android mkrpm LISEZMOI.numworks icons/*
# Rule to build tar-bzipped distribution package
$(PACKAGE)-$(VERSION).tar.gz: dist
--- a/configure.in
+++ b/configure.in
@@ -399,8 +399,6 @@
@@ -431,8 +431,6 @@
doc/es/Makefile
doc/fr/Makefile
doc/el/Makefile
......@@ -24,7 +24,7 @@ Forwarded: not-needed
doc/local/Makefile
doc/pt/Makefile
doc/zh/Makefile
@@ -408,8 +406,6 @@
@@ -440,8 +438,6 @@
intl/Makefile
po/Makefile.in
examples/Makefile
......@@ -64,9 +64,9 @@ Forwarded: not-needed
@@ -1,6 +1,6 @@
SUBDIRS = en es fr el local pt zh de
DIST_SUBDIRS = en es fr el local pt zh de
-XCASHTML = xcasfr.html xcasen.html codemirror.css codemirror.js xcasmode.js giac.js matchbrackets.js FileSaver.js logo.png longhelp.js giac.tex giacfr.tex test.tex testfr.tex test.html testfr.html menufr.js menuen.js show-hint.js show-hint.css w3data.js algoseconde.html
+XCASHTML = xcasfr.html xcasen.html xcasmode.js giac.js matchbrackets.js FileSaver.js logo.png longhelp.js giac.tex giacfr.tex test.tex testfr.tex test.html testfr.html menufr.js menuen.js algoseconde.html
EXTRA_DIST = aide_cas README index.html $(XCASHTML) dxcas/* pari/*
-XCASHTML = xcasfr.html xcasfrwasm.html xcasen.html *.css *.js giac.wasm logo.png giac.tex giacfr.tex test.tex testfr.tex test.html testfr.html algolycee.html graphtheory-user_manual.pdf
+XCASHTML = xcasfr.html xcasfrwasm.html xcasen.html *.css *.js logo.png giac.tex giacfr.tex test.tex testfr.tex test.html testfr.html algolycee.html graphtheory-user_manual.pdf
EXTRA_DIST = aide_cas README index.html $(XCASHTML) dxcas/* pari/*
dist_pkgdata_DATA = aide_cas
@@ -8,12 +8,10 @@
......@@ -85,16 +85,16 @@ Forwarded: not-needed
--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -1,6 +1,6 @@
TEX_LOCAL = cascmd_en.tex casinter.tex cas.tex slipres.tex giacxcas.tex
TEX_LOCAL = cascmd_en.tex casinter.tex cas.tex slipres.tex giacxcas.tex tutoriel.tex
-PDF_LOCAL = cascmd_en.pdf casinter.pdf cas.pdf troussesurvie_en.pdf
+PDF_LOCAL = cascmd_en.pdf casinter.pdf cas.pdf
PS_LOCAL = cascmd_en.ps casinter.ps cas.ps
@@ -32,10 +32,9 @@
$(srcdir)/cascmd_en: cascmd_en.stamp
@@ -34,10 +34,9 @@
$(srcdir)/casinter: casinter.stamp
$(srcdir)/tutoriel: tutoriel.stamp
-install-data-local: $(HTML_STAMPS) $(PS_LOCAL) $(DVI_LOCAL) troussesurvie_en.pdf # $(PDF_LOCAL)
+install-data-local: $(HTML_STAMPS) $(PS_LOCAL) $(DVI_LOCAL) # $(PDF_LOCAL)
......
Description: Fix build for machines that have 48-bit virtual addresses
Author: Edmund Grimley Evans <edmund.grimley.evans@gmail.com>
Bug: http://xcas.e.ujf-grenoble.fr/XCAS/viewtopic.php?f=4&t=1785
--- a/src/Equation.cc
+++ b/src/Equation.cc
@@ -616,7 +616,7 @@
return Equation_compute_size(arg,a,windowhsize,contextptr);
gen tmp;
#ifdef SMARTPTR64
- * ((longlong * ) &tmp) = longlong(new ref_fraction(Tfraction<gen>(arg._VECTptr->front(),arg._VECTptr->back()))) << 16;
+ * ((ulonglong * ) &tmp) = ulonglong(new ref_fraction(Tfraction<gen>(arg._VECTptr->front(),arg._VECTptr->back()))) << 16;
#else
tmp.__FRACptr = new ref_fraction(Tfraction<gen>(arg._VECTptr->front(),arg._VECTptr->back()));
#endif
--- a/src/sym2poly.cc
+++ b/src/sym2poly.cc
@@ -406,8 +406,8 @@
#ifndef SMARTPTR64
n.__POLYptr->ref_count==1 && d.__POLYptr->ref_count==1
#else
- ((ref_polynome*)(* (longlong *) &n >> 16))->ref_count ==1 &&
- ((ref_polynome*)(* (longlong *) &d >> 16))->ref_count ==1
+ ((ref_polynome*)(* (ulonglong *) &n >> 16))->ref_count ==1 &&
+ ((ref_polynome*)(* (ulonglong *) &d >> 16))->ref_count ==1
#endif
){
simplify(*n._POLYptr,*d._POLYptr,pptr->t);
--- a/src/usual.cc
+++ b/src/usual.cc
@@ -9866,14 +9866,14 @@
const gen & grad2rad_g=grad2rad_g_;
#else
// Warning this does not work on ia64 with -O2
- const define_alias_gen(alias_rad2deg_g,_DOUBLE_, (*(longlong *)&rad2deg_d) >> 8,(*(longlong *)&rad2deg_d)>>16);
+ const define_alias_gen(alias_rad2deg_g,_DOUBLE_, (*(ulonglong *)&rad2deg_d) >> 8,(*(ulonglong *)&rad2deg_d)>>16);
const gen & rad2deg_g = *(const gen*) & alias_rad2deg_g;
- const define_alias_gen(alias_deg2rad_g,_DOUBLE_, (*(longlong *)&deg2rad_d) >> 8,(*(longlong *)&deg2rad_d)>>16);
+ const define_alias_gen(alias_deg2rad_g,_DOUBLE_, (*(ulonglong *)&deg2rad_d) >> 8,(*(ulonglong *)&deg2rad_d)>>16);
const gen & deg2rad_g = *(const gen*) & alias_deg2rad_g;
//grad
- const define_alias_gen(alias_rad2grad_g,_DOUBLE_, (*(longlong *)&rad2grad_d) >> 8,(*(longlong *)&rad2grad_d)>>16);
+ const define_alias_gen(alias_rad2grad_g,_DOUBLE_, (*(ulonglong *)&rad2grad_d) >> 8,(*(ulonglong *)&rad2grad_d)>>16);
const gen & rad2grad_g = *(const gen*) & alias_rad2grad_g;
- const define_alias_gen(alias_grad2rad_g, _DOUBLE_, (*(longlong *)&grad2rad_d) >> 8, (*(longlong *)&grad2rad_d) >> 16);
+ const define_alias_gen(alias_grad2rad_g, _DOUBLE_, (*(ulonglong *)&grad2rad_d) >> 8, (*(ulonglong *)&grad2rad_d) >> 16);
const gen & grad2rad_g = *(const gen*)& alias_grad2rad_g;
#endif
......@@ -40,9 +40,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
- input_lexer.h input_parser.h threaded.h vector.h \
+ path.h \
+ input_lexer.h threaded.h vector.h \
help.cc # Ugh..
help.cc lpsolve.cc optimization.cc signalprocessing.cc \
graphe.cc graphtheory.cc # Ugh..
libgiac_la_LIBADD = $(NTL_LIBS) $(COCOA_LIBS) $(PARI_LIBS) $(GSL_LIBS)
@@ -95,3 +96,8 @@
## $(INSTALL_DATA) $(libgiac_la_SOURCES) $(DESTDIR)$(docdir)/src
## $(INSTALL_DATA) $(top_srcdir)/config.h $(DESTDIR)$(includedir)/giac
......
# For upstreaming
changeset_55367.patch
fix-48-bit-addr.patch
fix-gettext-options.patch
no-useless-deps.patch
system-gl2ps.patch
......
......@@ -14,8 +14,8 @@ Forwarded: TODO
#include <AGL/agl.h>
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,17 +28,17 @@
static_help.h giacPCH.h giacintl.h gmp_replacements.h myostream.h
@@ -30,17 +30,17 @@
lpsolve.h optimization.h signalprocessing.h graphe.h graphtheory.h
noinst_LTLIBRARIES = libxcas.la
-libxcas_la_LIBADD = libgiac.la $(GUI_LIBS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment