[SCM] blender/master: Merge branch 'master.experimental'
mfv at users.alioth.debian.org
mfv at users.alioth.debian.org
Thu Feb 4 22:47:20 UTC 2016
Merge tag 'upstream/2.76.b+dfsg0' into master.experimental
Imported Upstream version 2.76.b+dfsg0
Merge tag 'upstream/2.76.a+dfsg0' into master.experimental
Imported Upstream version 2.76.a+dfsg0
debian/changelog: UNRELEASED => experimental
debian/changelog: new upstream release entry added
debian/patches/: patchset re-worked against v2.76
Merge tag 'upstream/2.76+dfsg0' into master.experimental
Imported Upstream version 2.76+dfsg0
debian/changelog: UNRELEASED => experimental
debian/changelog: new revision entry added
debian/menu: file dropped
debian/: drop netrender addon
debian/patches/: patchset updated
debian/changelog: UNRELEASED => experimental
debian/changelog: new upstream bugfix release entry added
debian/changelog: merged from master branch
Remove myself from the Uploaders field
debian/patches/: patchset re-worked against v2.75a
debian/copyright: license names fixed
debian/control: libilmbase-dev (>= 2.2.0) b-dep added
debian/control: libopenexr-dev bumped to (>= 2.2.0)
debian/control: libfontconfig-dev sorted
debian/control: libjemalloc-dev b-dep added
debian/TODO: obsolete file dropped
debian/rules: couple of useless license text files dropped
Merge tag 'upstream/2.75.a+dfsg0'
Imported Upstream version 2.75.a+dfsg0
Merge tag 'upstream/2.75+dfsg0'
Imported Upstream version 2.75+dfsg0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: cabab289c9d57a0636870572d90d531a3bca507a
X-Git-Newrev: 987b14c9c0dc0a51b94cb61b1d9dac01a0dd88d7
The following commit has been merged in the master branch:
commit 987b14c9c0dc0a51b94cb61b1d9dac01a0dd88d7
Merge: cabab289c9d57a0636870572d90d531a3bca507a 62bf634e163b14ebd050ae55c94f2ac437c57c9e
Author: Matteo F. Vescovi <mfv at debian.org>
Date: Thu Feb 4 23:43:02 2016 +0100
Merge branch 'master.experimental'
diff --combined debian/changelog
index 21a576e,978ff63..132518d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,62 +1,89 @@@
+ blender (2.76.b+dfsg0-3) unstable; urgency=medium
+
+ * Upload to unstable (Closes: #810065)
+
+ -- Matteo F. Vescovi <mfv at debian.org> Tue, 02 Feb 2016 12:25:04 +0100
+
+blender (2.74+dfsg0-6) unstable; urgency=medium
+
+ * debian/patches/: patchset updated (Closes: #804678)
+ - 0007-look_for_droid_ttf_with_fontconfig.patch
+ -> 0007-look_for_dejavu_ttf_with_fontconfig.patch
+ - 0008-ffmpeg_2.9.patch refreshed
+ * debian/control: fonts-droid -> fonts-dejavu dependency
+ for binary package
+ * debian/control: Vcs-* fields updated
+
+ -- Matteo F. Vescovi <mfv at debian.org> Sun, 31 Jan 2016 14:51:13 +0100
+
+ blender (2.76.b+dfsg0-2) experimental; urgency=medium
+
+ * debian/control:
+ - fonts-droid -> fonts-dejavu in binary package (Closes: #804678)
+ - Vcs-* fields updated
+
+ -- Matteo F. Vescovi <mfv at debian.org> Sat, 30 Jan 2016 15:51:47 +0100
+
+blender (2.74+dfsg0-5) unstable; urgency=medium
+
+ [ Alessio Treglia ]
+ * Remove myself from the Uploaders field
+
+ [ Matteo F. Vescovi ]
+ * debian/: drop netrender addon
+ * debian/control: libavfilter-dev b-dep added
+ * debian/patches/: patchset updated
+ - 0008-ffmpeg_2.9.patch added (Closes: #803803)
+ Thanks to Andreas Cadhalpun for the patch.
+ * debian/menu: file dropped
+
+ -- Matteo F. Vescovi <mfv at debian.org> Wed, 09 Dec 2015 22:52:22 +0100
+
+ blender (2.76.b+dfsg0-1) experimental; urgency=medium
+
+ * New upstream bugfix release
+ - debian/patches/: patchset updated against v2.76b
+ - #0006 renamed to 0006-look_for_dejavu_ttf_with_fontconfig.patch
+ with the usage of DejaVu fonts instead of Droid (Closes: #804678)
+ - 0007-fix_FTBFS_on_non-x86_platforms.patch dropped
+ (applied upstream)
+
+ -- Matteo F. Vescovi <mfv at debian.org> Sat, 21 Nov 2015 21:56:39 +0100
+
+ blender (2.76+dfsg0-1) experimental; urgency=medium
+
+ * New upstream release
+ - debian/patches/: patchset re-worked against v2.76
+ - #0001 to #0005 refreshed
+ - 0006-blender_desktop.patch dropped (applied upstream)
+ - 0007-look_for_droid_ttf_with_fontconfig.patch -> #0006
+ - 0008-fix_FTBFS_on_non-x86_platforms.patch -> #0007
+
+ -- Matteo F. Vescovi <mfv at debian.org> Fri, 23 Oct 2015 21:50:30 +0200
+
+ blender (2.75.a+dfsg0-2) experimental; urgency=medium
+
+ * debian/patches/: patchset updated
+ - 0008-fix_FTBFS_on_non-x86_platforms.patch added
+ * debian/: drop netrender addon
+ * debian/menu: file dropped
+
+ -- Matteo F. Vescovi <mfv at debian.org> Fri, 16 Oct 2015 16:12:09 +0200
+
+ blender (2.75.a+dfsg0-1) experimental; urgency=medium
+
+ [ Matteo F. Vescovi ]
+ * New upstream bugfix release
+ - debian/patches/: patchset re-worked against v2.75a
+ - debian/control:
+ - libilmbase-dev (>= 2.2.0) b-dep added
+ - libopenexr-dev (>= 2.2.0) b-dep added
+
+ [ Alessio Treglia ]
+ * Remove myself from the Uploaders field
+
+ -- Matteo F. Vescovi <mfv at debian.org> Thu, 06 Aug 2015 09:39:09 +0200
+
blender (2.74+dfsg0-4) unstable; urgency=medium
* debian/patches/: patchset updated (Closes: #790970)
diff --combined debian/control
index 5cd7492,2bd42dd..3a0282d
--- a/debian/control
+++ b/debian/control
@@@ -11,7 -11,6 +11,7 @@@ Build-Depends: autotools-dev
libavcodec-dev (>> 6:10),
libavdevice-dev,
libavformat-dev,
+ libavfilter-dev,
libboost-dev,
libboost-filesystem-dev,
libboost-locale-dev,
@@@ -19,9 -18,11 +19,11 @@@
libboost-system-dev,
libboost-thread-dev,
libfftw3-dev,
+ libfontconfig-dev,
libgettextpo-dev,
libglew-dev,
libgsm1-dev,
+ libilmbase-dev (>= 2.2.0),
libjack-dev,
libjemalloc-dev,
libjpeg-dev,
@@@ -29,7 -30,7 +31,7 @@@
liblzo2-dev,
libopenal-dev,
libopencolorio-dev [!hurd-i386],
- libopenexr-dev,
+ libopenexr-dev (>= 2.2.0),
libopenimageio-dev,
libopenjpeg-dev,
libpng-dev,
@@@ -41,7 -42,6 +43,6 @@@
libvorbis-dev,
libxi-dev,
libz-dev,
- libfontconfig-dev,
pkg-config,
python3-dev,
python3-requests
@@@ -49,7 -49,7 +50,7 @@@ X-Python3-Version: >= 3.
Build-Conflicts: nvidia-glx
Standards-Version: 3.9.6
Homepage: http://www.blender.org/
- Vcs-Git: https://anonscm.debian.org/pkg-multimedia/blender.git
+ Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/blender.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/blender.git
Package: blender
--
blender packaging
More information about the pkg-multimedia-commits
mailing list