projects
/
marble
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4871baa
)
Move conflicts field to the correct section
author
Dennis Nienhüser
<nienhues@fzi.de>
Sun, 4 Dec 2011 17:31:19 +0000
(18:31 +0100)
committer
Dennis Nienhüser
<nienhues@fzi.de>
Sun, 4 Dec 2011 17:31:19 +0000
(18:31 +0100)
packaging/debian/control
patch
|
blob
|
history
diff --git
a/packaging/debian/control
b/packaging/debian/control
index
d7504d1
..
7800fbb
100644
(file)
--- a/
packaging/debian/control
+++ b/
packaging/debian/control
@@
-4,13
+4,13
@@
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
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
Section: user/navigation
Architecture: any
Depends: ${shlibs:Depends}, marble-plugins (= ${source:Version}), libmarble (= ${source:Version})
Standards-Version: 3.9.1
Package: marble
Section: user/navigation
Architecture: any
Depends: ${shlibs:Depends}, marble-plugins (= ${source:Version}), libmarble (= ${source:Version})
+Conflicts: monav-routing-daemon (= 0.3.release-3+hg5585bb4a8d77)
Description: Find your way and explore the world with Marble.
Marble is a virtual globe with advanced routing capabilities. Use it as your
personal navigation device to guide you to any destination in the world.
Description: Find your way and explore the world with Marble.
Marble is a virtual globe with advanced routing capabilities. Use it as your
personal navigation device to guide you to any destination in the world.