[Pkg-electronics-commits] [gerbv] 04/04: Release 2.6.1-3.1
أحمد المحمودي (Ahmed El-Mahmoudy)
aelmahmoudy at users.sourceforge.net
Sun Nov 19 09:01:08 UTC 2017
This is an automated email from the git hooks/post-receive script.
aelmahmoudy-guest pushed a commit to branch master
in repository gerbv.
commit d5eb2de2c9a9e73caea6d29a8565300a44a955de
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date: Sun Nov 19 09:46:38 2017 +0100
Release 2.6.1-3.1
---
configure.ac | 4 ++--
debian/changelog | 9 +++++++++
desktop/gerbv.desktop | 1 -
man/Makefile.am | 2 +-
man/gerbv.1.in | 10 +++++-----
po/LINGUAS | 2 +-
src/pick-and-place.c | 23 ++++-------------------
7 files changed, 22 insertions(+), 29 deletions(-)
diff --git a/configure.ac b/configure.ac
index 41ff9c8..eb6a6c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,8 +185,8 @@ fi
AM_CONDITIONAL(HAVE_MAGICK, test x$have_magick = xyes)
# Check for pkg-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test "$PKG_CONFIG" = "no"; then
+PKG_PROG_PKG_CONFIG
+if test "x$PKG_CONFIG" = "x"; then
AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
fi
diff --git a/debian/changelog b/debian/changelog
index 90d049e..925841e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gerbv (2.6.1-3.1) unstable; urgency=medium
+
+ * Add cross.patch to fix cross builds.
+ Thanks to Helmut Grohne <helmut at subdivi.de> (Closes: #879855)
+ * Update standards version to 4.1.1
+ * No need for autotools-dev sequence and dh-autoreconf dependency since we are using compat level 10
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net> Sun, 19 Nov 2017 09:58:28 +0100
+
gerbv (2.6.1-2) unstable; urgency=medium
* Team upload.
diff --git a/desktop/gerbv.desktop b/desktop/gerbv.desktop
index a8842ba..4c58f4d 100644
--- a/desktop/gerbv.desktop
+++ b/desktop/gerbv.desktop
@@ -1,6 +1,5 @@
[Desktop Entry]
Version=1.0
-Encoding=UTF-8
Name=Gerbv Gerber File Viewer
Name[ru]= Gerbv — просмотр Gerber-файлов
GenericName=Gerber File Viewer
diff --git a/man/Makefile.am b/man/Makefile.am
index 4870e71..d906acd 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -19,7 +19,7 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
-man_MANS = gerbv.1 gerbv.ru.1
+man_MANS = gerbv.1
PO_FILES= gerbv.ru.1.in.po
MOSTLYCLEANFILES = *~
diff --git a/man/gerbv.1.in b/man/gerbv.1.in
index c6f8df9..e91926c 100644
--- a/man/gerbv.1.in
+++ b/man/gerbv.1.in
@@ -32,7 +32,7 @@ e.g. #FF0000 for Red.
Use foreground color <hex>. <hex> is specified as an html-color code,
e.g. #00FF00 for Green. If a user also wants to set the alpha (rendering
with Cairo) it can be specified as an #RRGGBBAA code. Use multiple
--f flags to set the color for multiple layers.
+\-f flags to set the color for multiple layers.
.TP
.BI -l\ <filename>|--log=<filename>
All error messages etc are stored in a file with filename \fI<filename>\fP.
@@ -45,7 +45,7 @@ Load a stored project. Please note that the project file must be stored in
the same directory as the gerber files.
.SS gerbv Export-specific options:
-The following commands can be used in combination with the -x flag:
+The following commands can be used in combination with the \-x flag:
.TP
.BI -B<b>|--Border=<b>
Set the border around the image <b> percent of the width and height.
@@ -58,7 +58,7 @@ render engine). Use <R> to have the same resolution in both directions.
Defaults to 72 DPI in both directions.
.TP
.BI -T<X,Y>|--translate=<X,Y>
-Translate the image by the distance <X,Y>. Use multiple -T flags to translate
+Translate the image by the distance <X,Y>. Use multiple \-T flags to translate
multiple files.
.TP
.BI -O<XxY>|--origin=<XxY>
@@ -183,7 +183,7 @@ way to create a project is to load all files you want into the layer
you want, set all the colors etc and do a "Save Project As...".
You load a project either from the menu bar or by using the commandline
-switches -p or --project.
+switches \-p or \-\-project.
Currently there is a limit in that the project file must be in the same
directory as the gerber files to be loaded.
@@ -217,7 +217,7 @@ A standard practice with Eagle is to create an empty Tools file, run the
CAM processor, and the error report tells you which tools you "forgot".
Then you put these tools into the file and rerun the CAM processor.
-You load a tool file by using the commandline switches -t or --tools.
+You load a tool file by using the commandline switches \-t or \-\-tools.
The file can have any name you wish, but Eagle expects the file type to
be ".drl", so it makes sense to keep it this way. Some board houses are
still using CAM software from DOS era, so you may want to excercise caution
diff --git a/po/LINGUAS b/po/LINGUAS
index 562ba4c..8b13789 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1 @@
-ru
+
diff --git a/src/pick-and-place.c b/src/pick-and-place.c
index ab50337..23d1cd1 100644
--- a/src/pick-and-place.c
+++ b/src/pick-and-place.c
@@ -56,7 +56,6 @@
#include "gerbv.h"
#include "gerber.h"
-#include "main.h"
#ifdef RENDER_USING_GDK
#include "draw-gdk.h"
#else
@@ -161,36 +160,22 @@ pick_and_place_reset_bounding_box (gerbv_net_t *net) {
}
//! Parses a string representing float number with a unit, default is mil
-static double
-pick_and_place_get_float_unit(char *str)
+static double
+pick_and_place_get_float_unit(const char *str)
{
double x = 0.0;
char unit[41];
- extern gerbv_screen_t screen;
/* float, optional space, optional unit mm,cm,in,mil */
sscanf(str, "%lf %40s", &x, unit);
if(strstr(unit,"in")) {
;
- } else if(strstr(unit, "mil")) {
- x /= 1000;
} else if(strstr(unit, "cm")) {
x /= 2.54;
} else if(strstr(unit, "mm")) {
x /= 25.4;
- } else { /* default to GUI units */
- switch (screen.unit) {
- case GERBV_INS:
- break;
- case GERBV_MILS:
- x /= 1000;
- break;
- case GERBV_MMS:
- x /= 25.4;
- break;
- default:
- assert(screen.unit);
- }
+ } else { /* default to mils */
+ x /= 1000;
}
return x;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gerbv.git
More information about the Pkg-electronics-commits
mailing list