[SCM] engine for several graphical adventure games branch, master, updated. fbd27309c22e483aae053697956670449db6cb7f

[Dmitry Smirnov]

The following commit has been merged in the master branch:
commit 9440cca55fec120da7ab0594d4c0b92202c64149
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Fri Sep 21 12:08:56 2012 +1000

    breaks/replaces due to .desktop file moved to another package

diff --git a/debian/changelog b/debian/changelog
index e767c99..bf34ba3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ scummvm (1.5.0-1) UNRELEASED; urgency=low
   * xz compression for .deb files and debian source
   * Build-Depends alphabetising and sorting
   * introduced "autotools_dev"
-  * moved desktop file to the main package
+  * moved desktop file to the main package, added breaks/replaces
   * dropped empty directories
   * dropped obsolete patch "debian-changes-1.0.0-1"
   * debian/rules:
diff --git a/debian/control b/debian/control
index d3a53b1..2cf67dd 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,8 @@ Package: scummvm
 Architecture: any
 Depends: ${shlibs:Depends}, scummvm-data, ${misc:Depends}
 Suggests: fluidsynth | timidity, beneath-a-steel-sky, flight-of-the-amazon-queen
+Replaces: scummvm-data (<< 1.5.0-1)
+Breaks: scummvm-data (<< 1.5.0-1)
 Description: engine for several graphical adventure games
  ScummVM is a `virtual machine' for several classic graphical
  point-and-click adventure games.  It is designed to run Adventure Soft's

-- 
engine for several graphical adventure games