r46779 - in /packages/gspiceui/trunk/debian: ./ patches/
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Tue Jul 1 07:06:54 UTC 2014
Author: gudjon-guest
Date: Tue Jul 1 07:06:53 2014
New Revision: 46779
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46779
Log:
* New svn version (Closes: #750743)
* Bump standards version to 3.9.5
* Change wx dependencies to version 3.0
* Update copyright file, new download site and license changed to GPL-3
* Add patches 01_makefile and 02_fix_compilation
* Fix description (Closes: #749860)
* Remove dependency on gwave, gwave is not available in Debian
* Make vcs fields canonical
* Add hardening wrappers
Added:
packages/gspiceui/trunk/debian/patches/01_makefile.patch
packages/gspiceui/trunk/debian/patches/02_fix_compilation.patch
Removed:
packages/gspiceui/trunk/debian/patches/01_docpath.diff
packages/gspiceui/trunk/debian/patches/02_manpage.diff
packages/gspiceui/trunk/debian/patches/03_fix_xpm_header.diff
packages/gspiceui/trunk/debian/patches/04_close_pipe.diff
packages/gspiceui/trunk/debian/patches/04_makefile.diff
Modified:
packages/gspiceui/trunk/debian/changelog
packages/gspiceui/trunk/debian/control
packages/gspiceui/trunk/debian/copyright
packages/gspiceui/trunk/debian/gspiceui.desktop
packages/gspiceui/trunk/debian/menu
packages/gspiceui/trunk/debian/patches/series
packages/gspiceui/trunk/debian/rules
Modified: packages/gspiceui/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/changelog?rev=46779&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/changelog (original)
+++ packages/gspiceui/trunk/debian/changelog Tue Jul 1 07:06:53 2014
@@ -1,3 +1,17 @@
+gspiceui (1.0.58svn201+dfsg-1) UNRELEASED; urgency=medium
+
+ * New svn version (Closes: #750743)
+ * Bump standards version to 3.9.5
+ * Change wx dependencies to version 3.0
+ * Update copyright file, new download site and license changed to GPL-3
+ * Add patches 01_makefile and 02_fix_compilation
+ * Fix description (Closes: #749860)
+ * Remove dependency on gwave, gwave is not available in Debian
+ * Make vcs fields canonical
+ * Add hardening wrappers
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Tue, 24 Jun 2014 08:29:19 +0000
+
gspiceui (1.0.00+dfsg-1) unstable; urgency=low
[ Gudjon I. Gudjonsson ]
Modified: packages/gspiceui/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/control?rev=46779&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/control (original)
+++ packages/gspiceui/trunk/debian/control Tue Jul 1 07:06:53 2014
@@ -2,21 +2,21 @@
Section: electronics
Priority: optional
Maintainer: Gudjon I. Gudjonsson <gudjon at gudjon.org>
-Build-Depends: debhelper (>= 8), libwxbase2.8-dev, libwxgtk2.8-dev
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 8), libwxbase3.0-dev, libwxgtk3.0-dev
+Standards-Version: 3.9.5
Homepage: http://www.geda.seul.org/tools/gspiceui/
-Vcs-Svn: svn://svn.debian.org/debian-science/packages/gspiceui/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/gspiceui/trunk
+Vcs-Svn: svn://anonscm.debian.org/debian-science/packages/gspiceui/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-science/packages/gspiceui/trunk
DM-Upload-Allowed: yes
Package: gspiceui
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gwave, geda-gschem, geda-gnetlist
+Depends: ${shlibs:Depends}, ${misc:Depends}, geda-gschem, geda-gnetlist
Recommends: gnucap
Suggests: ngspice
Description: Graphical user interface for gnucap and ngspice
Gspiceui is a graphichal user interface for the two freely available
- electronic circuit engines: GNU-Cap and Ng-Spice
+ electronic circuit engines: GNU-Cap and Ng-Spice.
Current features are:
* Import gschem schematic files using gentlist.
* Load and parse circuit description (net list) files.
@@ -25,4 +25,3 @@
* Provides a GUI interface for Ng-Spice DC, AC and Transient analyses and
generates appropriate simulator commands based on user input.
* The raw output may be viewed for any processes initiated by gspiceui.
- * Formatting of simulator output so that it may be plotted using gwave
Modified: packages/gspiceui/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/copyright?rev=46779&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/copyright (original)
+++ packages/gspiceui/trunk/debian/copyright Tue Jul 1 07:06:53 2014
@@ -1,32 +1,22 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: ftp://ftp.geda.seul.org/pub/geda/dist/
+Source: http://sourceforge.net/projects/gspiceui/
Files: *
Copyright: 2003-2011 Mike Waters <M.Waters at bom.gov.au>
-License: GPL-2
+License: GPL-3
Files: debian/*
Copyright: 2007-2012 Gudjon I. Gudjonsson <gudjon at gudjon.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
- version 2.
- .
- 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 package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA
- .
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
+License: GPL-3
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
+
Modified: packages/gspiceui/trunk/debian/gspiceui.desktop
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/gspiceui.desktop?rev=46779&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/gspiceui.desktop (original)
+++ packages/gspiceui/trunk/debian/gspiceui.desktop Tue Jul 1 07:06:53 2014
@@ -1,5 +1,5 @@
[Desktop Entry]
-Version=1.0.00
+Version=1.0.58
Name=GSpiceUI
GenericName=GNU Spice GUI
Comment=Graphical frontend to Spice simulators
@@ -8,5 +8,5 @@
Type=Application
Icon=gspiceui-32x32.xpm
StartupNotify=true
-Categories=Engineering;Electronics;
-
+Keywords=Electronics,CAD,Simulator
+Categories=Engineering;Electronics
Modified: packages/gspiceui/trunk/debian/menu
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/menu?rev=46779&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/menu (original)
+++ packages/gspiceui/trunk/debian/menu Tue Jul 1 07:06:53 2014
@@ -4,5 +4,5 @@
longtitle="Graphical SPICE user interface" \
description="A Graphical User Interface (GUI) to various\
freely available Spice electronic circuit simulators."\
- icon="gspiceui-32x32.xpm"\
+ icon="/usr/share/pixmaps/gspiceui-32x32.xpm"\
command="/usr/bin/gspiceui"
Added: packages/gspiceui/trunk/debian/patches/01_makefile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/patches/01_makefile.patch?rev=46779&op=file
==============================================================================
--- packages/gspiceui/trunk/debian/patches/01_makefile.patch (added)
+++ packages/gspiceui/trunk/debian/patches/01_makefile.patch Tue Jul 1 07:06:53 2014
@@ -0,0 +1,87 @@
+Remove lib directory from compilation and add LDFLAGS
+--- a/Makefile
++++ b/Makefile
+@@ -81,10 +81,10 @@
+ TAR_SRCS+=$(TAR_NAME)/html/*.jpg
+ TAR_SRCS+=$(TAR_NAME)/sch/Makefile
+ TAR_SRCS+=$(TAR_NAME)/sch/*/*.sch
+-TAR_SRCS+=$(TAR_NAME)/lib/Makefile
+-TAR_SRCS+=$(TAR_NAME)/lib/*/*.ckt
+-TAR_SRCS+=$(TAR_NAME)/lib/*/*.mod
+-TAR_SRCS+=$(TAR_NAME)/lib/sym/*
++#TAR_SRCS+=$(TAR_NAME)/lib/Makefile
++#TAR_SRCS+=$(TAR_NAME)/lib/*/*.ckt
++#TAR_SRCS+=$(TAR_NAME)/lib/*/*.mod
++#TAR_SRCS+=$(TAR_NAME)/lib/sym/*
+ TAR_SRCS+=$(TAR_NAME)/mac/Info.plist
+ TAR_SRCS+=$(TAR_NAME)/mac/GSpiceUI.icns
+ TAR_SRCS+=$(TAR_NAME)/svg/Makefile
+@@ -138,7 +138,7 @@
+ cd $(ROOT)/src ; $(MAKE) install INSTALLDIR=$(INSTALLDIR)
+ cd $(ROOT)/html ; $(MAKE) install INSTALLDIR=$(INSTALLDIR)
+ cd $(ROOT)/sch ; $(MAKE) install INSTALLDIR=$(INSTALLDIR)
+- cd $(ROOT)/lib ; $(MAKE) install INSTALLDIR=$(INSTALLDIR)
++# cd $(ROOT)/lib ; $(MAKE) install INSTALLDIR=$(INSTALLDIR)
+
+ #******************************************************************************
+ # Perform uninstall tasks
+@@ -157,7 +157,7 @@
+ cd $(ROOT)/src ; $(MAKE) cleanall
+ cd $(ROOT)/html ; $(MAKE) clean
+ cd $(ROOT)/sch ; $(MAKE) clean
+- cd $(ROOT)/lib ; $(MAKE) clean
++# cd $(ROOT)/lib ; $(MAKE) clean
+
+ #******************************************************************************
+ # Specify phony targets
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -26,10 +26,10 @@
+ #******************************************************************************
+
+ # Create bin file containing debug information (ie. for gdb)
+-GSPICEUI_DBG = 1
++GSPICEUI_DBG = 0
+
+ # Specify the version of the wxWidgets library to compile against
+-GSPICEUI_WXLIB = 2.8
++GSPICEUI_WXLIB = 3.0
+
+ #******************************************************************************
+ # Specify string values
+@@ -62,7 +62,7 @@
+ # Compiler options
+ ifeq ($(GSPICEUI_DBG),0)
+ # Options for release (not using -Wall since it's GCC specific)
+- CXXFLAGS := -Ofast -pipe $(shell $(WXCFG) --cxxflags)
++ CXXFLAGS += -Ofast -pipe $(shell $(WXCFG) --cxxflags)
+ else
+ # Options for development
+ CXXFLAGS := -Wall -g -pipe $(shell $(WXCFG) --cxxflags)
+@@ -76,7 +76,7 @@
+
+ # Libraries
+ # (The pkg-config stuff was requested by a user, somehow pangox was missing)
+-LIBS := $(shell $(WXCFG) --libs core,base,html) \
++LIBS := $(shell $(WXCFG) --libs) \
+ $(shell pkg-config --libs-only-l pangox)
+
+ # Objects
+@@ -115,7 +115,7 @@
+ # -o place output file in $@
+
+ obj/%.o : %.cpp
+- $(CXX) -c $(CXXFLAGS) $(INCLUDES) $< -o $@
++ $(CXX) -c $(CXXFLAGS) $(LDFLAGS) $(INCLUDES) $< -o $@
+ @echo
+
+ # Linker Rules :
+@@ -123,7 +123,7 @@
+ # -o specify the output file name
+
+ $(BINDIR)/$(PROG) : $(OBJS)
+- $(CXX) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LIBS)
++ $(CXX) $(LDFLAGS) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LIBS)
+ ifeq ($(ROOT)/GSpiceUI.app,$(wildcard $(ROOT)/GSpiceUI.app))
+ cp $(BINDIR)/$(PROG) $(ROOT)/GSpiceUI.app/Contents/MacOS/gspiceui
+ endif
Added: packages/gspiceui/trunk/debian/patches/02_fix_compilation.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/patches/02_fix_compilation.patch?rev=46779&op=file
==============================================================================
--- packages/gspiceui/trunk/debian/patches/02_fix_compilation.patch (added)
+++ packages/gspiceui/trunk/debian/patches/02_fix_compilation.patch Tue Jul 1 07:06:53 2014
@@ -0,0 +1,11 @@
+Add m_osSRCSTEPS, the program doesn't compile without it
+--- a/src/gnucap/commands/CmdGnuCapOPT.hpp
++++ b/src/gnucap/commands/CmdGnuCapOPT.hpp
+@@ -161,6 +161,7 @@
+ wxString m_osTRSTEPG;
+ wxString m_osTRSTEPH;
+ wxString m_osTRSTEPS;
++ wxString m_osSRCSTEPS;
+ wxString m_osTRTOL;
+ wxString m_osVFLOOR;
+ wxString m_osVMAX;
Modified: packages/gspiceui/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/patches/series?rev=46779&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/patches/series (original)
+++ packages/gspiceui/trunk/debian/patches/series Tue Jul 1 07:06:53 2014
@@ -1,5 +1,3 @@
-01_docpath.diff
-02_manpage.diff
-03_fix_xpm_header.diff
-#04_close_pipe.diff
-04_makefile.diff
+01_makefile.patch
+02_fix_compilation.patch
+03_manpage.patch
Modified: packages/gspiceui/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/rules?rev=46779&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/rules (original)
+++ packages/gspiceui/trunk/debian/rules Tue Jul 1 07:06:53 2014
@@ -4,7 +4,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-CFLAGS = -Wall -g
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -Wall -g
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
More information about the debian-science-commits
mailing list