r47039 - in /packages/gspiceui/trunk/debian: changelog control gspiceui.desktop patches/01_makefile.patch patches/02_fix_compilation.patch patches/04_gwave.patch patches/05_manual_path.patch patches/series rules
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Thu May 21 13:01:53 UTC 2015
Author: gudjon-guest
Date: Thu May 21 13:01:53 2015
New Revision: 47039
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47039
Log:
* New release version
* Bump standards version to 3.9.6
* Change wx dependencies to version 3.0 (Closes: #750743)
* Fix project homepage in control file
Modified:
packages/gspiceui/trunk/debian/changelog
packages/gspiceui/trunk/debian/control
packages/gspiceui/trunk/debian/gspiceui.desktop
packages/gspiceui/trunk/debian/patches/01_makefile.patch
packages/gspiceui/trunk/debian/patches/02_fix_compilation.patch
packages/gspiceui/trunk/debian/patches/04_gwave.patch
packages/gspiceui/trunk/debian/patches/05_manual_path.patch
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=47039&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/changelog (original)
+++ packages/gspiceui/trunk/debian/changelog Thu May 21 13:01:53 2015
@@ -1,8 +1,8 @@
-gspiceui (1.0.58svn201+dfsg-1) unstable; urgency=medium
+gspiceui (1.1.00+dfsg-1) UNRELEASED; urgency=medium
- * New svn version (Closes: #750743)
- * Bump standards version to 3.9.5
- * Change wx dependencies to version 3.0
+ * New release version
+ * Bump standards version to 3.9.6
+ * Change wx dependencies to version 3.0 (Closes: #750743)
* Update copyright file, new download site and license changed to GPL-3
* Add patch 01_makefile to fix errors in makefile
* Add patch 02_fix_compilation to fix a source file
@@ -15,8 +15,9 @@
* Add patch to change gwave2 to gwave
* Add more information on how to download sources to README.Debian
* Add patch 05_manual_path to fix path to html manual
+ * Fix project homepage in control file
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Thu, 10 Jul 2014 09:04:25 +0000
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Fri, 11 Jul 2014 08:57:18 +0000
gspiceui (1.0.00+dfsg-1) unstable; urgency=low
Modified: packages/gspiceui/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/control?rev=47039&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/control (original)
+++ packages/gspiceui/trunk/debian/control Thu May 21 13:01:53 2015
@@ -2,12 +2,12 @@
Section: electronics
Priority: optional
Maintainer: Gudjon I. Gudjonsson <gudjon at gudjon.org>
-Build-Depends: debhelper (>= 8), libwxbase3.0-dev, libwxgtk3.0-dev
-Standards-Version: 3.9.5
-Homepage: http://www.geda.seul.org/tools/gspiceui/
+Build-Depends: debhelper (>= 8), libwxgtk3.0-dev
+Standards-Version: 3.9.6
+Homepage: http://sourceforge.net/projects/gspiceui/
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
+#DM-Upload-Allowed: yes
Package: gspiceui
Architecture: any
Modified: packages/gspiceui/trunk/debian/gspiceui.desktop
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/gspiceui.desktop?rev=47039&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/gspiceui.desktop (original)
+++ packages/gspiceui/trunk/debian/gspiceui.desktop Thu May 21 13:01:53 2015
@@ -1,5 +1,5 @@
[Desktop Entry]
-Version=1.0.58
+Version=1.0
Name=GSpiceUI
GenericName=GNU Spice GUI
Comment=Graphical frontend to Spice simulators
Modified: 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=47039&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/patches/01_makefile.patch (original)
+++ packages/gspiceui/trunk/debian/patches/01_makefile.patch Thu May 21 13:01:53 2015
@@ -1,91 +1,60 @@
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)
+@@ -76,12 +76,12 @@
+ TAR_SRCS+=gspiceui-$(TAR_VER)/html/*.html
+ TAR_SRCS+=gspiceui-$(TAR_VER)/html/*.png
+ TAR_SRCS+=gspiceui-$(TAR_VER)/html/*.jpg
+-TAR_SRCS+=gspiceui-$(TAR_VER)/sch/Makefile
+-TAR_SRCS+=gspiceui-$(TAR_VER)/sch/*/*.sch
+-TAR_SRCS+=gspiceui-$(TAR_VER)/lib/Makefile
+-TAR_SRCS+=gspiceui-$(TAR_VER)/lib/models/*.ckt
+-TAR_SRCS+=gspiceui-$(TAR_VER)/lib/models/*.mod
+-TAR_SRCS+=gspiceui-$(TAR_VER)/lib/symbols/*
++#TAR_SRCS+=gspiceui-$(TAR_VER)/sch/Makefile
++#TAR_SRCS+=gspiceui-$(TAR_VER)/sch/*/*.sch
++#TAR_SRCS+=gspiceui-$(TAR_VER)/lib/Makefile
++#TAR_SRCS+=gspiceui-$(TAR_VER)/lib/models/*.ckt
++#TAR_SRCS+=gspiceui-$(TAR_VER)/lib/models/*.mod
++#TAR_SRCS+=gspiceui-$(TAR_VER)/lib/symbols/*
+ TAR_SRCS+=gspiceui-$(TAR_VER)/mac/Info.plist
+ TAR_SRCS+=gspiceui-$(TAR_VER)/mac/GSpiceUI.icns
+ TAR_SRCS+=gspiceui-$(TAR_VER)/svg/Makefile
+@@ -135,7 +135,7 @@
+ cd $(ROOT)/src ; $(MAKE) install DESTDIR=$(DESTDIR)
+ cd $(ROOT)/html ; $(MAKE) install DESTDIR=$(DESTDIR)
+ cd $(ROOT)/sch ; $(MAKE) install DESTDIR=$(DESTDIR)
+- cd $(ROOT)/lib ; $(MAKE) install DESTDIR=$(DESTDIR)
++# cd $(ROOT)/lib ; $(MAKE) install DESTDIR=$(DESTDIR)
- #******************************************************************************
+ #***************************************************************************************************
# Perform uninstall tasks
-@@ -157,7 +157,7 @@
+@@ -161,7 +161,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,10 +62,10 @@
- # Compiler options
+@@ -71,7 +71,7 @@
+ # -Og Optimize debugging experience but don't break debugging
ifeq ($(GSPICEUI_DBG),0)
# Options for release (not using -Wall since it's GCC specific)
-- CXXFLAGS := -Ofast -pipe $(shell $(WXCFG) --cxxflags)
-+ CXXFLAGS += $(shell $(WXCFG) --cxxflags)
+- CXXFLAGS := -O1 -pipe $(shell $(WXCFG) --cxxflags)
++ CXXFLAGS := -O1 -pipe $(CXXFLAGS) $(shell $(WXCFG) --cxxflags)
else
# Options for development
-- CXXFLAGS := -Wall -g -pipe $(shell $(WXCFG) --cxxflags)
-+ CXXFLAGS := -Wall -g $(shell $(WXCFG) --cxxflags)
- ifeq ($(GSPICEUI_WXLIB),2.8) # This suppresses warnings from gcc v4.8.1 with wxWidgets v2.8.12
- CXXFLAGS += -Wno-unused-local-typedefs
- endif
-@@ -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
-@@ -123,7 +123,7 @@
+ CXXFLAGS := -g -Og -Wall -Wextra -pipe $(shell $(WXCFG) --cxxflags)
+@@ -134,7 +134,7 @@
# -o specify the output file name
$(BINDIR)/$(PROG) : $(OBJS)
- $(CXX) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LIBS)
-+ $(CXX) $(LDFLAGS) -o $(BINDIR)/$(PROG) obj/*.o $(LIBS)
++ $(CXX) -pipe $(LDFLAGS) $(CXXFLAGS) -o $(BINDIR)/$(PROG) obj/*.o $(LIBS)
ifeq ($(ROOT)/GSpiceUI.app,$(wildcard $(ROOT)/GSpiceUI.app))
cp $(BINDIR)/$(PROG) $(ROOT)/GSpiceUI.app/Contents/MacOS/gspiceui
endif
-@@ -156,7 +156,7 @@
- test_StrUtils
-
- # Compiler options
--test_% : CXXFLAGS = -Wall -g -pipe $(shell $(WXCFG) --cxxflags)
-+test_% : CXXFLAGS = -Wall -g $(shell $(WXCFG) --cxxflags)
- ifeq ($(GSPICEUI_WXLIB),2.8) # This suppresses warnings from gcc v4.8.1 with wxWidgets v2.8.12
- test_% : CXXFLAGS += -Wno-unused-local-typedefs
- endif
Modified: 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=47039&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/patches/02_fix_compilation.patch (original)
+++ packages/gspiceui/trunk/debian/patches/02_fix_compilation.patch Thu May 21 13:01:53 2015
@@ -1,7 +1,7 @@
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 @@
+@@ -155,6 +155,7 @@
wxString m_osTRSTEPG;
wxString m_osTRSTEPH;
wxString m_osTRSTEPS;
Modified: packages/gspiceui/trunk/debian/patches/04_gwave.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/patches/04_gwave.patch?rev=47039&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/patches/04_gwave.patch (original)
+++ packages/gspiceui/trunk/debian/patches/04_gwave.patch Thu May 21 13:01:53 2015
@@ -1,7 +1,7 @@
Change program name from gwave2 to gwave
--- a/src/TypeDefs.hpp
+++ b/src/TypeDefs.hpp
-@@ -67,7 +67,7 @@
+@@ -104,7 +104,7 @@
#define BIN_GNETLIST wxT("gnetlist")
#define BIN_GSCHEM wxT("gschem")
Modified: packages/gspiceui/trunk/debian/patches/05_manual_path.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/patches/05_manual_path.patch?rev=47039&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/patches/05_manual_path.patch (original)
+++ packages/gspiceui/trunk/debian/patches/05_manual_path.patch Thu May 21 13:01:53 2015
@@ -1,7 +1,7 @@
Fix path to html manual
--- a/src/main/HelpTasks.cpp
+++ b/src/main/HelpTasks.cpp
-@@ -212,7 +212,7 @@
+@@ -211,7 +211,7 @@
// Specify the two locations to search
os1 = rosGetInstallPath( );
if( os1.IsEmpty( ) ) return;
Modified: packages/gspiceui/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/patches/series?rev=47039&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/patches/series (original)
+++ packages/gspiceui/trunk/debian/patches/series Thu May 21 13:01:53 2015
@@ -1,5 +1,5 @@
+01_makefile.patch
+#02_fix_compilation.patch
+03_manpage.patch
04_gwave.patch
-01_makefile.patch
-02_fix_compilation.patch
-03_manpage.patch
05_manual_path.patch
Modified: packages/gspiceui/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/rules?rev=47039&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/rules (original)
+++ packages/gspiceui/trunk/debian/rules Thu May 21 13:01:53 2015
@@ -4,16 +4,12 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-#CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-#CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-#CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-#LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+# Compile at -O1 instead of -O2 for now to work around:
+# /usr/include/wx-3.0/wx/ctrlsub.h:144: undefined reference to `non-virtual thunk to wxListBoxBase::IsSorted() const'
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS|sed 's/-O2//') $(CPPFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,-Bsymbolic-functions
build: build-arch build-indep
build-arch: build-arch-stamp
@@ -38,7 +34,7 @@
dh_testroot
dh_prep
dh_installdirs
- $(MAKE) INSTALLDIR=$(CURDIR)/debian/gspiceui/usr install
+ $(MAKE) DESTDIR=$(CURDIR)/debian/gspiceui/usr install
rm -f debian/gspiceui/usr/share/gspiceui/INSTALL
mv -f debian/gspiceui/usr/share/gspiceui/* debian/gspiceui/usr/share/doc/gspiceui/
rmdir debian/gspiceui/usr/share/gspiceui
More information about the debian-science-commits
mailing list