[hamradio-commits] [xnec2c] 03/03: Updated debian files and refreshed patches
Dave Hibberd
hibby-guest at moszumanska.debian.org
Tue Sep 1 22:30:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
hibby-guest pushed a commit to branch master
in repository xnec2c.
commit bf2952bfba3491e9dafbfd67c7d2c9ec40e7952b
Author: Dave Hibberd <d at vehibberd.com>
Date: Tue Sep 1 23:15:05 2015 +0100
Updated debian files and refreshed patches
---
debian/changelog | 8 +++
debian/copyright | 91 ++++++++++++------------------
debian/patches/remove-hardcoded-fpie.patch | 10 ++--
debian/patches/spellings.patch | 12 ++--
po/POTFILES.in | 8 ++-
src/Makefile.am | 2 +-
src/geom_edit.c | 4 +-
src/interface.c | 4 +-
xnec2c.glade | 4 +-
9 files changed, 68 insertions(+), 75 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2b7e0c6..b8c4abc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xnec2c (1:3.4-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ * DEP5 Copyright file
+ * Refreshed patches
+
+ -- Dave Hibberd <d at vehibberd.com> Tue, 01 Sep 2015 22:40:24 +0100
+
xnec2c (1:3.3-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/copyright b/debian/copyright
index 51248a2..699ce37 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,57 +1,36 @@
-This package was debianized by Joop Stakenborg <pa3aba at debian.org> on
-Fri, 1 Dec 2006 21:55:27 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: xnec2c
+Source:
+
+Files: *
+Copyright:
+ xnec2c - GTK2-based version of nec2c, the C translation of NEC2
+License: GPL-2+
+
+Files: debian/*
+Copyright:
+ (C) 2015 Dave Hibberd <d at vehibberd.com>
+ (C) 2014 Colin Tuckley <colint at debian.org>
+ (C) 2012,2013 Kamal Mostafa <kamal at whence.com>
+ (C) 2011 Steve Conklin <steve at conklinhouse.com>
+ (C) 2006,2007,2009 Joop Stakenborg <pa3aba at debian.org>
+License: GPL-2+
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ The GPL License which applies to this package can be found on your Debian
+ system at /usr/share/common-licenses/GPL-2.
-It was downloaded from http://5b4az.chronos.org.uk/pages/nec2.html
-
-Upstream Author: Neoklis Kyriazis <n5b4az at yahoo.com>
-
-From src/main.c:
- * xnec2c - GTK2-based version of nec2c, the C translation of NEC2
- * Copyright (C) 2003-2006 N. Kyriazis <neoklis at mailspeed.net>
-
-License:
-
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Part of this package comes from nec2, which is fortran code released in the
-Public Domain, e.g. src/matrix.c contains the original copyright header:
-
-/******* Translated to the C language by N. Kyriazis 20 Aug 2003 ******
-
- Program NEC(input,tape5=input,output,tape11,tape12,tape13,tape14,
- tape15,tape16,tape20,tape21)
-
- Numerical Electromagnetics Code (NEC2) developed at Lawrence
- Livermore lab., Livermore, CA. (contact G. Burke at 415-422-8414
- for problems with the NEC code. For problems with the vax implem-
- entation, contact J. Breakall at 415-422-8196 or E. Domning at 415
- 422-5936)
- file created 4/11/80.
-
- ***********Notice**********
- This computer code material was prepared as an account of work
- sponsored by the United States government. Neither the United
- States nor the United States Department Of Energy, nor any of
- their employees, nor any of their contractors, subcontractors,
- or their employees, makes any warranty, express or implied, or
- assumes any legal liability or responsibility for the accuracy,
- completeness or usefulness of any information, apparatus, product
- or process disclosed, or represents that its use would not infringe
- privately-owned rights.
-
- ***********************************************************************/
-
-The Debian packaging is (C) Copyright 2006, Joop Stakenborg <pa3aba at debian.org>
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/remove-hardcoded-fpie.patch b/debian/patches/remove-hardcoded-fpie.patch
index 7940a24..6642b91 100644
--- a/debian/patches/remove-hardcoded-fpie.patch
+++ b/debian/patches/remove-hardcoded-fpie.patch
@@ -2,11 +2,11 @@ Description: Don't hardcode -fpie to allow building on s390x and sparc
Author: Iain R. Learmonth <irl at fsfe.org>
Last-Update: 2015-07-21
---- xnec2c.orig/src/Makefile.am
-+++ xnec2c/src/Makefile.am
-@@ -1,7 +1,7 @@
- ## Process this file with automake to produce Makefile.in
- AM_LDFLAGS = -Wl,--as-needed,-z,relro,-z,now
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,7 +2,7 @@
+ #AM_LDFLAGS = -Wl,--as-needed, -z,relro, -z,now
+
AM_CFLAGS = --pedantic -Wall -std=gnu99 -O2 -D_FORTIFY_SOURCE=2 \
- -fstack-protector -Wformat -Werror=format-security -fpie
+ -fstack-protector -Wformat -Werror=format-security
diff --git a/debian/patches/spellings.patch b/debian/patches/spellings.patch
index bcb7959..1fe4c82 100644
--- a/debian/patches/spellings.patch
+++ b/debian/patches/spellings.patch
@@ -1,6 +1,6 @@
Fix minor spelling errors
---- xnec2c.orig/xnec2c.glade
-+++ xnec2c/xnec2c.glade
+--- a/xnec2c.glade
++++ b/xnec2c.glade
@@ -6183,7 +6183,7 @@
<property name="border_width">2</property>
<property name="visible">True</property>
@@ -19,8 +19,8 @@ Fix minor spelling errors
<property name="license" translatable="yes">GPL v2 or higher</property>
<property name="wrap_license">False</property>
<property name="website">http://www.qsl.net/5b4az</property>
---- xnec2c.orig/src/geom_edit.c
-+++ xnec2c/src/geom_edit.c
+--- a/src/geom_edit.c
++++ b/src/geom_edit.c
@@ -667,7 +667,7 @@
save = TRUE;
break;
@@ -39,8 +39,8 @@ Fix minor spelling errors
gtk_widget_hide( lookup_widget(patch_editor, "patch_sc_frame") );
gtk_widget_hide( lookup_widget(patch_editor, "patch_sm_frame") );
gtk_window_resize( GTK_WINDOW(patch_editor), 10, 10 );
---- xnec2c.orig/src/interface.c
-+++ xnec2c/src/interface.c
+--- a/src/interface.c
++++ b/src/interface.c
@@ -3659,7 +3659,7 @@
gtk_widget_show (hbox22);
gtk_container_add (GTK_CONTAINER (alignment13), hbox22);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b48df4f..452c32a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,10 +11,16 @@ src/geom_edit.c
src/geometry.c
src/ground.c
src/matrix.c
-src/misc.c
+src/utils.c
src/nec2_model.c
src/plot_freqdata.c
src/radiation.c
src/support.c
src/xnec2c.c
xnec2c.glade
+#List of source files to be added according to installer
+src/gnuplot.c
+src/input.c
+src/network.c
+src/somnec.c
+
diff --git a/src/Makefile.am b/src/Makefile.am
index 9886e76..a32b6ba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
#AM_LDFLAGS = -Wl,--as-needed, -z,relro, -z,now
AM_CFLAGS = --pedantic -Wall -std=gnu99 -O2 -D_FORTIFY_SOURCE=2 \
- -fstack-protector -Wformat -Werror=format-security -fpie
+ -fstack-protector -Wformat -Werror=format-security
AM_CPPFLAGS = \
-DPROGRAMNAME_LOCALEDIR=\""$(PROGRAMNAME_LOCALEDIR)"\" \
diff --git a/src/geom_edit.c b/src/geom_edit.c
index f9d2769..7fd1228 100644
--- a/src/geom_edit.c
+++ b/src/geom_edit.c
@@ -667,7 +667,7 @@ Patch_Editor( int action )
save = TRUE;
break;
- case PATCH_EDITOR_ARBT: /* Arbitary-shaped patch */
+ case PATCH_EDITOR_ARBT: /* Arbitrary-shaped patch */
ptype = PATCH_ARBT;
ptset = FALSE;
save = TRUE;
@@ -749,7 +749,7 @@ Patch_Editor( int action )
/* Hide/Show parts of window as needed */
switch( ptype )
{
- case PATCH_ARBT: /* Arbitary shaped patch */
+ case PATCH_ARBT: /* Arbitrary shaped patch */
gtk_widget_hide( lookup_widget(patch_editor, "patch_sc_frame") );
gtk_widget_hide( lookup_widget(patch_editor, "patch_sm_frame") );
gtk_window_resize( GTK_WINDOW(patch_editor), 10, 10 );
diff --git a/src/interface.c b/src/interface.c
index b48e015..1bf12b7 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -3659,7 +3659,7 @@ create_patch_editor (void)
gtk_widget_show (hbox22);
gtk_container_add (GTK_CONTAINER (alignment13), hbox22);
- patch_arbitrary_radiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("Arbitary"));
+ patch_arbitrary_radiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("Arbitrary"));
gtk_widget_show (patch_arbitrary_radiobutton);
gtk_box_pack_start (GTK_BOX (hbox22), patch_arbitrary_radiobutton, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (patch_arbitrary_radiobutton), 2);
@@ -10138,7 +10138,7 @@ create_aboutdialog (void)
gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (aboutdialog), VERSION);
gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (aboutdialog), _("Xnec2c"));
gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG (aboutdialog), _("(C) 2007-2010 Neoklis Kyriazis"));
- gtk_about_dialog_set_comments (GTK_ABOUT_DIALOG (aboutdialog), _("xnec2c is an interactive graphical wrapper around a modified version of nec2c, which is itself a translation to C of the original FORTRAN NEC2 Numerical Electromagnetics Code.\n\nxnec2c can display frequency-dependent data (gain, input impedance, vswr etc) in a graphical format. It can also display radiation pattern data in a rotatable wire frame format and near-field (E, H, S vectors) in a grid format.\n\nxnec2c has a b [...]
+ gtk_about_dialog_set_comments (GTK_ABOUT_DIALOG (aboutdialog), _("xnec2c is an interactive graphical wrapper around a modified version of nec2c, which is itself a translation to C of the original FORTRAN NEC2 Numerical Electromagnetics Code.\n\nxnec2c can display frequency-dependent data (gain, input impedance, vswr etc) in a graphical format. It can also display radiation pattern data in a rotatable wire frame format and near-field (E, H, S vectors) in a grid format.\n\nxnec2c has a b [...]
gtk_about_dialog_set_license (GTK_ABOUT_DIALOG (aboutdialog), _("GPL v2 or higher"));
gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (aboutdialog), "http://www.qsl.net/5b4az");
gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (aboutdialog), authors);
diff --git a/xnec2c.glade b/xnec2c.glade
index 042b65c..d31a82d 100644
--- a/xnec2c.glade
+++ b/xnec2c.glade
@@ -6183,7 +6183,7 @@ to Plane of Screen</property>
<property name="border_width">2</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Arbitary</property>
+ <property name="label" translatable="yes">Arbitrary</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -19620,7 +19620,7 @@ xnec2c can display frequency-dependent data (gain, input impedance, vswr etc) in
xnec2c has a built-in NEC2 input file editor that makes it easier to create or edit antenna description files and specify NEC2 commands.
-PLEASE read the documantation in the doc/ sub-directory as xnec2c is not fully compatible with NEC2 input files and it works in different ways!</property>
+PLEASE read the documentation in the doc/ sub-directory as xnec2c is not fully compatible with NEC2 input files and it works in different ways!</property>
<property name="license" translatable="yes">GPL v2 or higher</property>
<property name="wrap_license">False</property>
<property name="website">http://www.qsl.net/5b4az</property>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/xnec2c.git
More information about the pkg-hamradio-commits
mailing list