diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-06-04 10:34:47 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-06-04 10:34:47 +0200 |
| commit | 18e6cff861ee839166613feb4354af70eac0a62d (patch) | |
| tree | bbf8f7ffc152878f35519273b6170554affe34d1 | |
| parent | 5a45ac2b70909f7d0b0c5bcc2f2583e4b3135fde (diff) | |
Use dh_auto_configure instead of ./configure. Update rm paths for multiarch
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | debian/rules | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index e44807b..7c9df89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,10 @@ shotwell (0.26.2-1) UNRELEASED; urgency=medium * Don't install man page at shotwell-common. * Some packaging improvements (Closes:# 856708): - Move .desktop and appstream metadata from shotwell-common to shotwell. + - debian/rules: + + Use dh_auto_configure instead of ./configure. + + Update rm paths for multiarch. + + Don't install the .a file either. - Thanks to Jeremy Bicha <jbicha@ubuntu.com> -- Jörg Frings-Fürst <debian@jff-webhosting.net> Wed, 22 Mar 2017 06:51:19 +0100 diff --git a/debian/rules b/debian/rules index 9c1d293..7b659ca 100755 --- a/debian/rules +++ b/debian/rules @@ -10,10 +10,13 @@ B_DATE:=$(shell LC_ALL=C date --utc -d "$(CHDATE)") dh $@ override_dh_auto_configure: - ./configure --prefix=/usr --libexec=/usr/lib --disable-schemas-compile + dh_auto_configure -- --prefix=/usr \ + --libexec=/usr/lib \ + --disable-schemas-compile override_dh_install: dh_install # Remove unwanted la files - rm -f debian/shotwell/usr/lib/shotwell/plugins/builtin/*.la - rm -f debian/shotwell/usr/lib/*.la + rm -f debian/shotwell/usr/lib/*/shotwell/plugins/builtin/*.la + rm -f debian/shotwell/usr/lib/*/*shotwell*.a + rm -f debian/shotwell/usr/lib/*/*shotwell*.la |