Bug#994270: another possible fix

2021-09-15 Thread Jonas Smedegaard
Quoting Roderich Schupp (2021-09-15 12:22:55)
> > mark /usr/share/ghostscript/* as not-installed,
> > which is clearly bogus but seems the only (simple) way
> > to ignore only for arch-dependent builds;
> 
> 
> Another way to fix this is to use ${env:GS_DOT_VERSION} in 
> libgs9-common.install
> (since you're already using debhelper-compat 13), see patch below.
> Note that dh_install for libgs9-common - even for a build=any - generates a 
> file
> debian/.debhelper/generated/libgs9-common/installed-by-dh_install, but it only
> contains stuff gleaned from libgs9-common.install, not the explicit
> arguments given to dh_install.
> This is probably a debhelper bug.

Thanks, Roderich - that is indeed a more elegant approach!

 - Jonas

-- 
 * Jonas Smedegaard - idealist & Internet-arkitekt
 * Tlf.: +45 40843136  Website: http://dr.jones.dk/

 [x] quote me freely  [ ] ask before reusing  [ ] keep private

signature.asc
Description: signature


Bug#994270: another possible fix

2021-09-15 Thread Roderich Schupp
> mark /usr/share/ghostscript/* as not-installed,
> which is clearly bogus but seems the only (simple) way
> to ignore only for arch-dependent builds;


Another way to fix this is to use ${env:GS_DOT_VERSION} in libgs9-common.install
(since you're already using debhelper-compat 13), see patch below.
Note that dh_install for libgs9-common - even for a build=any - generates a file
debian/.debhelper/generated/libgs9-common/installed-by-dh_install, but it only
contains stuff gleaned from libgs9-common.install, not the explicit
arguments given to dh_install.
This is probably a debhelper bug.

Cheers, Roderich
diff --git a/debian/libgs9-common.install b/debian/libgs9-common.install
index 57913aa6..ce26d655 100644
--- a/debian/libgs9-common.install
+++ b/debian/libgs9-common.install
@@ -1 +1,2 @@
 usr/share/color/icc/
+usr/share/ghostscript/${env:GS_DOT_VERSION}/
diff --git a/debian/rules b/debian/rules
index 6403518f..b6c50e03 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 
 include base/version.mak
+# so that we can refer to it debian/libs9-common.install
+export GS_DOT_VERSION
 
 include /usr/share/dpkg/pkg-info.mk
 
@@ -90,9 +92,7 @@ override_dh_install:
 	mv debian/tmp/usr/share/ghostscript/$(GS_DOT_VERSION)/iccprofiles \
 		debian/tmp/usr/share/color/icc/ghostscript
 
-	dh_install --package=$(pkg-data) $(DEB_DH_INSTALL_ARGS_ALL) \
-		usr/share/ghostscript/$(GS_DOT_VERSION)/
-	dh_install --no-package=$(pkg-data) $(DEB_DH_INSTALL_ARGS_ALL)
+	dh_install $(DEB_DH_INSTALL_ARGS_ALL)
 
 	dh_link --package=$(pkg-data) -- $(DEB_DH_LINK_$(pkg-data))
 	dh_link --no-package=$(pkg-data)