[SCM] Packaging for mathgl branch, master, updated. debian/1.11.1.1-3-4-gb9b9086
Dimitrios Eftaxiopoulos
eftaxi12 at otenet.gr
Tue Jun 28 20:20:55 UTC 2011
The following commit has been merged in the master branch:
commit 86972ffb9b35b5b88c215dc5b64eef04e15e3ce6
Merge: 417f8a2fa3b6412ae81d22253ee6f3f05bd21511 2bb536d47e3fa1fc22cc2aa03d35919c92937eb6
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Tue Jun 28 16:39:20 2011 +0300
Merge commit 'upstream/1.11.2'
Conflicts:
autom4te.cache/output.0
autom4te.cache/output.1
autom4te.cache/requests
autom4te.cache/traces.0
autom4te.cache/traces.1
diff --combined texinfo/Makefile.in
index 9389045,a9cf8ed..37bc413
--- a/texinfo/Makefile.in
+++ b/texinfo/Makefile.in
@@@ -182,6 -182,7 +182,7 @@@ LIPO = @LIPO
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
MGL_AGE = @MGL_AGE@
MGL_CURRENT = @MGL_CURRENT@
MGL_RELEASE = @MGL_RELEASE@
@@@ -242,6 -243,7 +243,7 @@@ abs_builddir = @abs_builddir
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@@ -275,7 -277,6 +277,6 @@@ libdir = @libdir
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
- lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@@ -297,8 -298,7 +298,8 @@@ top_builddir = @top_builddir
top_srcdir = @top_srcdir@
SUBDIRS = png .
CLEANFILES = mathgl_en.info mathgl_en.info-1 mathgl_en.info-2 mathgl_en.info-3 mgl_en.info \
-mathgl_ru.info mathgl_ru.info-1 mathgl_ru.info-2 mathgl_ru.info-3 mathgl_ru.info-4 mgl_ru.info
+mathgl_ru.info mathgl_ru.info-1 mathgl_ru.info-2 mathgl_ru.info-3 mathgl_ru.info-4 mgl_ru.info \
+mgl_ru.info-*
MAKEINFOHTML = texi2html
TEXI2PDF = texi2pdf
--
Packaging for mathgl
More information about the debian-science-commits
mailing list