diff -u eukleides-1.5.4/debian/control eukleides-1.5.4/debian/control --- eukleides-1.5.4/debian/control +++ eukleides-1.5.4/debian/control @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Robert Lemmen Build-Depends: debhelper (>= 5), flex, bison, libreadline-dev, texinfo, texlive-base-bin -Standards-Version: 3.9.2.0 +Standards-Version: 3.9.4 Homepage: http://www.eukleides.org/ Package: eukleides diff -u eukleides-1.5.4/debian/changelog eukleides-1.5.4/debian/changelog --- eukleides-1.5.4/debian/changelog +++ eukleides-1.5.4/debian/changelog @@ -1,3 +1,21 @@ +eukleides (1.5.4-3ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - build/Makefile: Use LIBS to pass the libraries to link with, and use it + at the right position in the linker call. + + -- Logan Rosen Tue, 09 Jul 2013 21:25:23 -0400 + +eukleides (1.5.4-3) unstable; urgency=low + + * Fix texi documentation and makefile (closes: #712325) + * Fix a few spelling mistakes in docs + * Enable hardning flags during build + * Update a few smallish packaging problems to keep lintian happier + * Bump standards-version + + -- Robert Lemmen Thu, 04 Jul 2013 17:40:55 +0100 + eukleides (1.5.4-2ubuntu1) raring; urgency=low * Merge from Debian. Rmaining changes: diff -u eukleides-1.5.4/debian/rules eukleides-1.5.4/debian/rules --- eukleides-1.5.4/debian/rules +++ eukleides-1.5.4/debian/rules @@ -3,16 +3,18 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -configure: configure-stamp -configure-stamp: - dh_testdir - touch configure-stamp - -build: build-stamp +CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) + +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp -build-stamp: configure-stamp +build-stamp: dh_testdir - $(MAKE) + CFLAGS="$(CFLAGS) $(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE) touch $@ clean: @@ -25,7 +27,7 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(MAKE) DESTDIR=$(CURDIR)/debian/eukleides install diff -u eukleides-1.5.4/doc/Makefile eukleides-1.5.4/doc/Makefile --- eukleides-1.5.4/doc/Makefile +++ eukleides-1.5.4/doc/Makefile @@ -3,7 +3,7 @@ include ../Config -MAKEHTML = makeinfo --no-validate --html +MAKEHTML = makeinfo --no-validate --html --force TEXI = eukleides.texi CSS = eukleides.css diff -u eukleides-1.5.4/build/Makefile eukleides-1.5.4/build/Makefile --- eukleides-1.5.4/build/Makefile +++ eukleides-1.5.4/build/Makefile @@ -16,8 +16,8 @@ ifneq ($(strip $(LOCALES)),) MOFLAGS = -DMO_DIR=\"$(MO_DIR)\" endif -CFLAGS = -Wall -D__$(BINARY)__ $(IFLAGS) $(MOFLAGS) -LIBS = -lreadline -lm +CFLAGS += -Wall -D__$(BINARY)__ $(IFLAGS) $(MOFLAGS) +LIBS += -lreadline -lm VPATH = $(COMMON_DIR):$(MAIN_DIR):$(BUILD_DIR) $(BINARY): only in patch2: unchanged: --- eukleides-1.5.4.orig/man/eukleides.1 +++ eukleides-1.5.4/man/eukleides.1 @@ -7,7 +7,7 @@ Eukleides is a computer language devoted to elementary plane geometry. It aims to be a fairly comprehensive system to create geometric figures, either static or dynamic. -It allows to handle geometric types of data like points, vectors, +It allows one to handle geometric types of data like points, vectors, lines, circles, or conics. .PP The \fBeukleides\fP program is useful to convert Eukleides scripts only in patch2: unchanged: --- eukleides-1.5.4.orig/man/euktotex.1 +++ eukleides-1.5.4/man/euktotex.1 @@ -7,7 +7,7 @@ Eukleides is a computer language devoted to elementary plane geometry. It aims to be a fairly comprehensive system to create geometric figures, either static or dynamic. -It allows to handle geometric types of data like points, vectors, +It allows one to handle geometric types of data like points, vectors, lines, circles, or conics. .PP The \fBeuktotex\fP script is useful to convert auxiliary Eukleides only in patch2: unchanged: --- eukleides-1.5.4.orig/man/euktopst.1 +++ eukleides-1.5.4/man/euktopst.1 @@ -7,7 +7,7 @@ Eukleides is a computer language devoted to elementary plane geometry. It aims to be a fairly comprehensive system to create geometric figures, either static or dynamic. -It allows to handle geometric types of data like points, vectors, +It allows one to handle geometric types of data like points, vectors, lines, circles, or conics. .PP The \fBeuktopst\fP program interprets Eukleides scripts into PSTricks only in patch2: unchanged: --- eukleides-1.5.4.orig/man/euktopdf.1 +++ eukleides-1.5.4/man/euktopdf.1 @@ -7,7 +7,7 @@ Eukleides is a computer language devoted to elementary plane geometry. It aims to be a fairly comprehensive system to create geometric figures, either static or dynamic. -It allows to handle geometric types of data like points, vectors, +It allows one to handle geometric types of data like points, vectors, lines, circles, or conics. .PP The \fBeuktopdf\fP script is useful to convert auxiliary Eukleides only in patch2: unchanged: --- eukleides-1.5.4.orig/man/euktoeps.1 +++ eukleides-1.5.4/man/euktoeps.1 @@ -7,7 +7,7 @@ Eukleides is a computer language devoted to elementary plane geometry. It aims to be a fairly comprehensive system to create geometric figures, either static or dynamic. -It allows to handle geometric types of data like points, vectors, +It allows one to handle geometric types of data like points, vectors, lines, circles, or conics. .PP The \fBeuktoeps\fP script is useful to convert Eukleides scripts into only in patch2: unchanged: --- eukleides-1.5.4.orig/doc/eukleides.texi +++ eukleides-1.5.4/doc/eukleides.texi @@ -6,12 +6,12 @@ % ------------------------------------------------------------------------------ -\def\LaTeX{L\kern-.34em\raise.49ex\hbox{\sevenrm A}\kern-.18em\TeX} -\def\mdeg{$^\circ$} +\def\LaTeX@{L\kern-.34em\raise.49ex\hbox@{\sevenrm A@}\kern-.18em\TeX@} +\def\mdeg@{$^\circ$@} \font\degfont=cmtt8 -\def\deg{\raise.7ex\hbox{\degfont o}} -\def\exm#1{\noindent{\textit Example:}\quad{\texttt #1}} -\def\exmp{\noindent{\textit Example:}} +\def\deg@{\raise.7ex\hbox@{\degfont o@}@} +\def\exm#1@{\noindent@{\textit Example:@}\quad@{\texttt #1@}@} +\def\exmp@{\noindent@{\textit Example:@}@} % ------------------------------------------------------------------------------ @@ -172,7 +172,7 @@ Eukleides is a computer language devoted to elementary plane geometry. It aims to be a fairly comprehensive system to create geometric figures, either static -or dynamic. It allows to handle basic types of data: numbers and strings, as +or dynamic. It allows one to handle basic types of data: numbers and strings, as well as geometric types of data: points, vectors, sets (of points), lines, circles, and conics. @@ -1560,7 +1560,7 @@ @end example @findex stop -Using the @code{stop} command within a conditional statement allows to abort the +Using the @code{stop} command within a conditional statement allows one to abort the execution of a script when some condition is met. @subheading Boolean operators @@ -1860,7 +1860,7 @@ @subheading Animation -With @command{eukleides}, the @w{@code{--animate}} option allows to generate +With @command{eukleides}, the @w{@code{--animate}} option allows one to generate PostScript files containing several pages which may be converted into animated GIFs (using ImageMagik's @command{convert} for instance). The parameter for this option consists in a single letter followed by an integer number (without @@ -1974,7 +1974,7 @@ @cindex localized keywords Localized versions of the keywords are available (currently German and French). -The @w{@code{--locale}} option allows to specify the desired locale. With no +The @w{@code{--locale}} option allows one to specify the desired locale. With no argument given, the current locale is set to the value of the LANG environment variable. Otherwise the argument has to be a valid locale identifier, e.g. @code{fr_FR} or @code{fr_FR.utf8}, depending on the default charmap. only in patch2: unchanged: --- eukleides-1.5.4.orig/debian/source/format +++ eukleides-1.5.4/debian/source/format @@ -0,0 +1 @@ +1.0