r38220 - in /packages/gspiceui/trunk/debian: changelog control copyright patches/01_docpath.diff patches/02_manpage.diff patches/03_fix_xpm_header.diff patches/04_close_pipe.diff patches/series rules

gudjon-guest at users.alioth.debian.org gudjon-guest at users.alioth.debian.org
Sat Mar 19 20:44:37 UTC 2011 

Author: gudjon-guest
Date: Sat Mar 19 20:44:30 2011
New Revision: 38220

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38220
Log:
* New upstream release
* Switch to dpkg-source 3.0 (quilt) format
* Remove README.source
* Bump standards version to 3.9.1
* Upgrade copyright file to new standard

Added:
    packages/gspiceui/trunk/debian/patches/04_close_pipe.diff
Modified:
    packages/gspiceui/trunk/debian/changelog
    packages/gspiceui/trunk/debian/control
    packages/gspiceui/trunk/debian/copyright
    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/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=38220&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/changelog (original)
+++ packages/gspiceui/trunk/debian/changelog Sat Mar 19 20:44:30 2011
@@ -1,3 +1,13 @@
+gspiceui (0.9.99+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Remove README.source
+  * Bump standards version to 3.9.1
+  * Upgrade copyright file to new standard
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sat, 19 Mar 2011 21:43:04 +0100
+
 gspiceui (0.9.98.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=38220&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/control (original)
+++ packages/gspiceui/trunk/debian/control Sat Mar 19 20:44:30 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.8.3
+Standards-Version: 3.9.1
 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

Modified: packages/gspiceui/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/copyright?rev=38220&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/copyright (original)
+++ packages/gspiceui/trunk/debian/copyright Sat Mar 19 20:44:30 2011
@@ -8,7 +8,7 @@
     Mike Waters <M.Waters at bom.gov.au>
 
 Copyright: 
-    Copyright (C) 2003-2006 Mike Waters
+    Copyright © 2003-2006 Mike Waters
 
 License:
     GNU GENERAL PUBLIC LICENSE

Modified: packages/gspiceui/trunk/debian/patches/01_docpath.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/patches/01_docpath.diff?rev=38220&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/patches/01_docpath.diff (original)
+++ packages/gspiceui/trunk/debian/patches/01_docpath.diff Sat Mar 19 20:44:30 2011
@@ -1,11 +1,12 @@
---- gspiceui-0.9.33.orig/src/main/HelpTasks.cpp
-+++ gspiceui-0.9.33/src/main/HelpTasks.cpp
-@@ -221,7 +221,7 @@
+Fix path to user manual
+--- a/src/main/HelpTasks.cpp
++++ b/src/main/HelpTasks.cpp
+@@ -226,7 +226,7 @@
      // Specify the two locations to search
      os1 = rosGetInstallPath( );
      if( os1.IsEmpty( ) ) return;
--    ofn1 = os1 + wxT("/share/gspiceui/html/gSpiceUI.html");
-+    ofn1 = os1 + wxT("/share/doc/gspiceui/html/gSpiceUI.html");
-     ofn2 = os1 + wxT("/html/gSpiceUI.html");
+-    ofn1 = os1 + wxT("/share/gspiceui/html/User-Manual.html");
++    ofn1 = os1 + wxT("/share/doc/gspiceui/html/User-Manual.html");
+     ofn2 = os1 + wxT("/html/User-Manual.html");
  
      // Search for the manual

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=38220&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/patches/02_manpage.diff (original)
+++ packages/gspiceui/trunk/debian/patches/02_manpage.diff Sat Mar 19 20:44:30 2011
@@ -1,3 +1,4 @@
+Fix gspiceui manpage
 --- a/gspiceui.1
 +++ b/gspiceui.1
 @@ -14,7 +14,6 @@

Modified: packages/gspiceui/trunk/debian/patches/03_fix_xpm_header.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/patches/03_fix_xpm_header.diff?rev=38220&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/patches/03_fix_xpm_header.diff (original)
+++ packages/gspiceui/trunk/debian/patches/03_fix_xpm_header.diff Sat Mar 19 20:44:30 2011
@@ -1,3 +1,4 @@
+Fix xpm header
 --- a/src/icons/gspiceui-32x32.xpm
 +++ b/src/icons/gspiceui-32x32.xpm
 @@ -1,5 +1,4 @@

Added: packages/gspiceui/trunk/debian/patches/04_close_pipe.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/patches/04_close_pipe.diff?rev=38220&op=file
==============================================================================
--- packages/gspiceui/trunk/debian/patches/04_close_pipe.diff (added)
+++ packages/gspiceui/trunk/debian/patches/04_close_pipe.diff Sat Mar 19 20:44:30 2011
@@ -1,0 +1,15 @@
+Delete file descriptors that are left uneleted in original program.
+Patch has been sent to upstream author, unreviewed.
+--- a/src/base/PrcSimrBase.cpp
++++ b/src/base/PrcSimrBase.cpp
+@@ -125,6 +125,10 @@
+   oFileCct.Write( ); // Save the changes to disk
+   oFileCct.Close( ); // Close the results file
+ 
++  delete GetErrorStream();
++  delete GetOutputStream();
++  delete GetInputStream();
++
+   return( TRUE );
+ }
+ 

Modified: packages/gspiceui/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/patches/series?rev=38220&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/patches/series (original)
+++ packages/gspiceui/trunk/debian/patches/series Sat Mar 19 20:44:30 2011
@@ -1,3 +1,4 @@
 01_docpath.diff
 #02_manpage.diff
 03_fix_xpm_header.diff
+04_close_pipe.diff

Modified: packages/gspiceui/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/rules?rev=38220&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/rules (original)
+++ packages/gspiceui/trunk/debian/rules Sat Mar 19 20:44:30 2011
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-
-include /usr/share/quilt/quilt.make
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -16,12 +14,12 @@
 
 build: build-stamp
 
-build-stamp: $(QUILT_STAMPFN)
+build-stamp:
 	dh_testdir
 	$(MAKE)
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp

More information about the debian-science-commits mailing list