r44035 - in /packages/gspiceui/trunk/debian: changelog control gspiceui.desktop patches/02_manpage.diff patches/04_makefile.diff patches/series rules

gudjon-guest at users.alioth.debian.org gudjon-guest at users.alioth.debian.org
Sun Nov 20 20:48:25 UTC 2011 

Author: gudjon-guest
Date: Sun Nov 20 20:48:20 2011
New Revision: 44035

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44035
Log:
* New upstream release
* Comment out patch 04_close_pipe.diff. Already in upstream
* Bump standards version to 3.9.2
* Minor fix to 02_manpage patch
* Add build-arch and build-indep targets
* Change desktop category from Science to Engineering;Electronics
* Minor fix to manpage
* Remove duplicate changelog file.

Added:
    packages/gspiceui/trunk/debian/patches/04_makefile.diff
Modified:
    packages/gspiceui/trunk/debian/changelog
    packages/gspiceui/trunk/debian/control
    packages/gspiceui/trunk/debian/gspiceui.desktop
    packages/gspiceui/trunk/debian/patches/02_manpage.diff
    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=44035&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/changelog (original)
+++ packages/gspiceui/trunk/debian/changelog Sun Nov 20 20:48:20 2011
@@ -1,3 +1,16 @@
+gspiceui (1.0.00+dfsg-1) unstable; urgency=low
+
+  * New upstream release
+  * Comment out patch 04_close_pipe.diff. Already in upstream
+  * Bump standards version to 3.9.2
+  * Minor fix to 02_manpage patch
+  * Add build-arch and build-indep targets
+  * Change desktop category from Science to Engineering;Electronics
+  * Minor fix to manpage
+  * Remove duplicate changelog file.
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sun, 20 Nov 2011 21:47:43 +0100
+
 gspiceui (0.9.99+dfsg-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/gspiceui/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/control?rev=44035&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/control (original)
+++ packages/gspiceui/trunk/debian/control Sun Nov 20 20:48:20 2011
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Gudjon I. Gudjonsson <gudjon at gudjon.org>
 Build-Depends: debhelper (>= 5), libwxbase2.8-dev, libwxgtk2.8-dev, quilt
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://www.geda.seul.org/tools/gspiceui/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/gspiceui/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/gspiceui/trunk
@@ -14,7 +14,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, gwave, geda-gschem, geda-gnetlist
 Recommends: gnucap
 Suggests: ngspice
-Description: A graphical user interface for gnucap and 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
  Current features are:

Modified: packages/gspiceui/trunk/debian/gspiceui.desktop
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/gspiceui.desktop?rev=44035&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/gspiceui.desktop (original)
+++ packages/gspiceui/trunk/debian/gspiceui.desktop Sun Nov 20 20:48:20 2011
@@ -1,9 +1,12 @@
 [Desktop Entry]
+Version=1.0.00
 Name=GSpiceUI
+GenericName=GNU Spice GUI
 Comment=Graphical frontend to Spice simulators
 Exec=gspiceui
 Terminal=false
 Type=Application
 Icon=gspiceui-32x32.xpm
-Categories=Science;
 StartupNotify=true
+Categories=Engineering;Electronics;
+

Modified: packages/gspiceui/trunk/debian/patches/02_manpage.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/patches/02_manpage.diff?rev=44035&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/patches/02_manpage.diff (original)
+++ packages/gspiceui/trunk/debian/patches/02_manpage.diff Sun Nov 20 20:48:20 2011
@@ -2,8 +2,17 @@
 --- a/gspiceui.1
 +++ b/gspiceui.1
 @@ -1,4 +1,4 @@
--.TH "gspiceui" "10" "February 2010" "Mike Waters" "User Commands"
-+.TH gspiceui 1 "February 2010" "Mike Waters" "User Commands"
+-.TH "gspiceui" "16" "February 2011" "Mike Waters" "User Commands"
++.TH "gspiceui" 1 "February 2011" "Mike Waters" "User Commands"
  .SH "NAME"
  gspiceui \- GUI frontend for various electronic circuit simulation engines
  
+@@ -58,7 +58,7 @@
+ the command line.
+ 
+ .TP 12
+-NOTE : Option -s should come before -a if both are specified.
++NOTE : Option \-s should come before \-a if both are specified.
+ 
+ .SH "REPORTING BUGS"
+ Report bugs to <m.waters at bom.gov.au>.

Added: packages/gspiceui/trunk/debian/patches/04_makefile.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/patches/04_makefile.diff?rev=44035&op=file
==============================================================================
--- packages/gspiceui/trunk/debian/patches/04_makefile.diff (added)
+++ packages/gspiceui/trunk/debian/patches/04_makefile.diff Sun Nov 20 20:48:20 2011
@@ -1,0 +1,55 @@
+Prevent and endless make clean loop
+--- a/Makefile
++++ b/Makefile
+@@ -82,10 +82,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)/fig/Makefile
+@@ -139,7 +139,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
+@@ -158,7 +158,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
+@@ -66,6 +66,7 @@
+   # Options for development
+   CXXFLAGS := -Wall -g -pipe $(shell $(WXCFG) --cxxflags)
+ endif
++LDFLAGS="-Wl,-O1 -Wl,--as-needed"
+ 
+ # Includes
+ INCLUDES = -I/usr/include -I/usr/X11R6/include -I.
+@@ -106,7 +107,7 @@
+ #   -o     specify the output file name
+ 
+ $(BINDIR)/$(PROG) : $(OBJS)
+-	$(CC) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LIBS)
++	$(CC) $(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

Modified: packages/gspiceui/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/patches/series?rev=44035&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/patches/series (original)
+++ packages/gspiceui/trunk/debian/patches/series Sun Nov 20 20:48:20 2011
@@ -1,4 +1,5 @@
 01_docpath.diff
 02_manpage.diff
 03_fix_xpm_header.diff
-04_close_pipe.diff
+#04_close_pipe.diff
+04_makefile.diff

Modified: packages/gspiceui/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/rules?rev=44035&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/rules (original)
+++ packages/gspiceui/trunk/debian/rules Sun Nov 20 20:48:20 2011
@@ -12,24 +12,28 @@
 	CFLAGS += -O2
 endif
 
-build: build-stamp
-
-build-stamp:
+build: build-arch build-indep
+build-arch: build-arch-stamp
+build-arch-stamp:
 	dh_testdir
 	$(MAKE)
 	touch $@
 
+build-indep: build-indep-stamp
+build-indep-stamp:
+
+
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	rm -f *-stamp
 	[ ! -f Makefile ] || $(MAKE) clean
 	dh_clean 
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 	dh_installdirs
 	$(MAKE) INSTALLDIR=$(CURDIR)/debian/gspiceui/usr install
 	rm -f debian/gspiceui/usr/share/gspiceui/INSTALL
@@ -37,6 +41,9 @@
 	rmdir debian/gspiceui/usr/share/gspiceui
 	mkdir -p debian/gspiceui/usr/share/pixmaps
 	cp src/icons/gspiceui-32x32.xpm debian/gspiceui/usr/share/pixmaps
+	mkdir -p debian/gspiceui/usr/share/applications
+	cp debian/gspiceui.desktop debian/gspiceui/usr/share/applications/
+	rm -f debian/gspiceui/usr/share/doc/gspiceui/ChangeLog
 
 # Build architecture-independent files here.
 binary-indep: build install

More information about the debian-science-commits mailing list