From cf6f6c1c5e3971e0d4e023bd8267b9430e46f598 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 17 Feb 2011 11:49:54 +0000 Subject: patch [#26063] Fix deb package versioning (Patch for #26062) from Shinsuke Irie (irie), also updated pacman --- build_files/package_spec/build_debian.sh | 1 + build_files/package_spec/debian/control | 7 ++-- build_files/package_spec/debian/copyright | 53 +------------------------------ build_files/package_spec/debian/docs | 1 + build_files/package_spec/debian/menu | 2 +- build_files/package_spec/debian/rules | 8 ++++- build_files/package_spec/pacman/PKGBUILD | 6 ++-- 7 files changed, 19 insertions(+), 59 deletions(-) diff --git a/build_files/package_spec/build_debian.sh b/build_files/package_spec/build_debian.sh index 17c0abb888b..dda24eabee5 100755 --- a/build_files/package_spec/build_debian.sh +++ b/build_files/package_spec/build_debian.sh @@ -23,6 +23,7 @@ dch -b -v $DEB_VERSION "New upstream SVN snapshot." # run the rules makefile +rm -rf get-orig-source debian/rules get-orig-source SVN_URL=. mv *.gz ../ diff --git a/build_files/package_spec/debian/control b/build_files/package_spec/debian/control index 5d9615faf8b..3a6fda8ff6c 100644 --- a/build_files/package_spec/debian/control +++ b/build_files/package_spec/debian/control @@ -2,16 +2,19 @@ Source: blender Section: graphics Priority: extra Maintainer: Dan Eicher -Build-Depends: debhelper (>= 7.0.50~), cmake, python3, python, libfreetype6-dev, libglu1-mesa-dev, libilmbase-dev, libopenexr-dev, libjpeg62-dev, libopenal-dev, libpng12-dev, libsamplerate0-dev, libsdl-dev, libtiff4-dev, libx11-dev, libxi-dev, zlib1g-dev, python3.1-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386] +Build-Depends: debhelper (>= 7.0.50~), cmake, python3, python, libfreetype6-dev, libglu1-mesa-dev, libilmbase-dev, libopenexr-dev, libjpeg62-dev, libopenal-dev, libpng12-dev, libsamplerate0-dev, libsdl-dev, libtiff4-dev, libx11-dev, libxi-dev, zlib1g-dev, python3.1-dev, libopenjpeg-dev Standards-Version: 3.9.1 Homepage: http://blender.org/ Vcs-Browser: http://github.com/eponymous/blender Vcs-Git: git://github.com/eponymous/blender.git X-Python3-Version: >= 3.1, << 3.2 -Package: blender +Package: blender-snapshot Architecture: any Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends} +Provides: blender +Conflicts: blender +Replaces: blender Description: Very fast and versatile 3D modeller/renderer Blender is an integrated 3d suite for modelling, animation, rendering, post-production, interactive creation and playback (games). Blender has its diff --git a/build_files/package_spec/debian/copyright b/build_files/package_spec/debian/copyright index 5758dc3a086..0f7287208af 100644 --- a/build_files/package_spec/debian/copyright +++ b/build_files/package_spec/debian/copyright @@ -28,58 +28,7 @@ License: On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". -Python: - - PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 - -------------------------------------------- - - 1. This LICENSE AGREEMENT is between the Python Software Foundation - ("PSF"), and the Individual or Organization ("Licensee") accessing and - otherwise using this software ("Python") in source or binary form and - its associated documentation. - - 2. Subject to the terms and conditions of this License Agreement, PSF - hereby grants Licensee a nonexclusive, royalty-free, world-wide - license to reproduce, analyze, test, perform and/or display publicly, - prepare derivative works, distribute, and otherwise use Python - alone or in any derivative version, provided, however, that PSF's - License Agreement and PSF's notice of copyright, i.e., "Copyright (c) - 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights - Reserved" are retained in Python alone or in any derivative version - prepared by Licensee. - - 3. In the event Licensee prepares a derivative work that is based on - or incorporates Python or any part thereof, and wants to make - the derivative work available to others as provided herein, then - Licensee hereby agrees to include in any such work a brief summary of - the changes made to Python. - - 4. PSF is making Python available to Licensee on an "AS IS" - basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR - IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND - DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS - FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT - INFRINGE ANY THIRD PARTY RIGHTS. - - 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON - FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS - A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, - OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - - 6. This License Agreement will automatically terminate upon a material - breach of its terms and conditions. - - 7. Nothing in this License Agreement shall be deemed to create any - relationship of agency, partnership, or joint venture between PSF and - Licensee. This License Agreement does not grant permission to use PSF - trademarks or trade name in a trademark sense to endorse or promote - products or services of Licensee, or any third party. - - 8. By copying, installing or otherwise using Python, Licensee - agrees to be bound by the terms and conditions of this License - Agreement. - - + The Debian packaging is: Copyright (C) 2011 Dan Eicher diff --git a/build_files/package_spec/debian/docs b/build_files/package_spec/debian/docs index 2cefea03ad4..886845257bc 100644 --- a/build_files/package_spec/debian/docs +++ b/build_files/package_spec/debian/docs @@ -1 +1,2 @@ +release/text/copyright.txt release/text/readme.html diff --git a/build_files/package_spec/debian/menu b/build_files/package_spec/debian/menu index b30788d55b5..1124c723b3c 100644 --- a/build_files/package_spec/debian/menu +++ b/build_files/package_spec/debian/menu @@ -1,4 +1,4 @@ -?package(blender):needs="X11" section="Applications/Graphics"\ +?package(blender-snapshot):needs="X11" section="Applications/Graphics"\ longtitle="Blender 3D modeler / renderer"\ icon="/usr/share/pixmaps/blender.svg"\ title="blender" command="/usr/bin/blender" diff --git a/build_files/package_spec/debian/rules b/build_files/package_spec/debian/rules index 5844d289d88..60b8c694dd4 100755 --- a/build_files/package_spec/debian/rules +++ b/build_files/package_spec/debian/rules @@ -18,6 +18,12 @@ override_dh_auto_configure: -DWITH_PYTHON_INSTALL:BOOL=OFF \ -DWITH_OPENCOLLADA:BOOL=OFF +override_dh_install: + dh_install + + # remove duplicated docs + rm -rf debian/blender-snapshot/usr/share/doc/blender + override_dh_python3: dh_python3 -V 3.1-3.2 /usr/share/blender/$(REL)/scripts @@ -27,4 +33,4 @@ get-orig-source: svn -q export -r $(REV) $(SVN_URL) get-orig-source/blender-$(VER) GZIP='--best --no-name' tar czf $(TARBALL) -C get-orig-source blender-$(VER) rm -rf get-orig-source - echo " "$(TARBALL)" created; move it to the right destination to build the package" + @echo "$(TARBALL) created; move it to the right destination to build the package" diff --git a/build_files/package_spec/pacman/PKGBUILD b/build_files/package_spec/pacman/PKGBUILD index 50e435045cc..6102be5833c 100644 --- a/build_files/package_spec/pacman/PKGBUILD +++ b/build_files/package_spec/pacman/PKGBUILD @@ -7,7 +7,7 @@ blender_version=$(grep BLENDER_VERSION $blender_srcdir/source/blender/blenkernel # blender_subversion=$(grep BLENDER_SUBVERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9) blender_ver_string=$(expr $blender_version / 100).$(expr $blender_version % 100)+svn$blender_revision -pkgname=blender-beta +pkgname=blender-snapshort pkgver=$blender_ver_string pkgrel=1 pkgdesc="A fully integrated 3D graphics creation suite" @@ -18,9 +18,9 @@ groups=() depends=('libjpeg' 'libpng' 'openexr' 'python>=3.1' 'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal' 'sdl' 'libsndfile' 'libsamplerate' 'ffmpeg') makedepends=('cmake' 'svn') optdepends=() -provides=('blender') +provides=() conflicts=('blender') -replaces=() +replaces=('blender') backup=() options=() install=blender.install -- cgit v1.2.3