------------------------------------------------------------
revno: 58
committer: Jonathan Marsden <[email protected]>
branch nick: main
timestamp: Fri 2011-05-20 00:11:23 -0700
message:
Merged Conflicts: lines, oops
modified:
debian/control
--
lp:~pkgcrosswire/bibledit/main
https://code.launchpad.net/~pkgcrosswire/bibledit/main
Your team Crosswire Packaging Team is subscribed to branch
lp:~pkgcrosswire/bibledit/main.
To unsubscribe from this branch go to
https://code.launchpad.net/~pkgcrosswire/bibledit/main/+edit-subscription
=== modified file 'debian/control'
--- debian/control 2011-05-20 06:56:30 +0000
+++ debian/control 2011-05-20 07:11:23 +0000
@@ -19,11 +19,10 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, psmisc, iputils-ping | ping,
bibledit-gtk-data, curl
-Conflicts: scripturechecks
Suggests: bibletime
Provides: scripturechecks
Replaces: bibledit-gtk (<< 4.2-1~)
-Conflicts: bibledit-gtk (<< 4.2-1~)
+Conflicts: scripturechecks, bibledit-gtk (<< 4.2-1~)
Replaces: bibledit
Description: Bible translation tool
There are many languages still without a translation of the Bible.
_______________________________________________
Pkg-crosswire-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-crosswire-devel
