Commit 0361feb0 authored by Dave Hibberd's avatar Dave Hibberd

Upstream import, cleanup, dh11, new standards.

parent fd85272d
xnec2c (1:4.1.1-1) unstable; urgency=medium
* New Upstream Release
- Patches Refreshed
* Updated to dh11
* Updated to Debian Standards 4.3.0.1
* debian/control
- new Vcs URIs added
* debian/copyright
- Added secure copyright URI
* debian/patches folder
- cleared up unused files
* debian/xnex2c.install
- updated to reflect new file locations
-- Dave Hibberd <d@vehibberd.com> Thu, 27 Dec 2018 23:40:34 +0000
xnec2c (1:3.6.1~beta-1) unstable; urgency=medium
* New Upstream Release
......@@ -248,4 +265,3 @@ xnec2c (1.0b-1) unstable; urgency=low
* Initial release
-- Joop Stakenborg <pa3aba@debian.org> Fri, 1 Dec 2006 21:55:27 +0100
......@@ -4,9 +4,9 @@ Priority: optional
Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org>
Uploaders: Steve Conklin <steve@conklinhouse.com>, Kamal Mostafa <kamal@whence.com>, Colin Tuckley <colint@debian.org>, Dave Hibberd <d@vehibberd.com>
Build-Depends: debhelper (>= 11), libgtk-3-dev,intltool (>= 0.50.0)
Standards-Version: 4.1.3
VCS-Browser: https://anonscm.debian.org/cgit/pkg-hamradio/xnec2c.git
Vcs-Git: https://anonscm.debian.org/git/pkg-hamradio/xnec2c.git
Standards-Version: 4.3.0.1
VCS-Browser: https://salsa.debian.org/debian-hamradio-team/xnec2c
Vcs-Git: https://salsa.debian.org/debian-hamradio-team/xnec2c.git
Homepage: http://www.5b4az.org/
Package: xnec2c
......
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: xnec2c
Source: http://www.5b4az.org/pkg/nec2/xnec2c/xnec2c-3.4.tar.bz2
......
Description: Adds new files with translatable strings to POTFILES.in, as advised by the installer
Author: Dave Hibberd <d@vehibberd.com>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -18,3 +18,9 @@
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
+
Description: Cleaning up the file for Lintian compatability
Description: Cleaning up the file for Lintian compatibility
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2018-01-20
Last-Update: 2018-12-27
--- a/files/xnec2c.desktop
+++ b/files/xnec2c.desktop
@@ -1,6 +1,5 @@
[Desktop Entry]
Version=1.0
-Encoding=UTF-8
Name=xnec2c
Comment=Antenna analysis
Exec=xnec2c -j4
@@ -8,3 +7,4 @@
@@ -2,9 +2,11 @@
Name=Xnec2c
GenericName=GTK+ version of NEC2
Comment=Numerical Electromagnetics Code software
+Encoding=UTF-8
Exec=xnec2c
Icon=xnec2c
Terminal=false
Type=Application
Categories=HamRadio;Science;Utility
Categories=Science;Math;NumericalAnalysis;
X-Desktop-File-Install-Version=0.22
+Keywords=antenna;design;analysis;radio
Description: renaming misc.c to utils.c to match upstream code changes
Author: Dave Hibberd <d@vehibberd.com>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,7 +11,7 @@
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
Description: Install glade file to a shared location
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2018-01-20
--- a/src/main.c
+++ b/src/main.c
@@ -175,7 +175,7 @@
gtk_init (&argc, &argv);
/* Create home folder paths for glade file and NEC2 files */
- Strlcpy( xnec2c_glade, getenv("HOME"), sizeof(xnec2c_glade) );
+ Strlcpy( xnec2c_glade, "/usr/share", sizeof(xnec2c_glade) );
Strlcat( xnec2c_glade, "/xnec2c/xnec2c.glade", sizeof(xnec2c_glade) );
Strlcpy( xnec2c_files, getenv("HOME"), sizeof(xnec2c_files) );
Strlcat( xnec2c_files, "/xnec2c/nec2_files/", sizeof(xnec2c_files) );
This diff is collapsed.
Description: Remove manual install of files
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2018-01-20
Last-Update: 2018-12-27
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,26 +44,3 @@
po/Makefile.in.in \
po/xnec2c.pot \
Makefile
-
-install-data-local:
- @$(NORMAL_INSTALL)
- if test -d files/; then \
- mkdir -p $(DESTDIR)/usr/share/applications/; \
- cp files/$(PACKAGE).desktop $(DESTDIR)/usr/share/applications/; \
- cp files/$(PACKAGE).png $(DESTDIR)/usr/share/pixmaps/; \
- mkdir -p $(DESTDIR)/usr/share/pixmaps/; \
- mkdir -p $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/; \
- cp files/$(PACKAGE).svg $(DESTDIR)/usr/share/pixmaps/; \
- cp files/$(PACKAGE).svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/; \
- mkdir -p $(DESTDIR)/usr/share/$(PACKAGE); \
- cp files/$(PACKAGE).glade $(DESTDIR)/usr/share/$(PACKAGE); \
- cp files/link.svg files/unlink.svg $(DESTDIR)/usr/share/$(PACKAGE); \
- fi; \
- if !(test -d $(DESTDIR)/usr/share/doc/$(PACKAGE)); then \
- mkdir $(DESTDIR)/usr/share/doc/$(PACKAGE)/; \
- mkdir $(DESTDIR)/usr/share/doc/$(PACKAGE)/examples/; \
- mkdir -p $(DESTDIR)/usr/share/doc/$(PACKAGE)/examples/; \
- cp examples/* $(DESTDIR)/usr/share/doc/$(PACKAGE)/examples/; \
- fi; \
- if test -d doc/; then \
- cp -r doc/* $(DESTDIR)/usr/share/doc/$(PACKAGE)/; \
- mkdir -p $(DESTDIR)/usr/share/man/man1/; \
- cp -r doc/$(PACKAGE).1.gz $(DESTDIR)/usr/share/man/man1/; \
- cp examples/* $(DESTDIR)/usr/share/doc/$(PACKAGE)/examples/; \
- fi; \
- if !(test -d /home/`logname`/$(PACKAGE)); then \
- cp -r $(PACKAGE) /home/`logname`/; \
- else \
- cp $(PACKAGE)/$(PACKAGE).glade /home/`logname`/$(PACKAGE); \
- fi; \
- chown -R `logname`:`logname` /home/`logname`/$(PACKAGE);
- fi;
-
Description: Don't hardcode -fpie to allow building on s390x and sparc
Author: Iain R. Learmonth <irl@fsfe.org>
Last-Update: 2016-09-08
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
AM_LDFLAGS = -Wl,--as-needed
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)"\" \
glade.patch
makefile.patch
desktop-entry.patch
Description: Fix minor spelling errors
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2016-09-08
--- a/xnec2c.glade
+++ b/xnec2c.glade
@@ -6183,7 +6183,7 @@
<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 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>
--- a/src/geom_edit.c
+++ b/src/geom_edit.c
@@ -685,7 +685,7 @@
save = TRUE;
break;
- case PATCH_EDITOR_ARBT: /* Arbitary-shaped patch */
+ case PATCH_EDITOR_ARBT: /* Arbitrary-shaped patch */
ptype = PATCH_ARBT;
ptset = FALSE;
save = TRUE;
@@ -767,7 +767,7 @@
/* 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 );
--- a/src/interface.c
+++ b/src/interface.c
@@ -3662,7 +3662,7 @@
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);
@@ -10141,7 +10141,7 @@
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 built-in NEC2 input file editor that makes it easier to create or edit antenna description files and specify NEC2 commands.\n\nPLEASE read the documantation in the doc/ sub-directory as xnec2c is not fully compatible with NEC2 input files and it works in different ways!"));
+ 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 built-in NEC2 input file editor that makes it easier to create or edit antenna description files and specify NEC2 commands.\n\nPLEASE read the documentation in the doc/ sub-directory as xnec2c is not fully compatible with NEC2 input files and it works in different ways!"));
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);
files/xnec2c.desktop usr/share/applications/
files/xnec2c.png usr/share/pixmaps/
files/xnec2c.svg usr/share/pixmaps/
doc/* usr/share/doc/xnec2c/
examples/* usr/share/doc/xnec2c/examples/
xnec2c/xnec2c.glade usr/share/xnec2c/
files/xnec2c.glade usr/share/xnec2c/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment