-Source: wxwindows=V
+Source: wxwidgets=V
Section: libs
Priority: optional
-Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, python-dev (>=1.5.2), python-distutils, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libgl-dev, libesd0-dev
-Maintainer: Ron Lee <ron@debian.org>
-Standards-Version: 3.5.6.0
+Build-Depends: debhelper (>=4.0), bc, flex, bison, gettext, libgtk2.0-dev, =PY, =PY-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libsm-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libesd0-dev, libgnomeprintui2.2-dev, libgconf2-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libnotify-dev
+Maintainer: wxWidgets dev-team <wx-dev@lists.wxwidgets.org>
+Standards-Version: 3.6.2.1
-Package: libwxbase=V
+Package: libwxbase=SOV=U
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
-Description: wxBase library (runtime) - non-GUI support classes of wxWindows toolkit
+Description: wxBase library (runtime) - non-GUI support classes of wxWidgets toolkit
wxBase is a collection of C++ classes providing basic data structures
(strings, lists, arrays), powerful wxDateTime class for date manipulations,
portable wrappers around many OS-specific functions allowing to build the
same program under all supported folders, wxThread class for writing
multithreaded programs using either Win32 or POSIX threads and much more.
- wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD,
- Solaris, HP-UX, ...), win32, and BeOS.
+ wxBase currently supports the following platforms: Generic Unix (Linux,
+ FreeBSD, Solaris, HP-UX, ...), win32, and BeOS.
.
- This package is only useful for non-gui apps. It offers a subset of the
- classes in libwx_gtk=V for use in console apps and daemons. It is currently
- under development and may not be as stable as the gui version.
+ This package is only useful for non-GUI apps. It offers a subset of the
+ classes in libwx_gtk=V=U for use in console apps and daemons. You do not need
+ this package to build or use wxWidgets GUI apps.
-Package: libwxbase=V-dev
+Package: libwxbase=V=U-dev
Architecture: any
-Section: devel
-Depends: wxwin=V-headers (= ${Source-Version}), libwxbase=V (= ${Source-Version}), zlib1g-dev, libc6-dev
-Suggests: wxwin=V-doc, gettext
-Conflicts: libwxbase-dev
-Replaces: libwxbase-dev
-Provides: libwxbase-dev
-Description: wxBase library (development) - non-GUI support classes of wxWindows toolkit
+Section: libdevel
+Depends: wx=V-headers (= ${Source-Version}), libwxbase=SOV=U (= ${Source-Version}), libc6-dev | libc-dev
+Suggests: wx=V-doc, gettext
+Description: wxBase library (development) - non-GUI support classes of wxWidgets toolkit
wxBase is a collection of C++ classes providing basic data structures
(strings, lists, arrays), powerful wxDateTime class for date manipulations,
portable wrappers around many OS-specific functions allowing to build the
same program under all supported folders, wxThread class for writing
multithreaded programs using either Win32 or POSIX threads and much more.
- wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD,
- Solaris, HP-UX, ...), win32, and BeOS.
+ wxBase currently supports the following platforms: Generic Unix (Linux,
+ FreeBSD, Solaris, HP-UX, ...), win32, and BeOS.
.
- This package provides the files needed to compile apps using the wxBase library.
+ This package provides the files needed to compile apps using the wxBase
+ library.
-Package: libwxbase=V-dbg
+Package: libwxbase=V=U-dbg
Architecture: any
-Section: devel
+Section: libdevel
Priority: extra
-Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
-Conflicts: libwxbase-dbg
-Replaces: libwxbase-dbg
-Provides: libwxbase-dbg
-Description: wxBase library (debug) - non-GUI support classes of wxWindows toolkit
+Depends: wx=V-headers (= ${Source-Version}), libc6-dev
+Description: wxBase library (debug) - non-GUI support classes of wxWidgets toolkit
wxBase is a collection of C++ classes providing basic data structures
(strings, lists, arrays), powerful wxDateTime class for date manipulations,
portable wrappers around many OS-specific functions allowing to build the
same program under all supported folders, wxThread class for writing
multithreaded programs using either Win32 or POSIX threads and much more.
- wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD,
- Solaris, HP-UX, ...) win32, and BeOS.
+ wxBase currently supports the following platforms: Generic Unix (Linux,
+ FreeBSD, Solaris, HP-UX, ...) win32, and BeOS.
.
This package provides a debug version of the wxBase library. It is compiled
both with -g for normal debugger tracing and with the __WXDEBUG__ flag which
- provides many internal checks by wxWindows itself that are not performed on
+ provides many internal checks by wxWidgets itself that are not performed on
apps compiled with the 'release version' libs in the -dev package.
-Package: libwxgtk=V
+Package: libwxgtk=SOV=U
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
-Suggests: libgl1
-Replaces: wxgtk2.1
-Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform. Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+Suggests: libgnomeprintui2.2-0
+Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well). For more information see http://wxwidgets.org
.
This package provides the shared libraries needed to run programs linked
- against wxWindows. To use the (optional) glcanvas library you will need
+ against wxWidgets. To use the (optional) glcanvas library you will need
to have Mesa or OpenGL installed.
-Package: libwxgtk=V-dev
+Package: libwxgtk=V=U-dev
Architecture: any
-Section: devel
-Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libgtk1.2-dev, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libc6-dev
-Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
-Conflicts: libwxgtk-dev
-Replaces: libwxgtk-dev, wxgtk2.1-dev
-Provides: libwxgtk-dev
-Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform. Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+Section: libdevel
+Depends: wx=V-headers (= ${Source-Version}), libwxgtk=SOV=U (= ${Source-Version}), libwxbase=V=U-dev (= ${Source-Version})
+Suggests: wx-common, wx=V-doc, libstdc++-dev, gettext, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev
+Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well). For more information see http://wxwidgets.org
.
- This package provides files needed to compile wxWindows programs. If you
+ This package provides files needed to compile wxWidgets programs. If you
want to compile apps using the (optional) glcanvas library you will need
to have Mesa or OpenGL installed too.
-Package: libwxgtk=V-dbg
+Package: libwxgtk=V=U-dbg
Architecture: any
-Section: devel
+Section: libdevel
Priority: extra
-Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
-Conflicts: libwxgtk-dbg
-Replaces: libwxgtk-dbg
-Provides: libwxgtk-dbg
-Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform. Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+Depends: wx=V-headers (= ${Source-Version}), libwxbase=V=U-dbg (= ${Source-Version})
+Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well). For more information see http://wxwidgets.org
.
- This package provides a debug version of the wxGtk library. It is compiled
+ This package provides a debug version of the wxGTK library. It is compiled
both with -g for normal debugger tracing and with the __WXDEBUG__ flag which
- provides many internal checks by wxWindows itself that are not performed on
+ provides many internal checks by wxWidgets itself that are not performed on
apps compiled with the 'release version' libs in the -dev package.
-Package: libwxgtk=V-python
+Package: python-wxgtk=V=U
Architecture: any
-Section: interpreters
-Depends: python-base (>=1.5.2), ${shlibs:Depends}
-Suggests: wxwin=V-doc, wxwin=V-examples
-Conflicts: libwxgtk=V-python-contrib, python-wxwin
-Replaces: libwxgtk=V-python-contrib, python-wxwin
-Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform. Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+Section: python
+Depends: python-wxversion, =PY, ${shlibs:Depends}
+Suggests: wx=V-doc, wx=V-examples, =PY-xml
+Conflicts: libwxgtk2.6-0-python, wxpython2.6-0
+Replaces: libwxgtk2.6-0-python, wxpython2.6-0
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well). For more information see http://wxwidgets.org
.
- This package provides a Python binding to the wxGTK library and it's
- contrib libs.
+ This package provides a Python binding to the wxGTK library and the
+ wxPython runtime support libraries. If you wish to use xrc you'll also
+ need the =PY-xml package installed.
-Package: libwxgtk=V-contrib
+Package: python-wxgtk=V=U-dbg
Architecture: any
-Section: libs
-Depends: libwxgtk=V (= ${Source-Version}), ${shlibs:Depends}
-Description: wxWindows Cross-platform C++ GUI toolkit (runtime contrib libs)
- wxWindows is a class library for C++ providing GUI (Graphical User
+Section: python
+Depends: python-wxversion, =PY, ${shlibs:Depends}
+Conflicts: python-wxgtk=V=U
+Replaces: python-wxgtk=V=U
+Provides: python-wxgtk=V=U
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding)
+ wxWidgets is a class library for C++ providing GUI (Graphical User
Interface) and other facilities on more than one platform. Version =V
currently supports subsets of GTK+, Motif, and MS Windows.
.
- This package provides the contrib libs of the wxWindows source tree
- (mmedia, ogl, stc)
+ This package provides a Python binding to the wxGTK debug library.
+ It is useful for developers as many common errors may be caught, but
+ you should _never_ upload packages to Debian that depend upon this
+ package explicitly, use the python-wxgtk=V=U package instead.
+ .
+ If you wish to use xrc you'll also need the =PY-xml package installed.
-Package: libwxgtk=V-univ
-Architecture: any
-Section: libs
-Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libgtk1.2-dev, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libc6-dev, ${shlibs:Depends}
-Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
-Description: wxWindows Cross-platform C++ GUI toolkit (wxUNIVERSAL widgets)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform. Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+Package: python-wxversion
+Architecture: all
+Section: python
+Conflicts: wxpython2.6-0
+Replaces: wxpython2.6-0
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython version selector)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well). For more information see http://wxwidgets.org
+ .
+ This package provides the wxPython version selector.
+
+Package: python-wxaddons
+Architecture: all
+Section: python
+Conflicts: python-wxgtk2.6
+Replaces:
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython add-on packages base)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well). For more information see http://wxwidgets.org
.
- This package is built to use the wxUNIVERSAL widget set instead of
- native gtk widgets.
+ This package provides a base Python package for 3rd party add-ons.
-Package: libwxgtk=V-contrib-dev
+Package: python-wxtools
+Architecture: all
+Section: python
+Depends: python-wxgtk=V=U
+Conflicts: wxpython2.6-0
+Replaces: wxpython2.6-0, libwxgtk2.4-python, wxpython2.4-1
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython common files)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well). For more information see http://wxwidgets.org
+ .
+ This package provides support utilities and common files for wxPython=V=U.
+ If you wish to use xrced you'll also need the =PY-xml package installed.
+
+Package: wx-common
Architecture: any
Section: devel
-Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libwxgtk=V-contrib (= ${Source-Version}), libc6-dev
-Conflicts: libwxgtk-contrib-dev
-Replaces: libwxgtk-contrib-dev
-Provides: libwxgtk-contrib-dev
-Description: wxWindows Cross-platform C++ GUI toolkit (development contrib libs)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform. Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+Depends: ${shlibs:Depends}
+Conflicts: wx2.6-common
+Replaces: wxwin2.4-headers, libwxgtk2.4-contrib-dev, wx2.6-common
+Description: wxWidgets Cross-platform C++ GUI toolkit (common support files)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well). For more information see http://wxwidgets.org
.
- Install this package if you wish to compile applications that use the
- contrib libs from the wxWindows source tree (mmedia, ogl, stc)
+ This package provides common support files not bound to any
+ particular wxWidgets release, such as font metrics required by some
+ ports, and miscellaneous developer aids and binary utilities.
-Package: wxwin=V-headers
+Package: wx=V-headers
Architecture: any
Section: devel
-Conflicts: wxwin-headers
-Replaces: wxwin-headers, wxgtk2.1-dev
-Provides: wxwin-headers
-Description: wxWindows Cross-platform C++ GUI toolkit (header files)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform. Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+Description: wxWidgets Cross-platform C++ GUI toolkit (header files)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well). For more information see http://wxwidgets.org
.
This package provides the common header files required to build applications
- using the wxWindows toolkit.
+ using the wxWidgets toolkit.
-Package: wxwin=V-i18n
+Package: wx=V-i18n
Architecture: all
Section: libs
-Conflicts: wxwin-i18n
-Replaces: wxwin-i18n
-Provides: wxwin-i18n
-Description: wxWindows Cross-platform C++ GUI toolkit (i18n support)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform. Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+Conflicts: 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
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well). For more information see http://wxwidgets.org
.
- This package provides the i18n message catalogs for wxWindows.
+ This package provides the i18n message catalogs for wxWidgets.
-Package: wxwin=V-doc
+Package: wx=V-doc
Architecture: all
Section: doc
+Provides: wx-doc
Suggests: doc-base, www-browser
-Description: wxWindows Cross-platform C++ GUI toolkit (documentation)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform. Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+Description: wxWidgets Cross-platform C++ GUI toolkit (documentation)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well). For more information see http://wxwidgets.org
.
- This package provides a HTML version of the wxWindows reference manual.
+ This package provides a HTML version of the wxWidgets reference manual.
-Package: wxwin=V-examples
+Package: wx=V-examples
Architecture: all
Section: devel
-Suggests: libwxgtk=V-dev (= ${Source-Version}), wxwin=V-doc
-Description: wxWindows Cross-platform C++ GUI toolkit (examples)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform. Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+Suggests: libwxgtk=V=U-dev (= ${Source-Version}), wx=V-doc
+Description: wxWidgets Cross-platform C++ GUI toolkit (examples)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well). For more information see http://wxwidgets.org
.
- This package contains examples of using the wxWindows toolkit.
+ This package contains examples of using the wxWidgets toolkit in
+ C++ and with the wxPython language binding.
-Package: libwxbase-msw=V-dev
+Package: libwxmsw=V=U-dev
Architecture: i386
Section: otherosfs
-Depends: wxwin=V-headers-msw (= ${Source-Version})
-Conflicts: libwxbase-msw-dev
-Replaces: libwxbase-msw-dev
-Provides: libwxbase-msw-dev
-Description: wxBase mingw32msvc-cross
- mingw32msvc-cross wxBase libs.
-
-Package: libwxmsw=V-dev
+Depends: wx=V-headers-msw (= ${Source-Version})
+Description: wxMSW mingw32msvc-cross
+ mingw32msvc-cross wxMSW libs.
+
+Package: libwxmsw=V=U-dbg
Architecture: i386
Section: otherosfs
-Depends: wxwin=V-headers-msw (= ${Source-Version})
-Conflicts: libwxmsw-dev
-Replaces: libwxmsw-dev
-Provides: libwxmsw-dev
-Description: wxMSW mingw32msvc-cross
+Depends: wx=V-headers-msw (= ${Source-Version})
+Description: wxMSW mingw32msvc-cross (debug)
mingw32msvc-cross wxMSW libs.
+ __WXDEBUG__ version.
-Package: wxwin=V-headers-msw
+Package: wx=V-headers-msw
Architecture: i386
Section: otherosfs
-Depends: wxwin=V-headers (= ${Source-Version})
-Conflicts: wxwin-headers-msw
-Replaces: wxwin-headers-msw
-Provides: wxwin-headers-msw
-Description: Extra wxWindows headers for mingw32msvc-cross
- Headers required by the wxWindows mingw32msvc-cross libraries.
+Depends: wx=V-headers (= ${Source-Version})
+Description: Extra wxWidgets headers for mingw32msvc-cross
+ Headers required by the wxWidgets mingw32msvc-cross libraries.
+
+
+
+
+Package: python-wxgtk=V=U
+Architecture: any
+Section: python
+Depends: python-wxversion, ${python:Depends}, ${shlibs:Depends}
+Suggests: wx=V-doc, wx=V-examples, python-xml
+Conflicts: libwxgtk2.6-0-python, wxpython2.6-0
+Replaces: libwxgtk2.6-0-python, wxpython2.6-0
+XB-Python-Version: ${python:Versions}
+Provides: ${python:Provides}
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well). For more information see http://wxwidgets.org
+ .
+ This package provides a Python binding to the wxGTK library and the
+ wxPython runtime support libraries. If you wish to use xrc you'll also
+ need the python-xml package installed.
+
+Package: python-wxgtk=V=U-dbg
+Priority: extra
+Architecture: any
+Section: python
+Depends: python-wxgtk=V=U (= ${Source-Version}), python-dbg, ${shlibs:Depends}
+Suggests: python-xml-dbg
+XB-Python-Version: ${python:Versions}
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding, debug version)
+ wxWidgets is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform. Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
+ .
+ This package provides a Python binding to the wxGTK debug library.
+ This package contains the extensions built for the python debug interpreter.
+
+Package: python-wxversion
+Architecture: all
+Section: python
+Depends: ${python:Depends}
+Conflicts: wxpython2.6-0
+Replaces: wxpython2.6-0
+XB-Python-Version: ${python:Versions}
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython version selector)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well). For more information see http://wxwidgets.org
+ .
+ This package provides the wxPython version selector.
+
+Package: python-wxaddons
+Architecture: all
+Section: python
+Conflicts: python-wxgtk2.6 (<< 2.6.4.0)
+Depends: ${python:Depends}, python-wxgtk=V=U
+XB-Python-Version: ${python:Versions}
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython add-on packages base)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well). For more information see http://wxwidgets.org
+ .
+ This package provides a base Python package for 3rd party add-ons.
+
+Package: python-wxtools
+Architecture: all
+Section: python
+Depends: python-wxgtk=V=U, ${python:Depends}
+Conflicts: wxpython2.6-0
+Replaces: wxpython2.6-0, libwxgtk2.4-python, wxpython2.4-1
+XB-Python-Version: ${python:Versions}
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython common files)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well). For more information see http://wxwidgets.org
+ .
+ This package provides support utilities and common files for wxPython=V=U.
+ If you wish to use xrced you'll also need the python-xml package installed.
projects / wxWidgets.git / blobdiff