tag 873888 pending
thanks
Hello,
Bug #873888 reported by you has been fixed in the Git repository. You can
see the changelog below, and you can check the diff of the fix at:
https://anonscm.debian.org/git/users/uwabami-guest/dcl-f77.git/diff/?id=855ac8442f3cb563b5017c92bcbc1a5c5e382d60
---
From 855ac8442f3cb563b5017c92bcbc1a5c5e382d60 Mon Sep 17 00:00:00 2001
From: Youhei SASAKI <uwab...@gfd-dennou.org>
Date: Sat, 2 Sep 2017 05:24:54 +0900
Subject: [PATCH 1/4] Separate arch|indep (Closes: #873888)
Signed-off-by: Youhei SASAKI <uwab...@gfd-dennou.org>
---
debian/dcl-f77-docs.install | 2 ++
debian/fonts-dclfonts.install | 5 ++++-
debian/rules | 23 ++++++++++++++---------
3 files changed, 20 insertions(+), 10 deletions(-)
create mode 100644 debian/dcl-f77-docs.install
diff --git a/debian/dcl-f77-docs.install b/debian/dcl-f77-docs.install
new file mode 100644
index 0000000..3c71747
--- /dev/null
+++ b/debian/dcl-f77-docs.install
@@ -0,0 +1,2 @@
+demo usr/share/doc/dcl-f77-docs/
+doc usr/share/doc/dcl-f77-docs/
diff --git a/debian/fonts-dclfonts.install b/debian/fonts-dclfonts.install
index 666d028..05d2c00 100644
--- a/debian/fonts-dclfonts.install
+++ b/debian/fonts-dclfonts.install
@@ -1 +1,4 @@
-usr/share/fonts/truetype/dclfonts/
+src/env1/sysfont/DCLMarker-Black.ttf usr/share/fonts/truetype/dclfonts/
+src/env1/sysfont/DCLMarker-Bold.ttf usr/share/fonts/truetype/dclfonts/
+src/env1/sysfont/DCLMarker-Light.ttf usr/share/fonts/truetype/dclfonts/
+src/env1/sysfont/DCLMarker-Regular.ttf usr/share/fonts/truetype/dclfonts/
diff --git a/debian/rules b/debian/rules
index fcc9238..8fce060 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,16 +12,19 @@ DCLVER=723
%:
dh $@
-override_dh_auto_configure:
+override_dh_auto_configure-arch:
$(shell ! grep -q jessie /etc/os-release || \
echo "activate-noawait ldconfig" >
$(CURDIR)/debian/libf77dcl7.triggers )
CC=gcc FC=gfortran \
dh_auto_configure -- $(dpkg-buildflags --export=configure)
--with-gtk3
+override_dh_auto_configure-indep:
+# do nothing
+
override_dh_auto_test:
+# do nothing
-override_dh_auto_install:
- mkdir -p $(CURDIR)/debian/tmp/usr/share/fonts/truetype/dclfonts/
+override_dh_auto_install-arch:
dh_auto_install -- prefix=$(CURDIR)/debian/tmp/usr
rm $(CURDIR)/debian/tmp/usr/bin/dclconfig
mv $(CURDIR)/debian/tmp/usr/bin/dclconfig$(DCLVER) \
@@ -34,14 +37,16 @@ override_dh_auto_install:
( cd $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) ; \
ln -s libf77dcl.so.$(DCLVERNUM) libf77dcl.so )
-override_dh_install:
- install -m644 $(CURDIR)/src/env1/sysfont/*.ttf \
- $(CURDIR)/debian/tmp/usr/share/fonts/truetype/dclfonts/
- dh_install --sourcedir=debian/tmp
+override_dh_auto_install-indep:
+# do nothing
+
+override_dh_install-arch:
+ dh_install -a --sourcedir=debian/tmp
sed -i -e 's%-fdebug-prefix-map.*\.%%g ' \
$(CURDIR)/debian/libf77dcl-dev/usr/bin/dclconfig
- cp -ar demo $(CURDIR)/debian/dcl-f77-docs/usr/share/doc/dcl-f77-docs/
- cp -ar doc $(CURDIR)/debian/dcl-f77-docs/usr/share/doc/dcl-f77-docs/
+
+override_dh_install-indep:
+ dh_install -i --sourcedir=$(CURDIR)
find $(CURDIR)/debian/dcl-f77-docs/ -name Makefile.win | xargs rm -f
override_dh_auto_clean:
--
2.14.1
