tag 605596 patch
thanks
Hi,
The attached patch should fix this problem by removing
brdesktop-desktop-splashy. Is it OK to perform an NMU using it?
--
Matt https://ftbfs.org/kraai
diff -Nru brdesktop-artwork-0.7/debian/brdesktop-artwork-splashy.dirs brdesktop-artwork-0.7.new/debian/brdesktop-artwork-splashy.dirs
--- brdesktop-artwork-0.7/debian/brdesktop-artwork-splashy.dirs 2010-07-27 15:50:40.000000000 -0700
+++ brdesktop-artwork-0.7.new/debian/brdesktop-artwork-splashy.dirs 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-usr/share/splashy/themes
diff -Nru brdesktop-artwork-0.7/debian/brdesktop-artwork-splashy.install brdesktop-artwork-0.7.new/debian/brdesktop-artwork-splashy.install
--- brdesktop-artwork-0.7/debian/brdesktop-artwork-splashy.install 2010-07-27 15:50:40.000000000 -0700
+++ brdesktop-artwork-0.7.new/debian/brdesktop-artwork-splashy.install 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-splashy/* usr/share/splashy/themes/
diff -Nru brdesktop-artwork-0.7/debian/brdesktop-artwork-splashy.lintian-overrides brdesktop-artwork-0.7.new/debian/brdesktop-artwork-splashy.lintian-overrides
--- brdesktop-artwork-0.7/debian/brdesktop-artwork-splashy.lintian-overrides 2010-07-27 15:50:40.000000000 -0700
+++ brdesktop-artwork-0.7.new/debian/brdesktop-artwork-splashy.lintian-overrides 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-brdesktop-artwork-splashy: duplicate-font-file usr/share/splashy/themes/brdesktop/FreeSans.ttf also in ttf-freefont
diff -Nru brdesktop-artwork-0.7/debian/brdesktop-artwork-splashy.postinst brdesktop-artwork-0.7.new/debian/brdesktop-artwork-splashy.postinst
--- brdesktop-artwork-0.7/debian/brdesktop-artwork-splashy.postinst 2010-07-27 15:50:40.000000000 -0700
+++ brdesktop-artwork-0.7.new/debian/brdesktop-artwork-splashy.postinst 1969-12-31 16:00:00.000000000 -0800
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if which splashy_config > /dev/null 2>&1; then
- splashy_config -s brdesktop
-fi
-
-[ -r /etc/default/splashy ] && . /etc/default/splashy
-
-if [ "x$ENABLE_INITRAMFS" = "x1" ]; then
- update-initramfs -u;
-fi
-
-#DEBHELPER#
-
-exit 0
diff -Nru brdesktop-artwork-0.7/debian/brdesktop-artwork-splashy.postrm brdesktop-artwork-0.7.new/debian/brdesktop-artwork-splashy.postrm
--- brdesktop-artwork-0.7/debian/brdesktop-artwork-splashy.postrm 2010-07-27 15:50:40.000000000 -0700
+++ brdesktop-artwork-0.7.new/debian/brdesktop-artwork-splashy.postrm 1969-12-31 16:00:00.000000000 -0800
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if which splashy_config > /dev/null 2>&1; then
- splashy_config -s default
-fi
-
-[ -r /etc/default/splashy ] && . /etc/default/splashy
-
-if [ "x$ENABLE_INITRAMFS" = "x1" ]; then
- update-initramfs -u;
-fi
-
-#DEBHELPER#
-
-exit 0
diff -Nru brdesktop-artwork-0.7/debian/changelog brdesktop-artwork-0.7.new/debian/changelog
--- brdesktop-artwork-0.7/debian/changelog 2010-08-01 19:27:33.000000000 -0700
+++ brdesktop-artwork-0.7.new/debian/changelog 2010-12-07 05:22:31.000000000 -0800
@@ -1,3 +1,11 @@
+brdesktop-artwork (0.7+nmu1) unstable; urgency=low
+
+ * Remove the brdesktop-artwork-splashy stanza from debian/control.
+ * Remove debian/brdesktop-artwork-splashy.{dirs,install,lintian-overrides,postinst,postrm}
+ and splashy.
+
+ -- Matt Kraai <kr...@debian.org> Tue, 07 Dec 2010 05:22:31 -0800
+
brdesktop-artwork (0.7) unstable; urgency=low
* Depending on gdm3 instead of gdm. It avoids future conflicts.
diff -Nru brdesktop-artwork-0.7/debian/control brdesktop-artwork-0.7.new/debian/control
--- brdesktop-artwork-0.7/debian/control 2010-08-01 19:20:42.000000000 -0700
+++ brdesktop-artwork-0.7.new/debian/control 2010-12-07 05:17:41.000000000 -0800
@@ -21,18 +21,3 @@
theme and a streamlined installation process with Brazilian localization
options and packages pre-selected.
Homepage: http://brdesktop.org
-
-Package: brdesktop-artwork-splashy
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: splashy
-Architecture: all
-Description: Brazilian Debian Pure Blend - splashy graphical boot theme
- This package installs the Splashy startup screen for BrDesktop.
- .
- BrDesktop is a Debian Pure Blend designed for Brazilian desktop users. Its
- main goal is to make Debian easier to install and more pleasant to use for
- these users by providing a selection of free software covering most of the
- tasks a desktop user may want to do with his computer, a customized desktop
- theme and a streamlined installation process with Brazilian localization
- options and packages pre-selected.
-Homepage: http://brdesktop.org
Binary files brdesktop-artwork-0.7/splashy/brdesktop/background.png and brdesktop-artwork-0.7.new/splashy/brdesktop/background.png differ
Binary files brdesktop-artwork-0.7/splashy/brdesktop/FreeSans.ttf and brdesktop-artwork-0.7.new/splashy/brdesktop/FreeSans.ttf differ
diff -Nru brdesktop-artwork-0.7/splashy/brdesktop/README brdesktop-artwork-0.7.new/splashy/brdesktop/README
--- brdesktop-artwork-0.7/splashy/brdesktop/README 2010-07-27 15:50:40.000000000 -0700
+++ brdesktop-artwork-0.7.new/splashy/brdesktop/README 1969-12-31 16:00:00.000000000 -0800
@@ -1,3 +0,0 @@
-# BrDesktop Splashy Theme
-# Author: Tiago Bortoletto Vaz <ti...@debian-ba.org>
-Licensed under GPL V2 - Free Software Foundation
diff -Nru brdesktop-artwork-0.7/splashy/brdesktop/theme.xml brdesktop-artwork-0.7.new/splashy/brdesktop/theme.xml
--- brdesktop-artwork-0.7/splashy/brdesktop/theme.xml 2010-07-27 15:50:40.000000000 -0700
+++ brdesktop-artwork-0.7.new/splashy/brdesktop/theme.xml 1969-12-31 16:00:00.000000000 -0800
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<splashy xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://splashy.alioth.debian.org/schemas/1.1/theme.xsd";>
- <info>
- <!-- theme name is case sensitive. use directory name -->
- <name>brdesktop</name>
- <version>1.0</version>
- <description>BrDesktop splashy theme</description>
- <urls>http://brdesktop.org</urls>
- <author>Tiago Bortoletto Vaz</author>
- </info>
- <progressbar>
- <!-- here are tags to set the bar... x coordinate,
- y coordinate, width and height are for the progress bar.
- Remember that x, y, width and height are expressed in percentage -->
- <dimension>
- <x>33</x>
- <y>89</y>
- <width>37</width>
- <height>2</height>
- </dimension>
- <!-- here you can set the color of the progressbar...
- set the amount of red, green, blue and alpha channel.
- Remember that the max value is 255 and the minumun value is 0-->
- <color>
- <red>46</red>
- <green>66</green>
- <blue>44</blue>
- <alpha>250</alpha>
- </color>
- <!-- whether or not you want a border around the progressbar. default: no -->
- <border>
- <enable>yes</enable>
- <color>
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- <alpha>255</alpha>
- </color>
- </border>
- <!-- here you can set the color of the progressbar background
- set the amount of red, green, blue and alpha channel.
- Remember that the max value is 255 and the minumun value is 0-->
- <background>
- <color>
- <red>254</red>
- <green>233</green>
- <blue>212</blue>
- <alpha>50</alpha>
- </color>
- </background>
- <direction>
- <boot>forward</boot>
- <shutdown>backward</shutdown>
- <resume>forward</resume>
- <suspend>backward</suspend>
- </direction>
- <visibility>
- <boot>yes</boot>
- <shutdown>yes</shutdown>
- <resume>yes</resume>
- <suspend>yes</suspend>
- </visibility>
- </progressbar>
- <!-- conventional path: /etc/splashy/themes + theme-name -->
- <background>
- <boot>background.png</boot>
- <shutdown>background.png</shutdown>
- <resume>background.png</resume>
- <suspend>background.png</suspend>
- <errorimg>background.png</errorimg>
- <!-- resolution of the images. this value affects where
- the progressbar will be drawn. If VALUE <= 0, then percentages
- of the screen width and hight will be assumed -->
- <dimension>
- <!-- NOTE: x and y are not used by splashy -->
- <x>0</x>
- <y>0</y>
- <width>0</width>
- <height>0</height>
- </dimension>
- </background>
- <textbox>
- <!-- whether you want the textbox always
- shown or no. If no, it will be shown only on error,
- see autoverboseonerror -->
- <enable>yes</enable>
- <!-- here are tags to set the text area... x coordinate,
- y coordinate, width and height are for the text area.
- Remember that x, y, width and height are expressed in percentage
- or pixel units -->
- <dimension>
- <x>20</x>
- <y>50</y>
- <width>60</width>
- <height>40</height>
- </dimension>
- <!-- here you can set the color of the text area...
- set the amount of red, green, blue and alpha channel.
- Remember that the max value is 255 and the minumun value is 0-->
- <color>
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- <alpha>127</alpha>
- </color>
- <!-- whether or not you want a border around the progressbar. default: no -->
- <border>
- <enable>yes</enable>
- <color>
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- <alpha>255</alpha>
- </color>
- </border>
- <text>
- <!-- font file to use, path relative to theme -->
- <font>
- <file>FreeSans.ttf</file>
- <height>10</height>
- </font>
- <!-- here you can set the color of the text/font...
- set the amount of red, green, blue and alpha channel.
- Remember that the max value is 255 and the minumun value is 0-->
- <color>
- <red>128</red>
- <green>128</green>
- <blue>32</blue>
- <alpha>255</alpha>
- </color>
- </text>
- </textbox>
- <autoverboseonerror>no</autoverboseonerror>
- <fadein>no</fadein>
- <fadeout>no</fadeout>
-</splashy>
