Merge lp:~bitglue/openobject-server/fix-dh_installchangelogs into lp:openobject-server

Proposed by Phil Frost
Status: Needs review
Proposed branch: lp:~bitglue/openobject-server/fix-dh_installchangelogs
Merge into: lp:openobject-server
Diff against target: 9 lines (+2/-0)
1 file modified
debian/rules (+2/-0)
To merge this branch: bzr merge lp:~bitglue/openobject-server/fix-dh_installchangelogs
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+141693@code.launchpad.net

Description of the change

Fixes this error in building a Debian package:

$ dpkg-buildpackage -us -uc
[...]
   dh_install
   dh_installdocs
   dh_installchangelogs
install: omitting directory `./history'
dh_installchangelogs: install -o 0 -g 0 -p -m644 ./history debian/openerp/usr/share/doc/openerp/changelog returned exit code 1
make: *** [binary] Error 2
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2

To post a comment you must log in.

Unmerged revisions

3730. By Phil Frost <pfrost@openerpdev>

instruct dh_installchangelogs to ignore debian/history: it's expecting it to be
a changelog when in fact it's a directory, then it chokes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2011-10-06 00:12:18 +0000
3+++ debian/rules 2013-01-03 02:46:27 +0000
4@@ -15,3 +15,5 @@
5 override_dh_installinit:
6 dh_installinit --update-rcd-params='defaults 21'
7
8+override_dh_installchangelogs:
9+ dh_installchangelogs -X./history