From: Ron Lee Date: Thu, 23 Jun 2005 07:55:23 +0000 (+0000) Subject: Update standards version. Rip out wxrcedit cruft. Fix wxpyver dir. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/109898eaadde5f70f0815513f57f9a98be9f36d9 Update standards version. Rip out wxrcedit cruft. Fix wxpyver dir. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/debian/control.in b/debian/control.in index be1912fd1c..90ad810249 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,7 +3,7 @@ Section: libs Priority: optional Build-Depends: debhelper (>=4.0), flex, bison, gettext, libgtk2.0-dev, =PY, =PY-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev, libesd0-dev, libgnomeprintui2.2-dev Maintainer: Ron Lee -Standards-Version: 3.6.1.1 +Standards-Version: 3.6.2.1 Package: libwxgtk=SOV Architecture: any diff --git a/debian/rules b/debian/rules index fc83ce9a0a..18cc33a030 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) @@ -259,7 +259,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 $@ @@ -538,11 +537,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)