[SCM] xbmc/wheezy-backports: Merge tag 'debian/2%13.1_rc1+dfsg1-1' into wheezy-backports
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Sat Jun 21 07:47:29 UTC 2014
Finalize changelog
Update changelog
Refresh patches
Merge tag 'upstream/13.1_rc1+dfsg1'
Imported Upstream version 13.1~rc1+dfsg1
Always enable parallel builds
Start working on next upload
Finalize changelog
Merge tag 'upstream/13.1_beta2+dfsg1'
Imported Upstream version 13.1~beta2+dfsg1
Define AV_CODEC_ID_SUBRIP to AV_CODEC_ID_TEXT in libav hacks and fix compilation
Ship additional include files in xbmc-addons-dev
Drop obsolete chunk from 06-use-external-libraries.patch
Refactor patches to split Libav-related ones
Fix embedded subtitle handling using Libav
Start working on next upload
Finalize changelog targeting unstable
Merge tag 'upstream/13.1_beta1+dfsg1'
Imported Upstream version 13.1~beta1+dfsg1
Fix #include directive across installed headers
Start working on next upload
Finalize changelog targeting experimental
Refresh patches
Merge tag 'upstream/13.0+dfsg1'
Imported Upstream version 13.0+dfsg1
Start working on next upload
Finalize changelog targeting experimental
Don's set source dir for dh_install, rely on defaults instead
Ship XBMC Addon headers in xbmc-addons-dev package
Revert "Use XBMC's groovy since Debian's groovy is broken in unstable"
Use groovy.jar instead of groovy-all-1.8.6.jar to work around FTBFS
Merge tag 'upstream/13.0_rc1+dfsg1'
Imported Upstream version 13.0~rc1+dfsg1
Start working on next upload
remove useelss file
add a git-buildpackage config file at debian/gbp.conf
Target experimental
Finalize changelog
Refresh patches
Use XBMC's groovy since Debian's groovy is broken in unstable
XBMC 13.0 Gotham Beta 4
Merge tag 'upstream/13.0_beta4+dfsg1'
Imported Upstream version 13.0~beta4+dfsg1
Make xbmc depend on libjs-iscroll and use minified iscroll.js from it
Migrate to dh_python2
Bump debhelper compat level to 9
Bump standards version, no changes needed
Remove Andres Mejia as uploader since he is tracked as MIA
Refresh 04-differentiate-from-vanilla-XBMC.patch
XBMC 13.0 Gotham Beta 3
Merge tag 'upstream/13.0_beta3+dfsg1'
Imported Upstream version 13.0~beta3+dfsg1
Stop shipping minified iscroll.js
Make package team-maintained by Debian Multimedia Maintainers
Fix av_stream_get_r_frame_rate Libav hack accessor
Drop unused Debian patches
Start working on next upload
Finalize changelog
Refresh patches
Drop 0003-Use-NULL-from-cstddef.patch since it has been integrated upstream
Merge tag 'upstream/13.0_beta2+dfsg1'
Imported Upstream version 13.0~beta2+dfsg1
Re-enable using PulseAudion (Closes: #741531)
Stop directing users to read README.Debian under "XBMC from Debian" logo
Start working on next upload
Finalize changelog
Remove version check add-on since it is handled by APT in Debian
Fix compilation with libav 10 beta1
Don't enter ffmpeg dir when using external ffmpeg/libav
Build-depend on Libav 10
Build-depend on libxslt-dev
Use XBMC's config.h for DVDnav
Disable static ffmpeg
Fix build when GIT_REV is not defined
Refresh patches
New upstream beta release for codename Gotham
Merge tag 'upstream/13.0_beta1+dfsg1'
Imported Upstream version 13.0~beta1+dfsg1
Transition to Libav 10 API
Start working on next upload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/wheezy-backports
X-Git-Reftype: branch
X-Git-Oldrev: c49e98a4d9a2bb9c6fdb7dcc657c2b873aaec942
X-Git-Newrev: acf4a9ca6eae69560f1a9c548b4db668a3443381
The following commit has been merged in the wheezy-backports branch:
commit c5ea6c32c4abce65c2f21e71591ed426039de42b
Merge: c49e98a4d9a2bb9c6fdb7dcc657c2b873aaec942 f30a6bf0893a1be54475c1749225ff05452bd410
Author: Balint Reczey <balint at balintreczey.hu>
Date: Fri Jun 20 23:44:08 2014 -0700
Merge tag 'debian/2%13.1_rc1+dfsg1-1' into wheezy-backports
xbmc Debian release 2:13.1~rc1+dfsg1-1
Conflicts:
debian/changelog
debian/control
debian/patches/07-use-system-groovy.patch
debian/rules
debian/xbmc-addons-dev.install
diff --combined debian/changelog
index 3955426,aed2f9e..b78ddb9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,101 +1,108 @@@
- xbmc (2:12.3+dfsg2-6~bpo70+1) wheezy-backports; urgency=low
++xbmc (2:13.1~rc1+dfsg1-1~bpo70+1) wheezy-backports; urgency=low
+
+ * Rebuild for wheezy-backports.
+ * Build-depend on ttf-dejavu-core instead of fonts-dejavu-core
+
- -- Balint Reczey <balint at balintreczey.hu> Tue, 27 May 2014 12:15:20 +0200
++ -- Balint Reczey <balint at balintreczey.hu> Fri, 20 Jun 2014 23:44:29 -0700
+
- xbmc (2:12.3+dfsg2-6) unstable; urgency=low
+ xbmc (2:13.1~rc1+dfsg1-1) unstable; urgency=low
- * Ship XBMC Addon headers in xbmc-addons-dev package
- * Don's set source dir for dh_install, rely on defaults instead
+ * XBMC 13.1 Gotham RC1
+ - release notes: http://xbmc.org/xbmc-13-1-gotham-rc1/
+ * Always enable parallel builds
+ * Refresh patches
+
+ -- Balint Reczey <balint at balintreczey.hu> Wed, 04 Jun 2014 18:36:41 +0700
+
+ xbmc (2:13.1~beta2+dfsg1-1) unstable; urgency=low
+
+ * XBMC 13.1 Gotham Beta2
+ - release notes: http://xbmc.org/xbmc-13-1-gotham-beta-2
+ * Fix embedded subtitle handling using Libav
+ * Refactor patches to split Libav-related ones
+ * Drop obsolete chunk from 06-use-external-libraries.patch
+ * Ship additional include files in xbmc-addons-dev
+ Those headers are used by PVR addons compatible with XBMC 13.
+ * Define AV_CODEC_ID_SUBRIP to AV_CODEC_ID_TEXT in libav hacks and fix compilation
+
+ -- Balint Reczey <balint at balintreczey.hu> Fri, 23 May 2014 16:58:11 +0700
+
+ xbmc (2:13.1~beta1+dfsg1-1) unstable; urgency=low
+
+ * XBMC 13.1 Gotham Beta1
+ - release notes: http://xbmc.org/xbmc-13-1-beta1-gotham
* Fix #include directive across installed headers
- -- Balint Reczey <balint at balintreczey.hu> Wed, 07 May 2014 18:38:47 +0200
+ -- Balint Reczey <balint at balintreczey.hu> Tue, 13 May 2014 12:18:34 +0200
+
+ xbmc (2:13.0+dfsg1-1) experimental; urgency=low
+
+ * XBMC 13.0 Gotham
+ - relese notes: http://xbmc.org/xbmc-13-0-gotham-rises
+ * Refresh patches
+
+ -- Balint Reczey <balint at balintreczey.hu> Mon, 05 May 2014 10:13:52 +0200
+
+ xbmc (2:13.0~rc1+dfsg1-1) experimental; urgency=low
+
+ * XBMC 13.0 Gotham RC 1
+ - relese notes: http://xbmc.org/xbmc-13-0-gotham-release-candidate-1
+ * Use groovy.jar instead of groovy-all-1.8.6.jar to work around FTBFS
+ (Closes: #744330)
+ * Revert to using system's groovy
+ * Ship XBMC Addon headers in xbmc-addons-dev package
+ * Don't set source dir for dh_install, rely on defaults instead
+
+ -- Balint Reczey <balint at balintreczey.hu> Sun, 04 May 2014 14:11:58 +0200
- xbmc (2:12.3+dfsg2-5) unstable; urgency=low
+ xbmc (2:13.0~beta4+dfsg1-1) experimental; urgency=low
+ * XBMC 13.0 Gotham Beta 4
+ - relese notes: http://xbmc.org/xbmc-13-0-gotham-beta-4
+ * XBMC 13.0 Gotham Beta 3
+ - release notes: http://xbmc.org/xbmc-13-0-gotham-beta-3-returns
+ * Drop unused Debian patches
+ * Refresh patches
+ * Fix av_stream_get_r_frame_rate Libav hack accessor
+ * Stop shipping minified iscroll.js.
+ * Make xbmc depend on libjs-iscroll and use minified iscroll.js from it
+ * Bump standards version, no changes needed
+ * Bump debhelper compat level to 9
+ * Migrate to dh_python2
+ * Use XBMC's groovy since Debian's groovy is broken in unstable
* Make package team-maintained by Debian Multimedia Maintainers.
Debian XBMC Packaging Team which was dysfunctional since the single
developer member of it is MIA since months.
* Remove Andres Mejia as uploader since he is tracked as MIA.
Thank you for maintaining the package for a long time! (Closes: #743558)
- * Use groovy.jar instead of groovy-all-1.8.6.jar to work around FTBFS
- (Closes: #744330)
- * Rebuild to depend on latest librtmp (Closes: #746435)
- * Stop shipping minified iscroll.js
- * Make xbmc depend on libjs-iscroll and use minified iscroll.js from it
- * Ignore Lintian warning about minified iScroll temporarily.
- Latest xbmc package in experimental is already fixed
- -- Balint Reczey <balint at balintreczey.hu> Mon, 28 Apr 2014 12:21:01 +0200
+ -- Balint Reczey <balint at balintreczey.hu> Sat, 19 Apr 2014 21:00:07 +0200
+
+ xbmc (2:13.0~beta2+dfsg1-1) experimental; urgency=low
+
+ * XBMC 13.0 Gotham Beta2
+ - release notes: http://xbmc.org/xbmc-13-0-gotham-the-beta-2-we-deserve
+ * Drop 0003-Use-NULL-from-cstddef.patch since it has been integrated upstream
+ * Refresh patches
+ * Stop directing users to read README.Debian under "XBMC from Debian" logo
+ * Re-enable using PulseAudio (Closes: #741531)
+
+ -- Balint Reczey <balint at balintreczey.hu> Sat, 08 Mar 2014 00:57:47 +0100
+
+ xbmc (2:13.0~beta1+dfsg1-1) experimental; urgency=low
+
+ * XBMC 13.3 Gotham Beta1
+ - release notes: http://xbmc.org/xbmc-13-0-gotham-beta1-rises
+ * Refresh patches
+ * Remove version check add-on since it is handled by APT in Debian
+ * Fix build when GIT_REV is not defined
+ * Disable static ffmpeg
+ * Use XBMC's config.h for DVDnav
+ * Build-depend on libxslt-dev
+ * Build-depend on Libav 10 libraries
+ * Fix compilation with libav 10 beta1 (Closes: #739441)
+
+ -- Balint Reczey <balint at balintreczey.hu> Fri, 07 Mar 2014 12:44:50 +0100
xbmc (2:12.3+dfsg2-4) unstable; urgency=low
diff --combined debian/control
index c91ae0e,85d3d94..b6f2551
--- a/debian/control
+++ b/debian/control
@@@ -3,8 -3,8 +3,8 @@@ Section: vide
Priority: optional
Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
Uploaders: Balint Reczey <balint at balintreczey.hu>
-Build-Depends: debhelper (>= 9~),
- dh-python,
+Build-Depends: debhelper (>= 7.0.50~),
+ python-support,
cmake,
autopoint,
autotools-dev,
@@@ -51,7 -51,7 +51,7 @@@
libmpeg2-4-dev,
libass-dev (>= 0.9.8),
libflac-dev,
- python-dev,
+ python-dev (>= 2.6.6-3~),
gawk,
gperf,
nasm [i386],
@@@ -81,6 -81,7 +81,7 @@@
libltdl-dev,
libtiff-dev,
libtinyxml-dev (>= 2.6.2),
+ libxslt1-dev,
libmp3lame-dev,
libssh-dev,
libtag1-dev (>= 1.8),
@@@ -88,7 -89,7 +89,7 @@@
default-jre,
libbluray-dev,
libva-dev [!armel !armhf],
- libavcodec-dev,
+ libavcodec-dev (>= 6:10~),
libavfilter-dev,
libavformat-dev,
libavresample-dev,
@@@ -105,10 -106,10 +106,10 @@@
libdvdread-dev,
libhdhomerun-dev,
fontforge,
- fonts-dejavu-core,
+ ttf-dejavu-core,
fonts-droid,
ttf-bitstream-vera
- Standards-Version: 3.9.3
+ Standards-Version: 3.9.5
Homepage: http://xbmc.org/
Vcs-Git: git://git.debian.org/pkg-multimedia/xbmc.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/xbmc.git
diff --combined debian/rules
index b666541,c5d98ef..ce8e3aa
--- a/debian/rules
+++ b/debian/rules
@@@ -63,7 -63,7 +63,7 @@@ XBMC_CONFIG_OPTIONS ?= --host=$(DEB_HOS
--disable-profiling \
--enable-joystick \
--enable-xrandr \
- --disable-pulse \
+ --enable-pulse \
--enable-rtmp \
--enable-ffmpeg-libvorbis \
--disable-mid \
@@@ -78,7 -78,7 +78,7 @@@
--disable-afpclient \
--enable-airtunes \
--enable-external-libraries \
- --enable-external-ffmpeg \
+ --enable-libav-compat \
--disable-dependency-tracking \
--disable-dvdcss \
--disable-non-free \
@@@ -87,15 -87,12 +87,12 @@@
$(XBMC_CONFIG_EXTRA_OPTIONS) \
$(ENV_OPTIONS)
- # Use --parallel option only if debhelper supports it
- DH_PARALLEL_OPT=$(shell dh_testdir --parallel 2>/dev/null && echo "--parallel")
-
# Used to show what config options are enabled
show-xbmc-config-options:
$(info $(XBMC_CONFIG_OPTIONS))
%:
- dh $@ --with autoreconf $(DH_PARALLEL_OPT)
+ dh $@ --with autoreconf --with python2 --parallel
override_dh_clean:
dh_clean libtool xbmc/config.h xbmc/stamp-h1
@@@ -104,25 -101,24 +101,25 @@@
# Use package's version in XBMC
VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: \(.*\)/\1/p')
+GIMP_FAKE_HOMEDIR = $(CURDIR)/debian/tmp/home/user
override_dh_auto_configure: configure
sed -i 's/DEB_VERSION/"'$(VERSION)'"/' xbmc/GUIInfoManager.cpp
+ rm -r addons/service.xbmc.versioncheck
mkdir -p xbmc/visualizations/XBMCProjectM/libprojectM/fonts
-ln -s /usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf xbmc/visualizations/XBMCProjectM/libprojectM/fonts/
-ln -s /usr/share/fonts/truetype/ttf-bitstream-vera/VeraMono.ttf xbmc/visualizations/XBMCProjectM/libprojectM/fonts/
fontforge -script $(CURDIR)/debian/mergefonts.ff \
/usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf \
- /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf \
+ /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf \
$(CURDIR)/media/Fonts/arial.ttf
./bootstrap
./configure $(XBMC_CONFIG_OPTIONS)
# Add Debian related notes to XBMC's original logo
- mkdir -p $(CURDIR)/debian/tmp/home/user
- HOME=$(CURDIR)/debian/tmp/home/user gimp -i -b '(load "debian/xcf2png.scm") (xcf2png "debian/xbmc-logo.xcf" "addons/skin.confluence/media/xbmc-logo.png") (gimp-quit 0)'
+ mkdir -p $(GIMP_FAKE_HOMEDIR)
+ HOME=$(GIMP_FAKE_HOMEDIR) GIMP2_DIRECTORY=$(GIMP_FAKE_HOMEDIR)/.gimp-dir gimp -i -b '(load "debian/xcf2png.scm") (xcf2png "debian/xbmc-logo.xcf" "addons/skin.confluence/media/xbmc-logo.png") (gimp-quit 0)'
override_dh_auto_install:
- $(MAKE) -C lib/addons/script.module.pil
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
$(MAKE) eventclients DESTDIR=$(CURDIR)/debian/tmp \
WII_EXTRA_OPTS=-DCWIID_OLD
@@@ -133,7 -129,7 +130,7 @@@
$(CURDIR)/debian/tmp/usr/include/xbmc/libXBMC_pvr.h
override_dh_install:
- dh_install -XLICENCE \
+ dh_install -XLICENCE -XLICENSE \
-XLicence.txt -XLicense.txt -XLiberationSans-Regular.ttf \
-XDejaVuSans.ttf -XDejaVuSans-Bold.ttf -XLICENSE.txt \
-XRoboto-Bold.ttf -XRoboto-Regular.ttf -XNOTICE.txt \
@@@ -222,6 -218,7 +219,7 @@@ get-orig-source
$(ORIG_SRC_DIR)/*/lib/groovy \
$(ORIG_SRC_DIR)/*/lib/taglib \
$(ORIG_SRC_DIR)/*/lib/win32 \
+ $(ORIG_SRC_DIR)/*/addons/addons/service.xbmc.versioncheck \
$(ORIG_SRC_DIR)/*/addons/webinterface.default/js/iscroll-min.js \
$(ORIG_SRC_DIR)/*/addons/webinterface.default/js/jquery-1.8.2.min.js \
$(ORIG_SRC_DIR)/*/addons/skin.confluence/fonts/Roboto-*.ttf \
--
xbmc packaging
More information about the pkg-multimedia-commits
mailing list