X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a7d17a27240b5bf21a8111b92f05fb7629c4141..c66972ccc2e30bb737cdbfa64b6ea22964faa7f0:/debian/rules

diff --git a/debian/rules b/debian/rules
index 79093ca28a..8c89fd845b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,8 +71,8 @@ release  := $(wx_major_version_number).$(wx_minor_version_number)
 # specify $soversion below.  Re-automate if incompatible changes
 # result in it actually changing.
 #soversion := $(shell grep '^WX_CURRENT=' configure.in | sed 's/WX_CURRENT=\([0-9]\+\).*/\1/')
-##soversion := 0
-##sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%)-$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR))
+soversion := 0
+sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%)-$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR))
 
 # In some places we use the full version number, including the micro version,
 # for the development releases (which can be incompatible for the same major
@@ -112,7 +112,6 @@ BASE_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \
 
 GTK_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \
     --with-gtk \
-    --with-gnomeprint \
     --enable-mediactrl \
     --enable-sound \
     --with-sdl \
@@ -151,11 +150,11 @@ else
 endif
 
 # Packages to build:
-package_wxbase_lib      := libwxbase$(release)$(unicode_suffix)
+package_wxbase_lib      := libwxbase$(sorelease)$(unicode_suffix)
 package_wxbase_dev      := libwxbase$(release)$(unicode_suffix)-dev
 package_wxbase_dbg      := libwxbase$(release)$(unicode_suffix)-dbg
 
-package_gtk_lib         := libwxgtk$(release)$(unicode_suffix)
+package_gtk_lib         := libwxgtk$(sorelease)$(unicode_suffix)
 package_gtk_dev         := libwxgtk$(release)$(unicode_suffix)-dev
 package_gtk_dbg         := libwxgtk$(release)$(unicode_suffix)-dbg
 
@@ -281,7 +280,7 @@ debian/python-version:
 	echo python_ver := python$(shell python -c "import sys;print sys.version[:3]") > $@
 
 debian/control: $(addprefix debian/,control.in python-version)
-	sed -e 's/=V/$(release)/g;s/=SOV/$(release)/g;s/=PY/$(python_ver)/g;s/=U/$(unicode_suffix)/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
 
 control-files-stamp: debian/control
@@ -363,7 +362,7 @@ control-files-stamp: debian/control
 #			> debian/$(package_common).menu;
 	@echo "generating control file lintian-override";                    \
 		sed -e 's/=V/$(release)/g;                                  '\
-'			s/=SOV/$(release)/g'                                 \
+'			s/=SOV/$(sorelease)/g'                               \
 			< debian/lintian-override.in                         \
 			> debian/lintian-override;                           \
 	touch $@
@@ -470,12 +469,13 @@ build-gtk-py-stamp: build-gtk-shared-stamp purge-dbg-py
 
 build-doc-stamp: build-gtk-shared-stamp
 	dh_testdir
-	mkdir $(objdir_doc); 
 	# the tarball may already have the generated docs in it
 	if [ ! -e docs/html/wx/index.html ]; then \
 		cd $(objdir_gtk_shared)/utils/tex2rtf/src && $(FAST_MAKE); \
+		cd -; \
 		rm -rf $(objdir_doc); \
 		rm -rf $(objdir_doc_cruft); \
+		mkdir $(objdir_doc); \
 		mkdir $(objdir_doc_cruft); \
 		cd $(objdir_doc_cruft); \
 		LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib:$(LD_LIBRARY_PATH) \
@@ -483,10 +483,12 @@ build-doc-stamp: build-gtk-shared-stamp
 		   ../docs/latex/wx/manual.tex                                 \
 		   ../$(objdir_doc)/wx$(release)-manual.html                   \
 		   -twice -html;                                               \
+		cd -; \
 		cp docs/latex/wx/*.gif $(objdir_doc); \
 		rm -rf $(objdir_doc_cruft); \
 		rm -f $(objdir_doc)/wx$(release)-manual.{con,hh*,htx,ref}; \
 	else \
+		mkdir $(objdir_doc); \
 		cp docs/html/wx/* $(objdir_doc); \
 		mv $(objdir_doc)/index.html $(objdir_doc)/wx-$(release)-manual_contents.html; \
 	fi