[SCM] xbmc packaging branch, master, updated. upstream/9.11.svn24383.deb1-32-gdfc088a

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Sun Nov 15 01:34:26 UTC 2009


The following commit has been merged in the master branch:
commit 1e1d407062f785648e0a8e58c6de6aca573cc45f
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat Nov 14 09:32:36 2009 -0500

    Removing all patches as they've been applied upstream.

diff --git a/debian/patches/arch-dep-install-fix.patch b/debian/patches/arch-dep-install-fix.patch
deleted file mode 100644
index 33e37cd..0000000
--- a/debian/patches/arch-dep-install-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Make sure non-Windows files don't get installed.
-==========================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -450,7 +450,7 @@
- 	@# Arch independent files
- 	@find language media scripts sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
- 	@# Arch dependent files
--	@find system screensavers visualisations -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs" -exec install -D "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
-+	@find system screensavers visualisations -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs" -exec install -D "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
- 	@# Skins
- 	@find skin -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.png|.*\.gif" -exec install -D -m 0644 '{}' $(prefix)/share/xbmc/'{}' \; -printf " -- %-75.75f\r"
- 
diff --git a/debian/patches/distclean-fix.patch b/debian/patches/distclean-fix.patch
deleted file mode 100644
index 84e068f..0000000
--- a/debian/patches/distclean-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Avoid symlinks for pwd.
-==========================================================================
---- a/Makefile.include.in
-+++ b/Makefile.include.in
-@@ -107,4 +107,4 @@
- distclean:
- 	$(RM) $(OBJS) *.o $(LIB) $(SLIB) $(STATICLIB) $(CLEAN_FILES) $(DISTCLEAN_FILES) $(PCH:.h=.h.gch) $(OBJS:.o=.P)
- 	for d in $(DIRS); do (if test -f "$$d/Makefile"; then ($(MAKE) -C "$$d" distclean || $(MAKE) -C "$$d" clean); fi ); done
--	if [ "$(shell pwd)" = "$(abs_top_srcdir)" ]; then rm -f $(AUTOGENERATED_MAKEFILES) Makefile.include Makefile; fi
-+	if [ "$(shell pwd -P)" = "$(abs_top_srcdir)" ]; then rm -f $(AUTOGENERATED_MAKEFILES) Makefile.include Makefile; fi
diff --git a/debian/patches/init-script-lsb-fix.patch b/debian/patches/init-script-lsb-fix.patch
deleted file mode 100644
index 9c0f121..0000000
--- a/debian/patches/init-script-lsb-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Provides field should have name of init script.
-==========================================================================
---- a/tools/XBMCLive/xbmc
-+++ b/tools/XBMCLive/xbmc
-@@ -1,6 +1,6 @@
- #!/bin/sh
- ### BEGIN INIT INFO
--# Provides:          xbmc
-+# Provides:          xbmc-live
- # Required-Start:    $local_fs $network $remote_fs
- # Required-Stop:     $local_fs $network $remote_fs
- # Default-Start:     2 3 4 5
diff --git a/debian/patches/series b/debian/patches/series
index a6ca529..cafd205 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-distclean-fix.patch
-init-script-lsb-fix.patch
-arch-dep-install-fix.patch
+# Nothing to patch

-- 
xbmc packaging



More information about the pkg-multimedia-commits mailing list