Merge lp:~mterry/unity-asset-pool/fail-missing into lp:unity-asset-pool

Proposed by Michael Terry
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 62
Merged at revision: 62
Proposed branch: lp:~mterry/unity-asset-pool/fail-missing
Merge into: lp:unity-asset-pool
Diff against target: 48 lines (+6/-3)
4 files modified
debian/changelog (+3/-0)
debian/compat (+1/-1)
debian/control (+1/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~mterry/unity-asset-pool/fail-missing
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+133399@code.launchpad.net

Commit message

Use dh9 and --fail-missing

Description of the change

Use modern build standards like dh9 and --fail-missing.

Note that the chmod changes are because dh9 will try to run executable debhelper files and use their output. So while the executable state of debian/* files didn't use to matter, it does now.

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

(Note that while --fail-missing doesn't really do anything for this package, since it doesn't have an upstream build system, it might as well be put in place for consistency and in case a build system does get used in the future.)

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

I'm all for consistency!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog' (properties changed: +x to -x)
--- debian/changelog 2012-11-05 22:06:56 +0000
+++ debian/changelog 2012-11-08 03:50:24 +0000
@@ -2,6 +2,9 @@
22
3 * debian/control:3 * debian/control:
4 - Update Vcs-Bzr4 - Update Vcs-Bzr
5 - Require dh9
6 * debian/rules:
7 - Use --fail-missing
5 * debian/source/format:8 * debian/source/format:
6 - Switch to format 1.0, which works better with bzr-builddeb's9 - Switch to format 1.0, which works better with bzr-builddeb's
7 split mode. We don't have patches anyway.10 split mode. We don't have patches anyway.
811
=== modified file 'debian/compat' (properties changed: +x to -x)
--- debian/compat 2010-02-15 12:26:28 +0000
+++ debian/compat 2012-11-08 03:50:24 +0000
@@ -1,1 +1,1 @@
1719
22
=== modified file 'debian/control' (properties changed: +x to -x)
--- debian/control 2012-11-05 22:06:56 +0000
+++ debian/control 2012-11-08 03:50:24 +0000
@@ -2,7 +2,7 @@
2Section: gnome2Section: gnome
3Priority: optional3Priority: optional
4Maintainer: Kenneth Wimer <kwwii@ubuntu.com>4Maintainer: Kenneth Wimer <kwwii@ubuntu.com>
5Build-Depends: debhelper (>= 7.0.50~),5Build-Depends: debhelper (>= 9),
6 python-scour,6 python-scour,
7 icon-naming-utils7 icon-naming-utils
8Standards-Version: 3.9.18Standards-Version: 3.9.1
99
=== modified file 'debian/copyright' (properties changed: +x to -x)
=== modified file 'debian/install' (properties changed: +x to -x)
=== modified file 'debian/rules'
--- debian/rules 2010-12-13 16:19:38 +0000
+++ debian/rules 2012-11-08 03:50:24 +0000
@@ -4,7 +4,7 @@
4 dh $@ --with scour4 dh $@ --with scour
55
6override_dh_install:6override_dh_install:
7 dh_install7 dh_install --fail-missing
8 for d in $$(find $(CURDIR)/debian/unity-icon-theme/usr/share/icons -mindepth 2 -maxdepth 2 -type d) ; do \8 for d in $$(find $(CURDIR)/debian/unity-icon-theme/usr/share/icons -mindepth 2 -maxdepth 2 -type d) ; do \
9 (cd $$d; for c in *; do /usr/lib/icon-naming-utils/icon-name-mapping -c $$c; done); \9 (cd $$d; for c in *; do /usr/lib/icon-naming-utils/icon-name-mapping -c $$c; done); \
10 done10 done

Subscribers

People subscribed via source and target branches

to all changes: