X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eedbe99970cd19e73a8f96f6a06e775408a4709f..b45c2fe579126a8c834ac6d41d8312e4a210eb9a:/debian/rules

diff --git a/debian/rules b/debian/rules
index 316d17626c..a3b59b9963 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,7 @@ soversion := $(shell grep '^WX_CURRENT=' configure.in | sed 's/WX_CURRENT=\([0-9
 sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%).$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR))
 
 pydir     := usr/lib/$(python_ver)/site-packages
-wxpydir   := $(pydir)/wx-$(sorelease)-gtk2-unicode
+wxpydir   := $(pydir)/wx-$(release)-gtk2-unicode
 
 cross_host  = i586-mingw32msvc
 cross_build = $(shell ./config.guess)
@@ -55,7 +55,7 @@ config_cache_cross = ../config_deb_cross.cache
 package_gtk_lib         = libwxgtk$(sorelease)
 package_gtk_dev         = libwxgtk$(release)-dev
 package_gtk_dbg         = libwxgtk$(release)-dbg
-package_gtk_py_lib      = libwxgtk$(sorelease)-python
+package_gtk_py_lib      = python-wxgtk$(sorelease)
 package_gtk_py          = wxpython$(sorelease)
 package_common          = wx$(release)-common
 package_headers         = wx$(release)-headers
@@ -63,7 +63,7 @@ package_i18n            = wx$(release)-i18n
 package_doc             = wx$(release)-doc
 package_examples        = wx$(release)-examples
 
-package_gtk_dbg_py      = libwxgtk$(sorelease)-dbg-python
+package_gtk_dbg_py      = python-wxgtk$(sorelease)-dbg
 package_msw_dev         = libwxmsw$(release)-dev
 package_msw_dbg         = libwxmsw$(release)-dbg
 package_headers_msw     = wx$(release)-headers-msw
@@ -150,24 +150,22 @@ control-files-stamp: debian/control
 	done;
 	@for f in docs postinst prerm; do                                    \
 		echo "generating control file $(package_gtk_py_lib).$$f";    \
-		sed -e 's/=PY/$(python_ver)/g;                               \
-			s|=WXPYDIR|$(wxpydir)|g;                             \
-			s/=V/$(release)/g;                                   \
-			s/=SOV/$(sorelease)/g'                               \
-			< debian/libwxgtk-python.$$f                         \
+		sed -e 's/=PY/$(python_ver)/g;s|=WXPYDIR|$(wxpydir)|g;'      \
+		    -e 's/=V/$(release)/g;s/=SOV/$(sorelease)/g'             \
+			< debian/python-wxgtk.$$f                            \
 			> debian/$(package_gtk_py_lib).$$f;                  \
 	done;
 	@echo "generating control file $(package_gtk_py).menu";              \
-		sed -e 's/=SOV/$(sorelease)/g' < debian/wxpython.menu        \
+		sed -e 's/=SOV/$(sorelease)/g' < debian/python-wxtools.menu  \
 			> debian/$(package_gtk_py).menu;
 	@for f in docs postinst; do                                          \
 		echo "generating control file $(package_gtk_dbg_py).$$f";    \
 		sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g;s/=SOV/$(sorelease)/g' \
-			< debian/libwxgtk-python.$$f                         \
+			< debian/python-wxgtk.$$f                            \
 			> debian/$(package_gtk_dbg_py).$$f;                  \
 	done;
 	@echo "generating control file $(package_gtk_dbg_py).prerm";         \
-		sed 's/=SOV/$(sorelease)/g' < debian/libwxgtk-dbg-python.prerm \
+		sed 's/=SOV/$(sorelease)/g' < debian/python-wxgtk-dbg.prerm  \
 		    > debian/$(package_gtk_dbg_py).prerm
 	@for f in docs doc-base; do                                          \
 		echo "generating control file $(package_doc).$$f";           \
@@ -216,10 +214,13 @@ configure-gtk-shared-stamp:
 				--cache-file=$(config_cache)		\
 				--with-flavour=$(DEBIAN_WXFLAVOUR)	\
 				--with-gtk				\
+				--with-opengl				\
+				--with-gnomeprint			\
 				--with-zlib=sys				\
 				--with-libjpeg=sys			\
 				--with-libpng=sys			\
-				--with-libtiff=sys
+				--with-libtiff=sys			\
+				--enable-unicode
 	touch $@
 
 build-gtk-shared-stamp: configure-gtk-shared-stamp
@@ -236,11 +237,14 @@ configure-gtk-debug-stamp:
 				--cache-file=$(config_cache)		\
 				--with-flavour=$(DEBIAN_WXFLAVOUR)	\
 				--with-gtk				\
-				--enable-debug				\
+				--with-opengl				\
+				--with-gnomeprint			\
 				--with-zlib=sys				\
 				--with-libjpeg=sys			\
 				--with-libpng=sys			\
-				--with-libtiff=sys
+				--with-libtiff=sys			\
+				--enable-debug				\
+				--enable-unicode
 	touch $@
 
 build-gtk-debug-stamp: configure-gtk-debug-stamp
@@ -253,7 +257,6 @@ build-gtk-shared-contrib-stamp: build-gtk-shared-stamp
 	dh_testdir
 	cd $(objdir_gtk_shared)/contrib/src && $(FAST_MAKE)
 	cd $(objdir_gtk_shared)/utils/wxrc && $(FAST_MAKE)
-	#cd $(objdir_gtk_shared)/contrib/utils/wxrcedit && $(FAST_MAKE)
 	touch $@
 
 
@@ -532,11 +535,8 @@ install-common: install-gtk-shared-stamp
 	dh_installman debian/wx-config.1
 
 	dh_install $(objdir_gtk_shared)/utils/wxrc/wxrc	usr/bin
-#	dh_install $(objdir_gtk_shared)/contrib/utils/wxrcedit/wxrcedit	usr/bin
-
 	dh_installman debian/wxrc-tools.1
 	dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1
-#	dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrcedit.1
 
 
 install-headers: DH_OPTIONS=-p$(package_headers)