aboutsummaryrefslogtreecommitdiff
path: root/.bzr-builddeb/default.conf
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-09-10 08:48:14 -0500
committerTed Gould <ted@canonical.com>2009-09-10 08:48:14 -0500
commit93e64730a53f452e1df926e5ec46b0549c9f9535 (patch)
treeef92af72283b9f1a314a9cdebab08de84e5fbd35 /.bzr-builddeb/default.conf
parentf650bd25052fd37b77e41f5ba6e367270b33d897 (diff)
parent5d4e3baf6c858f34e31c16df2b1239bd520e8b72 (diff)
downloadlibdbusmenu-93e64730a53f452e1df926e5ec46b0549c9f9535.tar.gz
libdbusmenu-93e64730a53f452e1df926e5ec46b0549c9f9535.tar.bz2
libdbusmenu-93e64730a53f452e1df926e5ec46b0549c9f9535.zip
* Merging in ~ubuntu-desktop branch.
* debian/rules: - updated shlib version * Upstream release 0.1.2 (LP: #423958) * debian/control - Specify full urls for Vcs-Bzr * Add bzr-builddep configuration for merge mode. * debian/control: Fix Vcs-* links.
Diffstat (limited to '.bzr-builddeb/default.conf')
-rw-r--r--.bzr-builddeb/default.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
new file mode 100644
index 0000000..3165e05
--- /dev/null
+++ b/.bzr-builddeb/default.conf
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True