Ported forward changes to 2.2 packaging.

Don't build/run tex2rtf for -arch builds.  It segfaults on Alpha.
Added extra (required) -dev package deps.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee 2001-04-07 16:14:05 +00:00
parent c2cf7c0184
commit 3abb92cea8
3 changed files with 19 additions and 6 deletions

10
debian/changelog vendored
View File

@ -5,6 +5,16 @@ wxwindows2.2 (2.3.0) unstable; urgency=low
-- Ron Lee <ron@debian.org> Sat, 27 Jan 2001 01:51:24 -0800
wxwindows2.2 (2.2.6.1) unstable; urgency=low
* fix rules so it really doesn't build -indep for ports
and fixed ambiguous oveload bug in mmedia contrib.
This time it will build on alpha for sure. Really. :)
Closes: #92288
* added extra -dev package deps. Closes: #91364
-- Ron <ron@aeon.otsys.com> Sat, 7 Apr 2001 06:49:58 -0700
wxwindows2.2 (2.2.6) unstable; urgency=low
* changed i18n package back to building during arch phase

4
debian/control.in vendored
View File

@ -25,7 +25,7 @@ Description: wxBase library (runtime) - non-GUI support classes of wxWindows too
Package: libwxbase=V-dev
Architecture: any
Section: devel
Depends: wxwin=V-headers (= ${Source-Version}), libwxbase=V (= ${Source-Version}), libc6-dev
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
@ -81,7 +81,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime)
Package: libwxgtk=V-dev
Architecture: any
Section: devel
Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev
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

11
debian/rules vendored
View File

@ -140,8 +140,11 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
touch $@
build_arch: control-files-stamp $(build_arch_stamps)
build_all: control-files-stamp $(build_stamps)
# do nothing until we know which binary target is called
build:
build: control-files-stamp $(build_stamps)
build-wxbase-shared-stamp:
dh_testdir
@ -312,7 +315,7 @@ clean: debian/control
install_arch: build_arch $(install_all_arch)
install: build $(install_all)
install: build_all $(install_all)
install-wxbase-lib: DH_OPTIONS=-p$(package_wxbase_lib)
install-wxbase-lib: build-wxbase-shared-stamp
@ -458,7 +461,7 @@ binary-common:
# Build architecture-independent files here.
# Note that you currently can't build the indep packages without first
# building the arch specific package files needed to create them.
binary-indep: build install
binary-indep: build_all install
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
# Build just the architecture-dependent files here.
@ -506,7 +509,7 @@ binary-doc: control-files-stamp install-doc
$(MAKE) -f debian/rules DH_OPTIONS=-p$(package_doc) binary-common
.PHONY: build build_arch clean binary-indep binary-arch binary binary-common \
.PHONY: build build_all build_arch clean binary-indep binary-arch binary binary-common \
binary-gtk binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \
binary-wxbase-dbg binary-doc install install_arch install-wxbase-lib \
install-wxbase-dev install-wxbase-dbg install-gtk-lib install-gtk-dev \