[Pkg-crosswire-devel] [Branch ~pkgcrosswire/bibletime/main] Rev 25: Deal with old bibletime-i18n.

[noreply at launchpad.net]

------------------------------------------------------------
revno: 25
committer: Jonathan Marsden <jmarsden at fastmail.fm>
branch nick: main
timestamp: Sat 2009-06-06 22:26:19 -0700
message:
  Deal with old bibletime-i18n.
modified:
  debian/changelog
  debian/control

=== modified file 'debian/changelog'
--- debian/changelog	2009-06-07 05:05:28 +0000
+++ debian/changelog	2009-06-07 05:26:19 +0000
@@ -4,6 +4,9 @@
   * debian/patches/: 
     - 01_main_window_icon.diff removed (now in upstream sources).
     - 02_remove_unwanted_debug_code.diff removed (now in upstream sources).
+  * debian/control: Correctly update systems with old bibletime-i18n:
+    - Remove Suggests: bibletime-i18n from bibletime package.
+    - Add Conflicts: and Replaces: bibletime-i18n to bibletime-data package.
 
  -- Jonathan Marsden <jmarsden at fastmail.fm>  Sat, 06 Jun 2009 22:03:36 -0700
 

=== modified file 'debian/control'
--- debian/control	2009-05-31 04:41:39 +0000
+++ debian/control	2009-06-07 05:26:19 +0000
@@ -14,7 +14,6 @@
 Package: bibletime
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, bibletime-data
-Suggests: bibletime-i18n
 Provides: sword-frontend
 Description: A bible study tool for Qt
  BibleTime is a free and easy to use bible study tool for UNIX systems.
@@ -27,6 +26,8 @@
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: bibletime
+Conflicts: bibletime-i18n
+Replaces: bibletime-i18n
 Description: Documentation and data for bibletime, a bible study tool
  BibleTime is a free and easy to use bible study tool for UNIX systems.
  .



--
lp:~pkgcrosswire/bibletime/main
https://code.launchpad.net/~pkgcrosswire/bibletime/main

Your team Crosswire Packaging Team is subscribed to branch lp:~pkgcrosswire/bibletime/main.
To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/bibletime/main/+edit-subscription.