From: Jeff E. <gi...@gi...> - 2013-10-28 12:09:28
|
Merge branch 'v2.5_branch' Conflicts: debian/control.in docs/src/ladder/classic_ladder_de.txt docs/src/ladder/classic_ladder_pl.txt http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=86b8036 debian/control.in | 3 ++- docs/src/Master_Getting_Started_es.txt | 2 ++ docs/src/Master_Getting_Started_fr.txt | 1 + docs/src/Master_HAL_fr.txt | 1 + docs/src/Master_Integrator_fr.txt | 1 + docs/src/Master_User_fr.txt | 1 + docs/src/Submakefile | 2 +- docs/src/common/Getting_linuxcnc_fr.txt | 2 +- docs/src/common/images/axis_2.5_fr.png | Bin 22622 -> 0 bytes docs/src/common/images/axis_25_fr.png | Bin 0 -> 22622 bytes docs/src/common/user_intro_fr.txt | 2 +- docs/src/gui/axis_fr.txt | 2 +- docs/src/gui/images/axis_2.5_fr.png | Bin 22622 -> 0 bytes docs/src/gui/images/axis_25_fr.png | Bin 0 -> 22622 bytes docs/src/ladder/classic_ladder.txt | 2 +- docs/src/ladder/classic_ladder_es.txt | 2 +- docs/src/ladder/classic_ladder_fr.txt | 2 +- docs/src/ladder/images/Editor_N.O.Input.png | Bin 8176 -> 0 bytes docs/src/ladder/images/Editor_NO_Input.png | Bin 0 -> 8176 bytes src/Makefile.inc.in | 1 + src/configure.in | 31 +++++++++++++++++++++++----- 21 files changed, 42 insertions(+), 13 deletions(-) diff --cc debian/control.in index 0366a69,db998a0..f830939 --- a/debian/control.in +++ b/debian/control.in @@@ -10,9 -10,8 +10,10 @@@ Build-Depends: debhelper (>= 6) python, python-dev, python-support, python-tk, python-lxml, libglu1-mesa-dev, libgl1-mesa-dev | libgl1-mesa-swx11-dev, libgtk2.0-dev, libgnomeprintui2.2-dev, - gettext, autoconf, texlive-lang-cyrillic, texlive-lang-french, + gettext, autoconf, libboost-python-dev, - texlive-lang-cyrillic, netcat, ++ texlive-lang-cyrillic, texlive-lang-french, + texlive-lang-spanish, texlive-lang-german, netcat + libmodbus-dev (>= 3.0) Standards-Version: 2.1.0 Package: @MAIN_PACKAGE_NAME@-dev diff --cc src/Makefile.inc.in index f40892f,8b40682..5d79e7c --- a/src/Makefile.inc.in +++ b/src/Makefile.inc.in @@@ -133,12 -133,8 +133,13 @@@ BUILD_DOCS_PDF = @BUILD_DOCS_PDF BUILD_DOCS_HTML = @BUILD_DOCS_HTML@ LYX = @LYX@ PYTHON = @PYTHON@ + A2X_LATEX_ENCODING = @A2X_LATEX_ENCODING@ +HAVE_LIBMODBUS3 = @HAVE_LIBMODBUS3@ +LIBMODBUS_LIBS = @LIBMODBUS_LIBS@ +LIBMODBUS_CFLAGS = @LIBMODBUS_CFLAGS@ + + # # i18n # |