From e0a4aa8a213de4748d95c6528a44474ac42cea08 Mon Sep 17 00:00:00 2001
From: Ron Lee <ron@debian.org>
Date: Mon, 21 Feb 2000 23:02:25 +0000
Subject: [PATCH] added wxPython control files and a few changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
debian/changelog | 2 +-
debian/control.in | 20 +++-
debian/libwxgtk-dev.files | 4 +-
debian/libwxgtk-python.dirs | 1 +
debian/libwxgtk-python.docs | 3 +
debian/libwxgtk-python.files | 2 +
debian/libwxgtk-python.postinst | 13 +++
debian/libwxgtk-python.prerm | 9 ++
debian/libwxgtk.files | 2 +-
debian/rules | 94 ++++++++++++++-----
debian/wx-config.1 | 4 +
debian/{libwx-doc.dirs => wxwin-doc.dirs} | 0
...bwx-doc.doc-base => wxwin-doc.doc-base.in} | 6 +-
debian/{libwx-doc.docs => wxwin-doc.docs} | 0
make-deb | 10 +-
15 files changed, 134 insertions(+), 36 deletions(-)
create mode 100644 debian/libwxgtk-python.dirs
create mode 100644 debian/libwxgtk-python.docs
create mode 100644 debian/libwxgtk-python.files
create mode 100644 debian/libwxgtk-python.postinst
create mode 100644 debian/libwxgtk-python.prerm
rename debian/{libwx-doc.dirs => wxwin-doc.dirs} (100%)
rename debian/{libwx-doc.doc-base => wxwin-doc.doc-base.in} (51%)
rename debian/{libwx-doc.docs => wxwin-doc.docs} (100%)
diff --git a/debian/changelog b/debian/changelog
index ea77d75543..8eebb0864a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wxwindows (2.1.14) unstable; urgency=low
+wxwindows2.1 (2.1.14) unstable; urgency=low
* Repackaged to build from cvs.
diff --git a/debian/control.in b/debian/control.in
index 164893274e..13c3af88e1 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,7 +1,7 @@
-Source: wxwindows
+Source: wxwindows=V
Section: libs
Priority: optional
-Build-Depends: debhelper, libgtk1.2-dev, flex, bison
+Build-Depends: debhelper, libgtk1.2-dev, python-dev (>=1.5), flex, bison
Maintainer: Ron Lee <ron@debian.org>
Standards-Version: 3.1.1
@@ -21,7 +21,7 @@ Package: libwxgtk=V-dev
Architecture: any
Section: devel
Depends: libwxgtk=V (= ${Source-Version}), libc6-dev
-Suggests: libstdc++-dev, gettext
+Suggests: wxwin=V-doc, libstdc++-dev, gettext
Conflicts: libwxgtk-dev
Replaces: libwxgtk-dev
Provides: libwxgtk-dev
@@ -33,7 +33,19 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
This package provides files needed to compile wxWindows programs. It
includes header files and static libraries.
-Package: libwx=V-doc
+Package: libwxgtk=V-python
+Architecture: any
+Section: interpreters
+Depends: libwxgtk=V (= ${Source-Version}), python-base (>=1.5), ${shlibs:Depends}
+Suggests: wxwin=V-doc
+Description: wxWindows Cross-platform C++ GUI toolkit (Python binding)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform. Version 2.1
+ currently supports subsets of GTK+, Motif, and MS Windows.
+ .
+ This package provides a Python binding to the wxGTK library.
+
+Package: wxwin=V-doc
Architecture: all
Section: doc
Suggests: doc-base, www-browser
diff --git a/debian/libwxgtk-dev.files b/debian/libwxgtk-dev.files
index 3168537cd5..6f1b0248c4 100644
--- a/debian/libwxgtk-dev.files
+++ b/debian/libwxgtk-dev.files
@@ -1,5 +1,5 @@
usr/bin/
usr/include/wx/
usr/lib/wx
-usr/lib/*.so
-usr/lib/*.a
+usr/lib/libwx_gtk*.so
+usr/lib/libwx_gtk*.a
diff --git a/debian/libwxgtk-python.dirs b/debian/libwxgtk-python.dirs
new file mode 100644
index 0000000000..cab7c0ae3d
--- /dev/null
+++ b/debian/libwxgtk-python.dirs
@@ -0,0 +1 @@
+usr/lib/python1.5/site-packages/wxPython/lib/sizers
diff --git a/debian/libwxgtk-python.docs b/debian/libwxgtk-python.docs
new file mode 100644
index 0000000000..7a7c47f4db
--- /dev/null
+++ b/debian/libwxgtk-python.docs
@@ -0,0 +1,3 @@
+utils/wxPython/README.txt
+utils/wxPython/CHANGES.txt
+docs/licence.txt
diff --git a/debian/libwxgtk-python.files b/debian/libwxgtk-python.files
new file mode 100644
index 0000000000..ac1d8ae000
--- /dev/null
+++ b/debian/libwxgtk-python.files
@@ -0,0 +1,2 @@
+usr/lib/python1.5/site-packages/wxPython
+usr/lib/libwxPyHelpers.so
diff --git a/debian/libwxgtk-python.postinst b/debian/libwxgtk-python.postinst
new file mode 100644
index 0000000000..5972978114
--- /dev/null
+++ b/debian/libwxgtk-python.postinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+WXPYTHONDIR="/usr/lib/python1.5/site-packages/wxPython"
+
+if [ "$1" = "configure" ]; then
+ python /usr/lib/python1.5/compileall.py -q ${WXPYTHONDIR}
+ python -O /usr/lib/python1.5/compileall.py -q ${WXPYTHONDIR}
+fi
+
+#DEBHELPER#
+
diff --git a/debian/libwxgtk-python.prerm b/debian/libwxgtk-python.prerm
new file mode 100644
index 0000000000..8417f23f42
--- /dev/null
+++ b/debian/libwxgtk-python.prerm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+WXPYTHONDIR="/usr/lib/python1.5/site-packages/wxPython"
+find ${WXPYTHONDIR} -name "*.py?" -exec rm -f {} \;
+
+#DEBHELPER#
+
diff --git a/debian/libwxgtk.files b/debian/libwxgtk.files
index 56ac99c047..ad2e7b204b 100644
--- a/debian/libwxgtk.files
+++ b/debian/libwxgtk.files
@@ -1,2 +1,2 @@
-usr/lib/*.so.*
+usr/lib/libwx_gtk*.so.*
usr/share/wx
diff --git a/debian/rules b/debian/rules
index f760ecc54f..9544df4795 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,39 +5,49 @@
# variously stolen code :-)
# (including a debhelper template, GNU copyright 1997 to 1999 by
# Joey Hess, and some ideas found in the ncurses rules file that
-# I quite liked)
+# I quite liked. Thanks!)
#export DH_VERBOSE=1
export DH_COMPAT=2
-# Change this when the release version changes and
-# touch control.in to propagate the change.
-release=2.1
+release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
-# These are the packages we will build
+# Packages to build:
package_gtk_lib=libwxgtk$(release)
package_gtk_dev=libwxgtk$(release)-dev
-package_doc=libwx$(release)-doc
+package_gtk_py=libwxgtk$(release)-python
+package_doc=wxwin$(release)-doc
-# Dirs to put the various builds object files in
+# Build directories:
objdir_gtk_shared=objs_gtk_sh
objdir_gtk_static=objs_gtk_st
+objdir_doc_cruft=objs_doc_con
+objdir_doc=docs/wxWindows-manual.html
+objdirs=$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_doc)
-objdirs=$(objdir_gtk_shared) $(objdir_gtk_static)
+build_stamps=build-gtk-shared-stamp build-gtk-static-stamp \
+ build-gtk-python-stamp build-doc-stamp
-build_stamps=build-gtk-shared-stamp build-gtk-static-stamp build-doc-stamp
+wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
+ --prefix=$(shell pwd) \
+ --exec-prefix=$(shell pwd)/$(objdir_gtk_shared)
+# The Rules:
+
debian/control: debian/control.in
sed -e 's/=V/$(release)/g' < debian/control.in > debian/control
-build: debian/control $(build_stamps)
+debian/wxwin-doc.doc-base: debian/wxwin-doc.doc-base.in
+ sed -e 's/=V/$(release)/g' < debian/wxwin-doc.doc-base.in > debian/wxwin-doc.doc-base
+
+build: debian/control debian/wxwin-doc.doc-base $(build_stamps)
build-gtk-shared-stamp:
dh_testdir
mkdir $(objdir_gtk_shared)
cd $(objdir_gtk_shared) \
- && ../configure --prefix=/usr --with-gtk \
+ && ../configure --prefix=/usr --with-gtk --enable-burnt_name --disable-newgrid \
&& $(MAKE)
touch $@
@@ -49,30 +59,49 @@ build-gtk-static-stamp:
&& $(MAKE)
touch $@
+build-gtk-python-stamp: build-gtk-shared-stamp
+ dh_testdir
+ cd utils/wxPython/src \
+ && touch gtk/*.cpp gtk/*.py \
+ && ../distrib/build.py -b WXDIR=../../.. WXCONFIG='$(wxconfig)'
+ cd utils/wxPython/modules/html \
+ && ../../distrib/build.py -b WXDIR=../../../.. WXCONFIG='$(wxconfig)'
+ cd utils/wxPython/modules/utils \
+ && ../../distrib/build.py -b WXDIR=../../../.. WXCONFIG='$(wxconfig)'
+ touch $@
+
build-doc-stamp: build-gtk-shared-stamp
dh_testdir
cd $(objdir_gtk_shared)/utils/tex2rtf/src \
- && $(MAKE) \
- && mkdir HTML \
- && ./tex2rtf ../../../../docs/latex/wx/manual.tex HTML/wxwin -twice -html \
- && cp ../../../../docs/latex/wx/*.gif HTML \
- && rm -f *.con \
- && rm -f HTML/wxwin.con HTML/wxwin.hh* HTML/wxwin.htx HTML/wxwin.ref
- rm -rf docs/wxWindows-manual.html
- mv $(objdir_gtk_shared)/utils/tex2rtf/src/HTML docs/wxWindows-manual.html
+ && $(MAKE)
+ mkdir $(objdir_doc)
+ mkdir $(objdir_doc_cruft)
+ cd $(objdir_doc_cruft) \
+ && LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib \
+ ../$(objdir_gtk_shared)/utils/tex2rtf/src/tex2rtf \
+ ../docs/latex/wx/manual.tex ../$(objdir_doc)/wxwin -twice -html
+ cp docs/latex/wx/*.gif $(objdir_doc)
+ rm -rf $(objdir_doc_cruft)
+ rm -f $(objdir_doc)/wxwin.con $(objdir_doc)/wxwin.hh* \
+ $(objdir_doc)/wxwin.htx $(objdir_doc)/wxwin.ref
touch $@
clean: debian/control
dh_testdir
dh_testroot
rm -rf $(build_stamps) $(objdirs)
- rm -rf docs/wxWindows-manual.html
+ -cd utils/wxPython/src && $(MAKE) clean
+ -cd utils/wxPython/modules/html && $(MAKE) clean
+ -cd utils/wxPython/modules/utils && $(MAKE) clean
dh_clean
rm -f debian/$(package_gtk_lib).*
rm -f debian/$(package_gtk_dev).*
+ rm -f debian/$(package_gtk_py).*
rm -f debian/$(package_doc).*
install: build
+ dh_testdir
+ dh_testroot
@for f in dirs docs files postinst; do \
echo "generating control file $(package_gtk_lib).$$f"; \
cp debian/libwxgtk.$$f debian/$(package_gtk_lib).$$f; \
@@ -81,17 +110,34 @@ install: build
echo "generating control file $(package_gtk_dev).$$f"; \
cp debian/libwxgtk-dev.$$f debian/$(package_gtk_dev).$$f; \
done;
+ @for f in dirs docs files postinst prerm; do \
+ echo "generating control file $(package_gtk_py).$$f"; \
+ cp debian/libwxgtk-python.$$f debian/$(package_gtk_py).$$f; \
+ done;
@for f in dirs docs doc-base; do \
echo "generating control file $(package_doc).$$f"; \
- cp debian/libwx-doc.$$f debian/$(package_doc).$$f; \
+ cp debian/wxwin-doc.$$f debian/$(package_doc).$$f; \
done;
- dh_testdir
- dh_testroot
dh_clean -k
dh_installdirs
cd $(objdir_gtk_shared) \
&& $(MAKE) install prefix=`pwd`/../debian/tmp/usr
cp $(objdir_gtk_static)/lib/*.a debian/tmp/usr/lib
+ cd utils/wxPython/src \
+ && ../distrib/build.py -i \
+ TARGETDIR=../../../debian/tmp/usr/lib/python1.5/site-packages/wxPython \
+ HELPERLIBDIR=../../../debian/tmp/usr/lib \
+ WXDIR=../../..
+ cd utils/wxPython/modules/html \
+ && ../../distrib/build.py -i \
+ TARGETDIR=../../../../debian/tmp/usr/lib/python1.5/site-packages/wxPython \
+ WXDIR=../../../..
+ cd utils/wxPython/modules/utils \
+ && ../../distrib/build.py -i \
+ TARGETDIR=../../../../debian/tmp/usr/lib/python1.5/site-packages/wxPython \
+ WXDIR=../../../..
+ find debian/tmp/usr/lib/python1.5/site-packages/wxPython \
+ -name '*.py?' -exec rm '{}' ';'
dh_movefiles
@@ -117,7 +163,7 @@ binary-arch: build install
dh_fixperms
dh_makeshlibs
dh_installdeb
- dh_shlibdeps
+ dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_py)/usr/lib
dh_gencontrol
dh_md5sums
dh_builddeb
diff --git a/debian/wx-config.1 b/debian/wx-config.1
index 07775489be..86f8925d89 100644
--- a/debian/wx-config.1
+++ b/debian/wx-config.1
@@ -42,12 +42,16 @@ was built with when computing the output for the \-\-cflags and
\-\-libs options. This option is also used for the exec prefix
if \-\-exec\-prefix was not specified. This option must be specified
before any \-\-libs or \-\-cflags options.
+.br
+(Translation: this is the root path to the \fIwxGTK\fP headers -- [Ron])
.TP 8
.B \-\-exec\-prefix=PREFIX
If specified, use PREFIX instead of the installation exec prefix that
\fIwxGTK\fP was built with when computing the output for the \-\-cflags
and \-\-libs options. This option must be specified before any
\-\-libs or \-\-cflags options.
+.br
+(Translation: this is the root path to the \fIwxGTK\fP library -- [Ron])
.SH SEE ALSO
.BR gtk-config (1)
.SH COPYRIGHT
diff --git a/debian/libwx-doc.dirs b/debian/wxwin-doc.dirs
similarity index 100%
rename from debian/libwx-doc.dirs
rename to debian/wxwin-doc.dirs
diff --git a/debian/libwx-doc.doc-base b/debian/wxwin-doc.doc-base.in
similarity index 51%
rename from debian/libwx-doc.doc-base
rename to debian/wxwin-doc.doc-base.in
index 1bb32572ab..653d988987 100644
--- a/debian/libwx-doc.doc-base
+++ b/debian/wxwin-doc.doc-base.in
@@ -1,10 +1,10 @@
Document: wxwindows-manual
-Title: wxWindows Progamming Manual
+Title: wxWindows Programming Manual
Author: The wxWindows Cabal
Abstract: This manual describes the wxWindows cross-platform GUI toolkit.
Section: Apps/Programming
Format: HTML
-Index: /usr/share/doc/libwx2.1-doc/wxWindows-manual.html/wxwin.htm
-Files: /usr/share/doc/libwx2.1-doc/wxWindows-manual.html/*
+Index: /usr/share/doc/wxwin=V-doc/wxWindows-manual.html/wxwin.htm
+Files: /usr/share/doc/wxwin=V-doc/wxWindows-manual.html/*
diff --git a/debian/libwx-doc.docs b/debian/wxwin-doc.docs
similarity index 100%
rename from debian/libwx-doc.docs
rename to debian/wxwin-doc.docs
diff --git a/make-deb b/make-deb
index acba42208e..bd77ba1282 100755
--- a/make-deb
+++ b/make-deb
@@ -3,7 +3,7 @@ set -e
TEMPDIR=temp-debian
-echo "creating Debian source tree"
+echo "creating Debian source tree ..."
rm -rf ${TEMPDIR}
mkdir ${TEMPDIR}
@@ -11,4 +11,12 @@ cd ${TEMPDIR} && ../configure && make debian-dist
cd .. && rm -r ${TEMPDIR}
echo "done."
+echo " "
+echo " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+echo " If this is a new release version"
+echo " remember to update the changelog"
+echo " before building the package."
+echo " "
+echo " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+echo " "
--
2.47.2