[debian-devel:18273] ngraph-gtk 更新

[Koichi Akabe <vbkaisetsu@xxxxxxxxx>]

こんにちは。あかべです。
いつもお世話になっております。

ngraph-gtk の バージョン 6.06.05 がリリースされ、パッケージを更新したので、アップロードしていただけませんか？
debian/ 以下の 6.06.04-1 と 6.06.05-1 の差分を添付したので確認お願いします。

http://mentors.debian.net/debian/pool/main/n/ngraph-gtk/ngraph-gtk_6.06.05-1.dsc

-- 
Koichi Akabe
  vbkaisetsu at {gmail.com, debian.or.jp}

diff -urN ngraph-gtk-6.06.04/debian/changelog ngraph-gtk-6.06.05/debian/changelog
--- ngraph-gtk-6.06.04/debian/changelog	2012-02-25 12:44:44.000000000 +0900
+++ ngraph-gtk-6.06.05/debian/changelog	2012-04-27 20:31:32.681232505 +0900
@@ -1,3 +1,24 @@
+ngraph-gtk (6.06.05-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control
+   - add build-depends: libreadline6-dev
+   - add suggests: fonts-liberation
+   - add ngraph-gtk-addin-import-ps and ngraph-gtk-addin-tex-equation packages
+   - add descriptions for each addins
+  * debian/copyright
+   - update format uri
+  * debian/patches/20_replace_to_free_fonts.patch
+   - change settings to use free fonts
+  * debian/ngraph-gtk-addins.install
+   - removed import-ps and tex-equation addins to split a package
+  * debian/ngraph-gtk-addin-import-ps.install
+   - add import-ps addin
+  * debian/ngraph-gtk-addin-tex-equation.install
+   - add tex-equation addin
+
+ -- Koichi Akabe <vbkaisetsu@xxxxxxxxx>  Fri, 27 Apr 2012 20:30:54 +0900
+
 ngraph-gtk (6.06.04-1) unstable; urgency=low
 
   * New upstream release.
diff -urN ngraph-gtk-6.06.04/debian/control ngraph-gtk-6.06.05/debian/control
--- ngraph-gtk-6.06.04/debian/control	2012-02-25 12:32:54.000000000 +0900
+++ ngraph-gtk-6.06.05/debian/control	2012-04-27 18:56:56.697432925 +0900
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Koichi Akabe <vbkaisetsu@xxxxxxxxx>
 Uploaders: Ito Hiroyuki <ZXB01226@xxxxxxxxx>
-Build-Depends: debhelper (>= 9.0.0), libgtk-3-dev, libgsl0-dev, ruby
+Build-Depends: debhelper (>= 9.0.0), libgtk-3-dev, libgsl0-dev, libreadline6-dev, ruby
 Standards-Version: 3.9.3
 Homepage: http://homepage3.nifty.com/slokar/ngraph/ngraph-gtk.html
 
@@ -11,6 +11,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: ngraph-gtk-addins, ngraph-gtk-doc
+Suggests: fonts-liberation
 Description: create scientific 2-dimensional graphs
  Ngraph is the program to create scientific 2-dimensional graphs for
  researchers and engineers. This program can create advanced graphs
@@ -30,15 +31,47 @@
 
 Package: ngraph-gtk-addins
 Architecture: all
-Depends: ${misc:Depends}, ngraph-gtk-addins-base, ngraph-gtk, pstoedit
+Depends: ${misc:Depends}, ngraph-gtk-addins-base, ngraph-gtk
+Description: addin collection of Ngraph-gtk
+ Ngraph is the program to create scientific 2-dimensional graphs for
+ researchers and engineers. This program can create advanced graphs
+ which can't be created by spreadsheets. Graphs can be exported to
+ postscript.
+ .
+ This package contains the following addins:
+  1. append: append a NGP-file without clearing the present graph
+  2. fft: Fast Fourier Transform
+  3. legend: generate a legend box
+  4. cal: show calendar in the information window
+  5. math: calculator
+  6. text-in: insert a column as legend-text
+  7. calc: assist plotting a mathematical function.
+  8. fitrslt: generate a legend box
+  9. timer: countdown timer
+
+Package: ngraph-gtk-addin-import-ps
+Architecture: all
+Depends: ${misc:Depends}, ngraph-gtk, pstoedit
 Suggests: ruby | ruby-interpreter
-Description: addins of Ngraph-gtk
+Description: import-ps addin of Ngraph-gtk
+ Ngraph is the program to create scientific 2-dimensional graphs for
+ researchers and engineers. This program can create advanced graphs
+ which can't be created by spreadsheets. Graphs can be exported to
+ postscript.
+ .
+ This package contains addin of ngraph-gtk to convert PostScript to GRA.
+
+Package: ngraph-gtk-addin-tex-equation
+Architecture: all
+Depends: ${misc:Depends}, ngraph-gtk-addin-import-ps, ngraph-gtk, texlive-latex-base
+Description: tex-equation addin of Ngraph-gtk
  Ngraph is the program to create scientific 2-dimensional graphs for
  researchers and engineers. This program can create advanced graphs
  which can't be created by spreadsheets. Graphs can be exported to
  postscript.
  .
- This package contains addins of ngraph-gtk.
+ This package contains addin of ngraph-gtk to convert legend text as
+ TeX equation to GRA.
 
 Package: ngraph-gtk-doc
 Section: doc
diff -urN ngraph-gtk-6.06.04/debian/copyright ngraph-gtk-6.06.05/debian/copyright
--- ngraph-gtk-6.06.04/debian/copyright	2012-02-25 13:36:52.000000000 +0900
+++ ngraph-gtk-6.06.05/debian/copyright	2012-03-21 22:49:51.000000000 +0900
@@ -1,4 +1,4 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5/index.html?revision=248
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: ngraph-gtk
 Source: http://homepage3.nifty.com/slokar/ngraph/ngraph-gtk.html
 
diff -urN ngraph-gtk-6.06.04/debian/ngraph-gtk-addin-import-ps.install ngraph-gtk-6.06.05/debian/ngraph-gtk-addin-import-ps.install
--- ngraph-gtk-6.06.04/debian/ngraph-gtk-addin-import-ps.install	1970-01-01 09:00:00.000000000 +0900
+++ ngraph-gtk-6.06.05/debian/ngraph-gtk-addin-import-ps.install	2012-03-21 22:49:51.000000000 +0900
@@ -0,0 +1,3 @@
+usr/share/ngraph-gtk/addin/fig2gra.nsc
+usr/share/ngraph-gtk/addin/ps2gra.nsc
+usr/share/ngraph-gtk/addin/*.rb
diff -urN ngraph-gtk-6.06.04/debian/ngraph-gtk-addin-tex-equation.install ngraph-gtk-6.06.05/debian/ngraph-gtk-addin-tex-equation.install
--- ngraph-gtk-6.06.04/debian/ngraph-gtk-addin-tex-equation.install	1970-01-01 09:00:00.000000000 +0900
+++ ngraph-gtk-6.06.05/debian/ngraph-gtk-addin-tex-equation.install	2012-03-21 22:49:51.000000000 +0900
@@ -0,0 +1 @@
+usr/share/ngraph-gtk/addin/tex_equation.nsc
diff -urN ngraph-gtk-6.06.04/debian/ngraph-gtk-addins.install ngraph-gtk-6.06.05/debian/ngraph-gtk-addins.install
--- ngraph-gtk-6.06.04/debian/ngraph-gtk-addins.install	2012-02-14 19:37:12.000000000 +0900
+++ ngraph-gtk-6.06.05/debian/ngraph-gtk-addins.install	2012-03-21 22:49:51.000000000 +0900
@@ -1,2 +1,9 @@
-usr/share/ngraph-gtk/addin/*.nsc
-usr/share/ngraph-gtk/addin/*.rb
+usr/share/ngraph-gtk/addin/append.nsc
+usr/share/ngraph-gtk/addin/fft.nsc
+usr/share/ngraph-gtk/addin/legend.nsc
+usr/share/ngraph-gtk/addin/cal.nsc
+usr/share/ngraph-gtk/addin/math.nsc
+usr/share/ngraph-gtk/addin/text-in.nsc
+usr/share/ngraph-gtk/addin/calc.nsc
+usr/share/ngraph-gtk/addin/fitrslt.nsc
+usr/share/ngraph-gtk/addin/timer.nsc
diff -urN ngraph-gtk-6.06.04/debian/ngraph-gtk.install ngraph-gtk-6.06.05/debian/ngraph-gtk.install
--- ngraph-gtk-6.06.04/debian/ngraph-gtk.install	2012-02-14 19:37:12.000000000 +0900
+++ ngraph-gtk-6.06.05/debian/ngraph-gtk.install	2012-04-27 17:31:22.000000000 +0900
@@ -8,6 +8,6 @@
 icons/*.png usr/share/pixmaps
 misc/ngraph.applications usr/share/application-registry
 misc/ngraph.desktop usr/share/applications
-misc/ngraph.key usr/share/mime-info
+misc/ngraph.keys usr/share/mime-info
 misc/ngraph.mime usr/share/mime-info
 misc/ngraph.xml usr/share/mime/packages
diff -urN ngraph-gtk-6.06.04/debian/patches/20_replace_to_free_fonts.patch ngraph-gtk-6.06.05/debian/patches/20_replace_to_free_fonts.patch
--- ngraph-gtk-6.06.04/debian/patches/20_replace_to_free_fonts.patch	1970-01-01 09:00:00.000000000 +0900
+++ ngraph-gtk-6.06.05/debian/patches/20_replace_to_free_fonts.patch	2012-03-21 22:49:51.000000000 +0900
@@ -0,0 +1,22 @@
+Description: Replace to free fonts
+ The configuraton file of Ngraph-gtk specify proprietary fonts.
+ This patch replace them to free fonts.
+Author: Koichi Akabe <vbkaisetsu@xxxxxxxxx>
+Last-Update: 2012-03-07
+
+--- ngraph-gtk-6.06.04.orig/initfile/Ngraph.ini.in
++++ ngraph-gtk-6.06.04/initfile/Ngraph.ini.in
+@@ -38,3 +38,3 @@
+-coordwin_font=Courier New 12
+-infowin_font=Courier New 10
+-file_preview_font=Courier New 10
++coordwin_font=Liberation Mono 12
++infowin_font=Liberation Mono 10
++file_preview_font=Liberation Mono 10
+@@ -67,3 +67,3 @@
+-font=Sans-serif,Arial
+-font=Serif,Times New Roman
+-font=Monospace,Courier New
++font=Sans-serif,Liberation Sans
++font=Serif,Liberation Serif
++font=Monospace,Liberation Mono
diff -urN ngraph-gtk-6.06.04/debian/patches/series ngraph-gtk-6.06.05/debian/patches/series
--- ngraph-gtk-6.06.04/debian/patches/series	2012-02-09 11:31:23.000000000 +0900
+++ ngraph-gtk-6.06.05/debian/patches/series	2012-04-27 07:37:59.000000000 +0900
@@ -1 +1,2 @@
 10_avoid-docs-conflict.patch
+20_replace_to_free_fonts.patch
diff -urN ngraph-gtk-6.06.04/debian/rules ngraph-gtk-6.06.05/debian/rules
--- ngraph-gtk-6.06.04/debian/rules	2012-02-14 19:37:12.000000000 +0900
+++ ngraph-gtk-6.06.05/debian/rules	2012-04-27 17:22:39.000000000 +0900
@@ -1,13 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 %:
 	dh $@
@@ -15,3 +6,7 @@
 override_dh_auto_install:
 	dh_auto_install
 	install -D -m 644 $(CURDIR)/misc/ngraph.bash $(CURDIR)/debian/ngraph-gtk/etc/bash_completion.d/ngraph
+
+override_dh_clean:
+	dh_clean
+	rm -f $(CURDIR)/demo/demo6.ngp