added support for building non-Unicode packages which can be installed in parallel with the (official) Unicode ones

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-07-29 23:33:52 +00:00
parent 1eeb270e7c
commit 6b2c5736c9
2 changed files with 38 additions and 30 deletions

44
debian/control.in vendored
View File

@@ -1,11 +1,11 @@
Source: wxwidgets=V Source: wxwidgets=V=U
Section: libs Section: libs
Priority: optional Priority: optional
Build-Depends: debhelper (>=4.0), flex, bison, gettext, libgtk2.0-dev, =PY, =PY-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libesd0-dev, libgnomeprintui2.2-dev Build-Depends: debhelper (>=4.0), flex, bison, gettext, libgtk2.0-dev, =PY, =PY-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libesd0-dev, libgnomeprintui2.2-dev
Maintainer: Ron Lee <ron@debian.org> Maintainer: Ron Lee <ron@debian.org>
Standards-Version: 3.6.2.1 Standards-Version: 3.6.2.1
Package: libwxbase=SOV Package: libwxbase=SOV=U
Architecture: any Architecture: any
Section: libs Section: libs
Depends: ${shlibs:Depends} Depends: ${shlibs:Depends}
@@ -19,13 +19,13 @@ Description: wxBase library (runtime) - non-GUI support classes of wxWidgets too
FreeBSD, Solaris, HP-UX, ...), win32, and BeOS. FreeBSD, Solaris, HP-UX, ...), win32, and BeOS.
. .
This package is only useful for non-GUI apps. It offers a subset of the 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. You do not need 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. this package to build or use wxWidgets GUI apps.
Package: libwxbase=V-dev Package: libwxbase=V=U-dev
Architecture: any Architecture: any
Section: libdevel Section: libdevel
Depends: wx=V-headers (= ${Source-Version}), libwxbase=SOV (= ${Source-Version}), libc6-dev Depends: wx=V-headers (= ${Source-Version}), libwxbase=SOV=U (= ${Source-Version}), libc6-dev
Suggests: wx=V-doc, gettext Suggests: wx=V-doc, gettext
Description: wxBase library (development) - non-GUI support classes of wxWidgets toolkit Description: wxBase library (development) - non-GUI support classes of wxWidgets toolkit
wxBase is a collection of C++ classes providing basic data structures wxBase is a collection of C++ classes providing basic data structures
@@ -39,7 +39,7 @@ Description: wxBase library (development) - non-GUI support classes of wxWidgets
This package provides the files needed to compile apps using the wxBase This package provides the files needed to compile apps using the wxBase
library. library.
Package: libwxbase=V-dbg Package: libwxbase=V=U-dbg
Architecture: any Architecture: any
Section: libdevel Section: libdevel
Priority: extra Priority: extra
@@ -58,7 +58,7 @@ Description: wxBase library (debug) - non-GUI support classes of wxWidgets toolk
provides many internal checks by wxWidgets 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. apps compiled with the 'release version' libs in the -dev package.
Package: libwxgtk=SOV Package: libwxgtk=SOV=U
Architecture: any Architecture: any
Section: libs Section: libs
Depends: ${shlibs:Depends} Depends: ${shlibs:Depends}
@@ -72,10 +72,10 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime)
against wxWidgets. 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. to have Mesa or OpenGL installed.
Package: libwxgtk=V-dev Package: libwxgtk=V=U-dev
Architecture: any Architecture: any
Section: libdevel Section: libdevel
Depends: wx=V-headers (= ${Source-Version}), libwxgtk=SOV (= ${Source-Version}), libwxbase=V-dev (= ${Source-Version}), libc6-dev Depends: wx=V-headers (= ${Source-Version}), libwxgtk=SOV=U (= ${Source-Version}), libwxbase=V=U-dev (= ${Source-Version}), libc6-dev
Suggests: wx-common, wx=V-doc, libstdc++-dev, gettext, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev 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) Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
wxWidgets (formerly known as wxWindows) is a class library for C++ providing wxWidgets (formerly known as wxWindows) is a class library for C++ providing
@@ -86,11 +86,11 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
want to compile apps using the (optional) glcanvas library you will need want to compile apps using the (optional) glcanvas library you will need
to have Mesa or OpenGL installed too. to have Mesa or OpenGL installed too.
Package: libwxgtk=V-dbg Package: libwxgtk=V=U-dbg
Architecture: any Architecture: any
Section: libdevel Section: libdevel
Priority: extra Priority: extra
Depends: wx=V-headers (= ${Source-Version}), libwxbase=V-dbg (= ${Source-Version}), libc6-dev Depends: wx=V-headers (= ${Source-Version}), libwxbase=V=U-dbg (= ${Source-Version}), libc6-dev
Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development) Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
wxWidgets (formerly known as wxWindows) is a class library for C++ providing wxWidgets (formerly known as wxWindows) is a class library for C++ providing
GUI components and other facilities on several popular platforms (and some GUI components and other facilities on several popular platforms (and some
@@ -101,7 +101,7 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
provides many internal checks by wxWidgets 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. apps compiled with the 'release version' libs in the -dev package.
Package: python-wxgtk=V Package: python-wxgtk=V=U
Architecture: any Architecture: any
Section: python Section: python
Depends: python-wxversion, =PY, ${shlibs:Depends} Depends: python-wxversion, =PY, ${shlibs:Depends}
@@ -117,13 +117,13 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding)
wxPython runtime support libraries. If you wish to use xrc you'll also wxPython runtime support libraries. If you wish to use xrc you'll also
need the =PY-xml package installed. need the =PY-xml package installed.
Package: python-wxgtk=V-dbg Package: python-wxgtk=V=U-dbg
Architecture: any Architecture: any
Section: python Section: python
Depends: python-wxversion, =PY, ${shlibs:Depends} Depends: python-wxversion, =PY, ${shlibs:Depends}
Conflicts: python-wxgtk=V Conflicts: python-wxgtk=V=U
Replaces: python-wxgtk=V Replaces: python-wxgtk=V=U
Provides: python-wxgtk=V Provides: python-wxgtk=V=U
Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding) Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding)
wxWidgets is a class library for C++ providing GUI (Graphical User wxWidgets is a class library for C++ providing GUI (Graphical User
Interface) and other facilities on more than one platform. Version =V Interface) and other facilities on more than one platform. Version =V
@@ -132,7 +132,7 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding)
This package provides a Python binding to the wxGTK debug library. This package provides a Python binding to the wxGTK debug library.
It is useful for developers as many common errors may be caught, but It is useful for developers as many common errors may be caught, but
you should _never_ upload packages to Debian that depend upon this you should _never_ upload packages to Debian that depend upon this
package explicitly, use the python-wxgtk=V package instead. 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. If you wish to use xrc you'll also need the =PY-xml package installed.
@@ -151,7 +151,7 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython version selector
Package: python-wxtools Package: python-wxtools
Architecture: all Architecture: all
Section: python Section: python
Depends: python-wxgtk=V, ${shlibs:Depends} Depends: python-wxgtk=V=U, ${shlibs:Depends}
Conflicts: wxpython2.6-0 Conflicts: wxpython2.6-0
Replaces: wxpython2.6-0, libwxgtk2.4-python, wxpython2.4-1 Replaces: wxpython2.6-0, libwxgtk2.4-python, wxpython2.4-1
Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython common files) Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython common files)
@@ -159,7 +159,7 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython common files)
GUI components and other facilities on several popular platforms (and some GUI components and other facilities on several popular platforms (and some
unpopular ones as well). For more information see http://wxwidgets.org unpopular ones as well). For more information see http://wxwidgets.org
. .
This package provides support utilities and common files for wxPython=V. 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. If you wish to use xrced you'll also need the =PY-xml package installed.
Package: wx-common Package: wx-common
@@ -216,7 +216,7 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (documentation)
Package: wx=V-examples Package: wx=V-examples
Architecture: all Architecture: all
Section: devel Section: devel
Suggests: libwxgtk=V-dev (= ${Source-Version}), wx=V-doc Suggests: libwxgtk=V=U-dev (= ${Source-Version}), wx=V-doc
Description: wxWidgets Cross-platform C++ GUI toolkit (examples) Description: wxWidgets Cross-platform C++ GUI toolkit (examples)
wxWidgets (formerly known as wxWindows) is a class library for C++ providing wxWidgets (formerly known as wxWindows) is a class library for C++ providing
GUI components and other facilities on several popular platforms (and some GUI components and other facilities on several popular platforms (and some
@@ -225,14 +225,14 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (examples)
This package contains examples of using the wxWidgets toolkit in This package contains examples of using the wxWidgets toolkit in
C++ and with the wxPython language binding. C++ and with the wxPython language binding.
Package: libwxmsw=V-dev Package: libwxmsw=V=U-dev
Architecture: i386 Architecture: i386
Section: otherosfs Section: otherosfs
Depends: wx=V-headers-msw (= ${Source-Version}) Depends: wx=V-headers-msw (= ${Source-Version})
Description: wxMSW mingw32msvc-cross Description: wxMSW mingw32msvc-cross
mingw32msvc-cross wxMSW libs. mingw32msvc-cross wxMSW libs.
Package: libwxmsw=V-dbg Package: libwxmsw=V=U-dbg
Architecture: i386 Architecture: i386
Section: otherosfs Section: otherosfs
Depends: wx=V-headers-msw (= ${Source-Version}) Depends: wx=V-headers-msw (= ${Source-Version})

24
debian/rules vendored
View File

@@ -56,7 +56,7 @@ endif
# to correctly set the release below. # to correctly set the release below.
DEBIAN_WXFLAVOUR := $(shell pwd | sed -e 's@.*/wxwidgets[0-9.]\+-\?\(.*\)-[0-9.]\+-\?.*@\1@') DEBIAN_WXFLAVOUR := $(shell pwd | sed -e 's@.*/wxwidgets[0-9.]\+-\?\(.*\)-[0-9.]\+-\?.*@\1@')
release := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwidgets//p') release := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwidgets//p' | sed 's/-ansi//')
# This is broken completely now by bakefiles changes. Until we add # This is broken completely now by bakefiles changes. Until we add
# some hocus pocus to the main tree, to export these values from it # some hocus pocus to the main tree, to export these values from it
@@ -115,6 +115,14 @@ ifeq ($(WX_UNICODE),1)
PY_WX_CONFIG_OPTIONS += --unicode PY_WX_CONFIG_OPTIONS += --unicode
PY_UNICODE="UNICODE=1" PY_UNICODE="UNICODE=1"
wxpydir := $(pydir)/wx-$(release)-$(pytoolkit)-unicode wxpydir := $(pydir)/wx-$(release)-$(pytoolkit)-unicode
# for compatibility with the existing 2.6 packages, we don't use "u" in
# the Unicode (default) package names
unicode_suffix :=
else
# but we do need to use something for non-Unicode packages to distinguish
# them
unicode_suffix := -ansi
endif endif
ifeq ($(WX_OPENGL),1) ifeq ($(WX_OPENGL),1)
@@ -124,13 +132,13 @@ else
endif endif
# Packages to build: # Packages to build:
package_wxbase_lib := libwxbase$(sorelease) package_wxbase_lib := libwxbase$(sorelease)$(unicode_suffix)
package_wxbase_dev := libwxbase$(release)-dev package_wxbase_dev := libwxbase$(release)$(unicode_suffix)-dev
package_wxbase_dbg := libwxbase$(release)-dbg package_wxbase_dbg := libwxbase$(release)$(unicode_suffix)-dbg
package_gtk_lib := libwxgtk$(sorelease) package_gtk_lib := libwxgtk$(sorelease)$(unicode_suffix)
package_gtk_dev := libwxgtk$(release)-dev package_gtk_dev := libwxgtk$(release)$(unicode_suffix)-dev
package_gtk_dbg := libwxgtk$(release)-dbg package_gtk_dbg := libwxgtk$(release)$(unicode_suffix)-dbg
@@ -253,7 +261,7 @@ debian/python-version:
echo python_ver := python$(shell python -c "import sys;print sys.version[:3]") > $@ echo python_ver := python$(shell python -c "import sys;print sys.version[:3]") > $@
debian/control: $(addprefix debian/,control.in python-version) debian/control: $(addprefix debian/,control.in python-version)
sed -e 's/=V/$(release)/g;s/=SOV/$(sorelease)/g;s/=PY/$(python_ver)/g'\ sed -e 's/=V/$(release)/g;s/=SOV/$(sorelease)/g;s/=PY/$(python_ver)/g;s/=U/$(unicode_suffix)/g'\
< debian/control.in > debian/control < debian/control.in > debian/control
control-files-stamp: debian/control control-files-stamp: debian/control