Merge lp:~ted/dbus-test-runner/conf-file-move into lp:~ubuntu-desktop/dbus-test-runner/ubuntu

[Ted Gould]

Fixing a small packaging issue where the conf file is in the wrong package.

[lp:~ted/dbus-test-runner/conf-file-move]

51. By Ted Gould on 2012-08-21

Merge bugs

[Sebastien Bacher (seb128)]

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?)

review: Needs Fixing

Unmerged revisions

51. By Ted Gould on 2012-08-21

Merge bugs

50. By Ted Gould on 2012-08-21

  for *.so and pkgconfig files.

49. By Ted Gould on 2012-08-21

debian/libdbustest1-dev.install: Add a * to include architecture dirs.

48. By Ted Gould on 2012-08-21

debian/libdbustest1.install: Add a * to include architecture dirs.

47. By Ted Gould on 2012-08-21

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 on 2012-08-21

Merging Ubuntu Desktop

45. By Ted Gould on 2012-04-23

releasing version 0.0.5-0ubuntu1~ppa3

44. By Ted Gould on 2012-04-23

* Upstream Merge
  * Fixes from Charles and aligning to trunk

43. By Ted Gould on 2012-04-23

Merging the libdbustest branch

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-12 19:04:37 +0000
+++ debian/changelog	2012-08-21 14:13:21 +0000
@@ -1,3 +1,14 @@
+dbus-test-runner (12.10.0-0ubuntu3) UNRELEASED; urgency=low
+
+  * 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.
+  * debian/libdbustest1.install: Add a * to include architecture dirs. 
+  * debian/libdbustest1-dev.install: Add a * to include architecture dirs.  
+    for *.so and pkgconfig files.
+
+ -- Ted Gould <[e-mail]>  Tue, 21 Aug 2012 08:45:25 -0500
+
 dbus-test-runner (12.10.0-0ubuntu2) quantal; urgency=low
 
   * debian/control:

=== modified file 'debian/dbus-test-runner.install'
--- debian/dbus-test-runner.install	2012-07-12 17:39:44 +0000
+++ debian/dbus-test-runner.install	2012-08-21 14:13:21 +0000
@@ -1,3 +1,1 @@
 usr/bin
-usr/share
-

=== added file 'debian/libdbustest-1-dev.install'
--- debian/libdbustest-1-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libdbustest-1-dev.install	2012-08-21 14:13:21 +0000
@@ -0,0 +1,3 @@
+usr/lib/*/libdbustest.so
+usr/include/libdbustest-1/libdbustest/*
+usr/lib/*/pkgconfig/*

=== modified file 'debian/libdbustest1-dev.install'
--- debian/libdbustest1-dev.install	2012-07-12 17:39:44 +0000
+++ debian/libdbustest1-dev.install	2012-08-21 14:13:21 +0000
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/*/*.so
+debian/tmp/usr/lib/*/pkgconfig
 usr/include/libdbustest-1/*

=== modified file 'debian/libdbustest1.install'
--- debian/libdbustest1.install	2012-07-12 17:39:44 +0000
+++ debian/libdbustest1.install	2012-08-21 14:13:21 +0000
@@ -1,1 +1,2 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
+usr/share