[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[debian-devel:17996] Re: xflr5 更新
こんにちは。Koichi Akabeです。
新版を作成したのでmentorsにアップロードしました。確認お願いします。
http://mentors.debian.net/debian/pool/main/x/xflr5/xflr5_6.04.dfsg-2.dsc
PDFファイルをxflr5-docパッケージの中に入れることを試みましたが、-docパッ
ケージの中にpdfを入れようとするとpdfがgz 圧縮されてしまい、拡張子も
pdf.gzとなります。このため、アプリケーションのヘルプメニューからpdfにア
クセスできなくなってしまいま す。
結局-docパッケージに分けることを諦め、xflr5パッケージのみとしました。
また、rulesに含まれていたqmake-qt4コマンドとmakeコマンドはdh_auto_build
に置き換えられるようなので変更しま す。
一応6.04-1及び6.04.dfsg-1からの差分2つを添付します。
宜しくお願いします。
On 2011/06/16 01:26, Tatsuya Kinoshita wrote:
> On June 15, 2011, [debian-devel:17992],
> vbkaisetsu (at gmail.com) wrote:
>
>> 理想的には、Guidelines_v6.04.pdfをdebian/xflr5-doc.docs内に記述し、/usr
>> /share /xflr5に Guidelines.pdfという名前のシンボリックリンクを作成するの
>> がベストだと思いますが、これをうまく実現する方法はあるのでしょう か。
> man debhelperで"link"を検索するとdh_linkが見つかります。そして、
> man dh_linkでdebian/package.linksの書き方がわかります。
>
> あと依存関係について、xflr5パッケージにRecommends: xflr5-docを加えて
> はどうでしょうか。また、xflr5-docパッケージの方のDepends: xflr5は、
> DependsでなくSuggestsで十分ではないでしょうか。
>
diff -Nru xflr5-6.04.dfsg/debian/changelog xflr5-6.04.dfsg/debian/changelog
--- xflr5-6.04.dfsg/debian/changelog 2011-06-14 22:47:56.000000000 +0900
+++ xflr5-6.04.dfsg/debian/changelog 2011-06-17 00:15:27.000000000 +0900
@@ -1,3 +1,17 @@
+xflr5 (6.04.dfsg-2) unstable; urgency=low
+
+ * debian/rules
+ - removed install command which was cause of FTBFS (closes: #630545)
+ - changed qmake-qt4 command to dh_auto_build
+ * debian/xflr5.install
+ - added Guidelines_v604.pdf
+ * debian/xflr5.links
+ - added a link to Guidelines_v604.pdf
+ * debian/xflr5-doc.dirs
+ - removed
+
+ -- Koichi Akabe <vbkaisetsu@xxxxxxxxx> Thu, 16 Jun 2011 23:17:24 +0900
+
xflr5 (6.04.dfsg-1) unstable; urgency=low
* doc/Guidelines.pdf
diff -Nru xflr5-6.04.dfsg/debian/control xflr5-6.04.dfsg/debian/control
--- xflr5-6.04.dfsg/debian/control 2011-06-14 21:48:12.000000000 +0900
+++ xflr5-6.04.dfsg/debian/control 2011-06-16 23:11:56.000000000 +0900
@@ -16,10 +16,3 @@
1. XFoil's Direct and Inverse analysis capabilities
2. Wing design analysis based on the Lifiting Line Theory and the Vortex
Lattice Method
-
-Package: xflr5-doc
-Section: doc
-Architecture: all
-Depends: xflr5, ${misc:Depends}
-Description: xflr5 documentation
- This package provides the documentation for XFLR5.
diff -Nru xflr5-6.04.dfsg/debian/manpages xflr5-6.04.dfsg/debian/manpages
--- xflr5-6.04.dfsg/debian/manpages 2011-04-02 21:26:39.000000000 +0900
+++ xflr5-6.04.dfsg/debian/manpages 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-debian/xflr5.1
diff -Nru xflr5-6.04.dfsg/debian/rules xflr5-6.04.dfsg/debian/rules
--- xflr5-6.04.dfsg/debian/rules 2011-06-14 21:35:43.000000000 +0900
+++ xflr5-6.04.dfsg/debian/rules 2011-06-16 23:16:28.000000000 +0900
@@ -4,12 +4,7 @@
dh $@
override_dh_auto_build:
- qmake-qt4 PREFIX=/usr $(CURDIR)/*.pro
- $(MAKE)
+ dh_auto_build
lrelease -nounfinished $(CURDIR)/translations/xflr5v6_fr.ts -qm $(CURDIR)/translations/xflr5v6_fr.qm
lrelease -nounfinished $(CURDIR)/translations/xflr5v6_de.ts -qm $(CURDIR)/translations/xflr5v6_de.qm
docbook-to-man debian/xflr5.sgml > debian/xflr5.1
-
-override_dh_auto_install:
- dh_auto_install
- install -m 644 $(CURDIR)/debian/Guidelines_v604.pdf $(CURDIR)/debian/xflr5-doc/usr/share/xflr5/Guidelines.pdf
diff -Nru xflr5-6.04.dfsg/debian/xflr5-doc.dirs xflr5-6.04.dfsg/debian/xflr5-doc.dirs
--- xflr5-6.04.dfsg/debian/xflr5-doc.dirs 2011-06-14 20:14:08.000000000 +0900
+++ xflr5-6.04.dfsg/debian/xflr5-doc.dirs 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-usr/share/xflr5
diff -Nru xflr5-6.04.dfsg/debian/xflr5.install xflr5-6.04.dfsg/debian/xflr5.install
--- xflr5-6.04.dfsg/debian/xflr5.install 2011-06-14 19:27:10.000000000 +0900
+++ xflr5-6.04.dfsg/debian/xflr5.install 2011-06-16 23:50:31.000000000 +0900
@@ -1,4 +1,4 @@
-debian/tmp/usr/bin/xflr5 usr/bin
+debian/Guidelines_v604.pdf usr/share/xflr5
debian/xflr5.desktop usr/share/applications
translations/xflr5v6_fr.qm usr/share/xflr5/translations
translations/xflr5v6_de.qm usr/share/xflr5/translations
diff -Nru xflr5-6.04.dfsg/debian/xflr5.links xflr5-6.04.dfsg/debian/xflr5.links
--- xflr5-6.04.dfsg/debian/xflr5.links 1970-01-01 09:00:00.000000000 +0900
+++ xflr5-6.04.dfsg/debian/xflr5.links 2011-06-16 23:50:39.000000000 +0900
@@ -0,0 +1 @@
+usr/share/xflr5/Guidelines_v604.pdf usr/share/xflr5/Guidelines.pdf
diff -Nru xflr5-6.04.dfsg/debian/xflr5.manpages xflr5-6.04.dfsg/debian/xflr5.manpages
--- xflr5-6.04.dfsg/debian/xflr5.manpages 1970-01-01 09:00:00.000000000 +0900
+++ xflr5-6.04.dfsg/debian/xflr5.manpages 2011-04-02 21:26:39.000000000 +0900
@@ -0,0 +1 @@
+debian/xflr5.1
バイナリー・ファイル/tmp/dxD6Rgxq0m/xflr5-6.04/debian/Guidelines_v604.odtと/tmp/gzTuFQRrZR/xflr5-6.04.dfsg/debian/Guidelines_v604.odtは違います
バイナリー・ファイル/tmp/dxD6Rgxq0m/xflr5-6.04/debian/Guidelines_v604.pdfと/tmp/gzTuFQRrZR/xflr5-6.04.dfsg/debian/Guidelines_v604.pdfは違います
diff -Nru xflr5-6.04/debian/changelog xflr5-6.04.dfsg/debian/changelog
--- xflr5-6.04/debian/changelog 2011-05-24 23:00:29.000000000 +0900
+++ xflr5-6.04.dfsg/debian/changelog 2011-06-17 00:15:27.000000000 +0900
@@ -1,3 +1,38 @@
+xflr5 (6.04.dfsg-2) unstable; urgency=low
+
+ * debian/rules
+ - removed install command which was cause of FTBFS (closes: #630545)
+ - changed qmake-qt4 command to dh_auto_build
+ * debian/xflr5.install
+ - added Guidelines_v604.pdf
+ * debian/xflr5.links
+ - added a link to Guidelines_v604.pdf
+ * debian/xflr5-doc.dirs
+ - removed
+
+ -- Koichi Akabe <vbkaisetsu@xxxxxxxxx> Thu, 16 Jun 2011 23:17:24 +0900
+
+xflr5 (6.04.dfsg-1) unstable; urgency=low
+
+ * doc/Guidelines.pdf
+ - removed from source file because it contains non-free fonts
+ (closes: #628218)
+ * debian/Guidelines_v604.pdf
+ - added rebuilt pdf which doesn't contains non-free fonts
+ * debian/Guidelines_v604.odt
+ - added source of Guidelines_v604.pdf
+ * debian/rules
+ - added install command for Guidelines_v604.pdf
+ * debian/source/include-binaries
+ - added debian/Guidelines_v604.pdf, debian/Guidelines_v604.odt
+ * debian/control
+ - removed build-depends: libc6, libgcc1, libstdc++6
+ - added xflr5-doc package
+ * debian/xflr5.doc
+ - added ReadMe.txt
+
+ -- Koichi Akabe <vbkaisetsu@xxxxxxxxx> Tue, 14 Jun 2011 22:46:39 +0900
+
xflr5 (6.04-1) unstable; urgency=low
* New upstream release
@@ -22,7 +57,8 @@
- changed format to rev 174
* debian/install
- added xflr5.png
- - don't include Guidelines.pdf since it doesn't provide materials to construct
+ - removed sourceless documentation with non-free fonts embedded:
+ Guidelines.pdf
* debian/rules
- removed install command
diff -Nru xflr5-6.04/debian/control xflr5-6.04.dfsg/debian/control
--- xflr5-6.04/debian/control 2011-05-18 19:48:43.000000000 +0900
+++ xflr5-6.04.dfsg/debian/control 2011-06-16 23:11:56.000000000 +0900
@@ -2,7 +2,7 @@
Section: science
Priority: extra
Maintainer: Koichi Akabe <vbkaisetsu@xxxxxxxxx>
-Build-Depends: debhelper (>= 7.0.50~), docbook-to-man, libc6 (>= 2.1.3), libqt4-dev, libgcc1 (>= 1:4.1.1), libgl1-mesa-dev, libqt4-opengl-dev (>= 4.6.0), libstdc++6 (>= 4.1.1), translate-toolkit
+Build-Depends: debhelper (>= 7.0.50~), docbook-to-man, libqt4-dev, libgl1-mesa-dev, libqt4-opengl-dev (>= 4.6.0), translate-toolkit
Standards-Version: 3.9.2
Homepage: http://xflr5.sourceforge.net/xflr5.htm
diff -Nru xflr5-6.04/debian/dirs xflr5-6.04.dfsg/debian/dirs
--- xflr5-6.04/debian/dirs 2011-03-26 10:19:27.000000000 +0900
+++ xflr5-6.04.dfsg/debian/dirs 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-usr/bin
diff -Nru xflr5-6.04/debian/install xflr5-6.04.dfsg/debian/install
--- xflr5-6.04/debian/install 2011-05-19 15:23:11.000000000 +0900
+++ xflr5-6.04.dfsg/debian/install 1970-01-01 09:00:00.000000000 +0900
@@ -1,4 +0,0 @@
-debian/xflr5.desktop usr/share/applications
-translations/xflr5v6_fr.qm usr/share/xflr5/translations
-translations/xflr5v6_de.qm usr/share/xflr5/translations
-images/xflr5.png usr/share/pixmaps
diff -Nru xflr5-6.04/debian/manpages xflr5-6.04.dfsg/debian/manpages
--- xflr5-6.04/debian/manpages 2011-04-02 21:26:39.000000000 +0900
+++ xflr5-6.04.dfsg/debian/manpages 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-debian/xflr5.1
diff -Nru xflr5-6.04/debian/rules xflr5-6.04.dfsg/debian/rules
--- xflr5-6.04/debian/rules 2011-05-15 21:33:31.000000000 +0900
+++ xflr5-6.04.dfsg/debian/rules 2011-06-16 23:16:28.000000000 +0900
@@ -4,9 +4,7 @@
dh $@
override_dh_auto_build:
- qmake-qt4 PREFIX=/usr $(CURDIR)/*.pro
- $(MAKE)
+ dh_auto_build
lrelease -nounfinished $(CURDIR)/translations/xflr5v6_fr.ts -qm $(CURDIR)/translations/xflr5v6_fr.qm
lrelease -nounfinished $(CURDIR)/translations/xflr5v6_de.ts -qm $(CURDIR)/translations/xflr5v6_de.qm
docbook-to-man debian/xflr5.sgml > debian/xflr5.1
-
diff -Nru xflr5-6.04/debian/source/include-binaries xflr5-6.04.dfsg/debian/source/include-binaries
--- xflr5-6.04/debian/source/include-binaries 1970-01-01 09:00:00.000000000 +0900
+++ xflr5-6.04.dfsg/debian/source/include-binaries 2011-06-16 19:48:22.000000000 +0900
@@ -0,0 +1,2 @@
+debian/Guidelines_v604.pdf
+debian/Guidelines_v604.odt
diff -Nru xflr5-6.04/debian/xflr5.dirs xflr5-6.04.dfsg/debian/xflr5.dirs
--- xflr5-6.04/debian/xflr5.dirs 1970-01-01 09:00:00.000000000 +0900
+++ xflr5-6.04.dfsg/debian/xflr5.dirs 2011-03-26 10:19:27.000000000 +0900
@@ -0,0 +1 @@
+usr/bin
diff -Nru xflr5-6.04/debian/xflr5.docs xflr5-6.04.dfsg/debian/xflr5.docs
--- xflr5-6.04/debian/xflr5.docs 1970-01-01 09:00:00.000000000 +0900
+++ xflr5-6.04.dfsg/debian/xflr5.docs 2011-06-16 23:49:45.000000000 +0900
@@ -0,0 +1 @@
+ReadMe.txt
diff -Nru xflr5-6.04/debian/xflr5.install xflr5-6.04.dfsg/debian/xflr5.install
--- xflr5-6.04/debian/xflr5.install 1970-01-01 09:00:00.000000000 +0900
+++ xflr5-6.04.dfsg/debian/xflr5.install 2011-06-16 23:50:31.000000000 +0900
@@ -0,0 +1,5 @@
+debian/Guidelines_v604.pdf usr/share/xflr5
+debian/xflr5.desktop usr/share/applications
+translations/xflr5v6_fr.qm usr/share/xflr5/translations
+translations/xflr5v6_de.qm usr/share/xflr5/translations
+images/xflr5.png usr/share/pixmaps
diff -Nru xflr5-6.04/debian/xflr5.links xflr5-6.04.dfsg/debian/xflr5.links
--- xflr5-6.04/debian/xflr5.links 1970-01-01 09:00:00.000000000 +0900
+++ xflr5-6.04.dfsg/debian/xflr5.links 2011-06-16 23:50:39.000000000 +0900
@@ -0,0 +1 @@
+usr/share/xflr5/Guidelines_v604.pdf usr/share/xflr5/Guidelines.pdf
diff -Nru xflr5-6.04/debian/xflr5.manpages xflr5-6.04.dfsg/debian/xflr5.manpages
--- xflr5-6.04/debian/xflr5.manpages 1970-01-01 09:00:00.000000000 +0900
+++ xflr5-6.04.dfsg/debian/xflr5.manpages 2011-04-02 21:26:39.000000000 +0900
@@ -0,0 +1 @@
+debian/xflr5.1
バイナリー・ファイル/tmp/dxD6Rgxq0m/xflr5-6.04/doc/Guidelines.pdfと/tmp/gzTuFQRrZR/xflr5-6.04.dfsg/doc/Guidelines.pdfは違います