Replace files from 2.5 that still overlap.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/debian/control.in b/debian/control.in
index 64b349ddfdde442f16f7fdde2e0c7c44d1bdc4d3..ceada4772bf7cb5642f71e5462ef6061155a4a1b 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -98,7 +98,7 @@ Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
 Conflicts: wx-common
 Section: devel
 Depends: ${shlibs:Depends}
 Conflicts: wx-common

-Replaces: wx-common, wxwin2.4-headers, libwxgtk2.4-contrib-dev
+Replaces: wx-common, wxwin2.4-headers, libwxgtk2.4-contrib-dev, wx2.5-common

 Provides: wx-common
 Description: wxWidgets Cross-platform C++ GUI toolkit (common support files)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing
 Provides: wx-common
 Description: wxWidgets Cross-platform C++ GUI toolkit (common support files)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing


@@ -124,7 +124,7 @@ Package: wx=V-i18n
 Architecture: all
 Section: libs
 Conflicts: wx-i18n, wxwin-i18n, wx2.4-i18n
 Architecture: all
 Section: libs
 Conflicts: wx-i18n, wxwin-i18n, wx2.4-i18n

-Replaces: wx-i18n, wxwin-i18n, wx2.4-i18n
+Replaces: wx-i18n, wxwin-i18n, wx2.4-i18n, wx2.5-i18n

 Provides: wx-i18n
 Description: wxWidgets Cross-platform C++ GUI toolkit (i18n support)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing
 Provides: wx-i18n
 Description: wxWidgets Cross-platform C++ GUI toolkit (i18n support)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing