Merge lp:~ted/dbus-test-runner/conf-file-move into lp:~ubuntu-desktop/dbus-test-runner/ubuntu
Proposed by
Ted Gould
Status: | Work in progress |
---|---|
Proposed branch: | lp:~ted/dbus-test-runner/conf-file-move |
Merge into: | lp:~ubuntu-desktop/dbus-test-runner/ubuntu |
Diff against target: |
52 lines (+18/-5) 5 files modified
debian/changelog (+11/-0) debian/dbus-test-runner.install (+0/-2) debian/libdbustest-1-dev.install (+3/-0) debian/libdbustest1-dev.install (+2/-2) debian/libdbustest1.install (+2/-1) |
To merge this branch: | bzr merge lp:~ted/dbus-test-runner/conf-file-move |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Needs Fixing | ||
Review via email: mp+120575@code.launchpad.net |
Description of the change
Fixing a small packaging issue where the conf file is in the wrong package.
To post a comment you must log in.
Unmerged revisions
- 51. By Ted Gould
-
Merge bugs
- 50. By Ted Gould
-
for *.so and pkgconfig files.
- 49. By Ted Gould
-
debian/
libdbustest1- dev.install: Add a * to include architecture dirs. - 48. By Ted Gould
-
debian/
libdbustest1. install: Add a * to include architecture dirs. - 47. By Ted Gould
-
debian/
dbus-test- runner. install, debian/ libdbustest1. install:
Moving the configuration file to the library as it's needed there
and the binary depends on the lib. - 46. By Ted Gould
-
Merging Ubuntu Desktop
- 45. By Ted Gould
-
releasing version 0.0.5-0ubuntu1~ppa3
- 44. By Ted Gould
-
* Upstream Merge
* Fixes from Charles and aligning to trunk - 43. By Ted Gould
-
Merging the libdbustest branch
Thanks, there is an issue though, libdbustest1 should not have unversioned files or if you do a libdbustest2 they would conflict by shipping both /usr/share/ dbus-test- runner/ session. conf, we need to find another way to deal with that (could the lib fallback to a standard hardcoded config if the file is not installed?)