projects
/
marble
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f876710
)
Conflict with that faulty monav-routing-daemon version someone uploaded
author
Dennis Nienhüser
<nienhues@fzi.de>
Sun, 4 Dec 2011 11:02:34 +0000
(12:02 +0100)
committer
Dennis Nienhüser
<nienhues@fzi.de>
Sun, 4 Dec 2011 11:02:34 +0000
(12:02 +0100)
packaging/debian/control
patch
|
blob
|
history
diff --git
a/packaging/debian/control
b/packaging/debian/control
index
4c0eb9c
..
d7504d1
100644
(file)
--- a/
packaging/debian/control
+++ b/
packaging/debian/control
@@
-4,6
+4,7
@@
Priority: optional
Maintainer: Dennis Nienhüser <earthwings@gentoo.org>
Build-Depends: debhelper (>= 5), cdbs, libqt4-dev, cmake, x11proto-core-dev,
liblocation-dev, libx11-dev, libgconf2-dev, libdbus-glib-1-dev
+Conflicts: monav-routing-daemon (= 0.3.release-3+hg5585bb4a8d77)
Standards-Version: 3.9.1
Package: marble