[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[debian-devel:18009] Re: xflr5 更新



こんにちは。Koichi Akabeです。お世話になります。
勉強になります。

新版をmentorsにアップロードしましたので、確認お願いします。
http://mentors.debian.net/debian/pool/main/x/xflr5/xflr5_6.04.dfsg-2.dsc

変更点:
debian/rulesのoverride_dh_compressにて、dh_compressコマンドに-X.pdfオプ
ションを加えるよ うにしました。

宜しくお願いします。

On 2011/06/25 22:09, Hideki Yamane wrote:
> On Fri, 17 Jun 2011 00:29:03 +0900
> Koichi Akabe <vbkaisetsu@xxxxxxxxx> wrote:
>> PDFファイルをxflr5-docパッケージの中に入れることを試みましたが、-docパッ
>> ケージの中にpdfを入れようとするとpdfがgz 圧縮されてしまい、拡張子も
>> pdf.gzとなります。このため、アプリケーションのヘルプメニューからpdfにア
>> クセスできなくなってしまいま す。
>  これは回避できます。dh_compress -X.pdf のように dh_compress のオプションで。
>
>

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-26 00:22:14.000000000 +0900
@@ -1,3 +1,18 @@
+xflr5 (6.04.dfsg-2) unstable; urgency=low
+
+  * debian/rules
+   - removed install command which is cause of FTBFS (closes: #630545)
+   - changed qmake-qt4 command to dh_auto_build command
+   - added exclude option to dh_compress
+  * debian/xflr5-doc.docs
+   - added Guidelines_v604.pdf
+  * debian/xflr5-doc.links
+   - added Guidelines.pdf
+  * debian/control
+   - changed dependencies
+
+ -- Koichi Akabe <vbkaisetsu@xxxxxxxxx>  Sun, 26 Jun 2011 00:22:03 +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-25 23:24:08.000000000 +0900
@@ -9,6 +9,7 @@
 Package: xflr5
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: xflr5-doc
 Description: analysis tool for airfoils
  XFLR5 is an analysis tool for airfoils, wings and planes operating at low
  Reynolds Numbers.
@@ -20,6 +21,7 @@
 Package: xflr5-doc
 Section: doc
 Architecture: all
-Depends: xflr5, ${misc:Depends}
+Depends: ${misc:Depends}
+Suggests: xflr5
 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-26 00:10:33.000000000 +0900
@@ -4,12 +4,10 @@
 	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
+override_dh_compress:
+	dh_compress -X.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-doc.docs xflr5-6.04.dfsg/debian/xflr5-doc.docs
--- xflr5-6.04.dfsg/debian/xflr5-doc.docs	1970-01-01 09:00:00.000000000 +0900
+++ xflr5-6.04.dfsg/debian/xflr5-doc.docs	2011-06-25 22:46:52.000000000 +0900
@@ -0,0 +1 @@
+debian/Guidelines_v604.pdf
diff -Nru xflr5-6.04.dfsg/debian/xflr5-doc.links xflr5-6.04.dfsg/debian/xflr5-doc.links
--- xflr5-6.04.dfsg/debian/xflr5-doc.links	1970-01-01 09:00:00.000000000 +0900
+++ xflr5-6.04.dfsg/debian/xflr5-doc.links	2011-06-25 22:48:10.000000000 +0900
@@ -0,0 +1 @@
+usr/share/doc/xflr5-doc/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