commit 2282bd2942966b2d1011d1d5e9edc7b200a741fc Author: Gustavo Noronha Silva Date: Thu Jun 24 23:03:58 2004 +0000 adding desktop-base to the svn diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..d0fe9ce --- /dev/null +++ b/Makefile @@ -0,0 +1,23 @@ +DEFAULT_BACKGROUND=bluedeb-1024x768.jpg + +INSTALL=install -m 0644 +BACKGROUNDS=$(wildcard backgrounds/*.png backgrounds/*.jpg) +SPLASH=$(wildcard splash/*.png) +PIXMAPS=$(wildcard pixmaps/*.png) +DESKTOPFILES=$(wildcard *.desktop) + +all: + +install: + # needed if gnome-session is not installed + mkdir -p $(DESTDIR)/usr/share/pixmaps/splash + + # the package itself + mkdir -p $(DESTDIR)/usr/share/images/desktop-base + $(INSTALL) $(BACKGROUNDS) $(DESTDIR)/usr/share/images/desktop-base + cd $(DESTDIR)/usr/share/images/desktop-base && ln -s $(DEFAULT_BACKGROUND) default + $(INSTALL) $(SPLASH) $(DESTDIR)/usr/share/images/desktop-base + mkdir -p $(DESTDIR)/usr/share/desktop-base + $(INSTALL) $(DESKTOPFILES) $(DESTDIR)/usr/share/desktop-base/ + mkdir -p $(DESTDIR)/usr/share/pixmaps + $(INSTALL) $(PIXMAPS) $(DESTDIR)/usr/share/pixmaps/ diff --git a/backgrounds/Debian.jpg b/backgrounds/Debian.jpg new file mode 100644 index 0000000..a4975c9 Binary files /dev/null and b/backgrounds/Debian.jpg differ diff --git a/backgrounds/bluedeb-1024x768.jpg b/backgrounds/bluedeb-1024x768.jpg new file mode 100644 index 0000000..3c67f49 Binary files /dev/null and b/backgrounds/bluedeb-1024x768.jpg differ diff --git a/backgrounds/bluedeb.COPYING b/backgrounds/bluedeb.COPYING new file mode 100644 index 0000000..cac6cb9 --- /dev/null +++ b/backgrounds/bluedeb.COPYING @@ -0,0 +1,26 @@ +Copyright (c) Roger So. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source form must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the author nor the names of its contributors + may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY ROGER SO AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ROGER SO OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/backgrounds/bluedeb.blend b/backgrounds/bluedeb.blend new file mode 100644 index 0000000..d153259 Binary files /dev/null and b/backgrounds/bluedeb.blend differ diff --git a/debian-desktop-logo.png b/debian-desktop-logo.png new file mode 100644 index 0000000..b1e768a Binary files /dev/null and b/debian-desktop-logo.png differ diff --git a/debian-homepage.desktop b/debian-homepage.desktop new file mode 100644 index 0000000..384bd14 --- /dev/null +++ b/debian-homepage.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=Debian Home Page +Comment=The offical web site of the Debian Project +Icon=/usr/share/pixmaps/debian-official-logo-small.png +Type=Link +URL=http://www.debian.org + diff --git a/debian-reference.desktop b/debian-reference.desktop new file mode 100644 index 0000000..36a7992 --- /dev/null +++ b/debian-reference.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=Debian Reference Manual +Comment=An introduction and reference manual for Debian +Icon=/usr/share/pixmaps/debian-official-logo-small.png +Type=Link +URL=http://www.debian.org/doc/manuals/reference/ diff --git a/debian-security.desktop b/debian-security.desktop new file mode 100644 index 0000000..43d6a1e --- /dev/null +++ b/debian-security.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=Debian Security Updates +Comment=Learn about new fixed packages +Icon=/usr/share/pixmaps/debian-security.png +Type=Link +URL=http://security.debian.org/ diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..f21e59a --- /dev/null +++ b/debian/changelog @@ -0,0 +1,167 @@ +desktop-base (0.3.14) unstable; urgency=low + + * pixmaps/debian-official-logo-small.png: + - remove official logo as it is not DFSG-free (Closes: #246784) + * debian/control: + - Recommends: epiphany-browser | konqueror | www-browser + + -- Gustavo Noronha Silva Tue, 11 May 2004 17:25:09 -0300 + +desktop-base (0.3.13) unstable; urgency=low + + * debian/postinst: + - modified the check for $2 being empty + (Closes: #242059) + + -- Gustavo Noronha Silva Sun, 4 Apr 2004 16:43:11 -0300 + +desktop-base (0.3.12) unstable; urgency=medium + + * debian/preinst: + - remove the alternative stuff first to make it possible + to remove the diversion + (Closes: #241439, #241402, #241339, #241463) + * splash/Splash-EvolvingTux.png: + - remove while I try to sort out the legal issues + try to get this into sarge soon (urgency=medium) + (Closes: #241246) + * debian/postinst: + - regenerate the gconf default file by running libgnome2-common's + postinst when upgrading from an older version (Closes: #241403) + + -- Gustavo Noronha Silva Thu, 1 Apr 2004 16:44:26 -0300 + +desktop-base (0.3.11) unstable; urgency=low + + * debian/prerm, debian/postinst, debian/postrm: + - remove them all + * debian/preinst: + - stop providing the diversion and the gnome-splash + alternative if upgrading from diversion-including + versions + * Makefile, gconf/: + - stop providing a default configuration for the + background + * debian/control: + - updated Standards-Version to 3.6.1 + * debian/copyright: + - included GPL location in common-licenses + + -- Gustavo Noronha Silva Tue, 30 Mar 2004 16:35:49 -0300 + +desktop-base (0.3.10) unstable; urgency=low + + * debian/postrm: + - remove the unnecessary rm, sorry for the delay (Closes: #223925) + + -- Gustavo Noronha Silva Sun, 18 Jan 2004 01:12:39 -0200 + +desktop-base (0.3.9) unstable; urgency=low + + * debian/preinst: + - really fix the problem with local diversion, by removing it and + readding it (Closes: #218091) + + -- Gustavo Noronha Silva Wed, 12 Nov 2003 12:54:37 -0200 + +desktop-base (0.3.8) unstable; urgency=low + + * debian/postinst: + - change priorities to make Debian_red the default + * gconf/.../%gconf.xml: + - set the default background file to /usr/share/images/desktop-base/default + * Makefile: + - install the gconf file + + -- Gustavo Noronha Silva Tue, 11 Nov 2003 13:17:22 -0200 + +desktop-base (0.3.7) unstable; urgency=low + + * debian/preinst: + - remove the problematic local diversion, added the right thing + (Closes: #218091). + * splash/Debian-Splash.{xcf,png}: + - edited to remove the white border and enlarge the image a bit + (Closes: #218896) + + -- Gustavo Noronha Silva Tue, 11 Nov 2003 00:27:50 -0200 + +desktop-base (0.3.6) unstable; urgency=low + + * New Maintainer + * debia/rules: + - use cdbs package + * debian/control: + - Depends on cdbs + * debian/{postinst,preinst,postrm,prerm}: + - set up a diversion and the alternatives system for the + /usr/share/pixmaps/splash/gnome-splash.png file, making + Splash-Debian the default. + * splash/{Splash-Debian_red.png,Splash-EvolvingTux.png}: + - added new splashs (Closes: #200007, #205258) + * Makefile: + - create /usr/share/pixmaps/splash + + -- Gustavo Noronha Silva Tue, 21 Oct 2003 15:22:12 -0200 + +desktop-base (0.3.5) unstable; urgency=low + + * debian-reference.desktop: + - Change URL to the actual reference guide, and fix typo "manaul" => + "manual" (Closes: #172737). + + -- Colin Walters Fri, 3 Jan 2003 14:57:55 -0500 + +desktop-base (0.3.4) unstable; urgency=low + + * Make a symlink /usr/share/images/desktop-base/default pointing to the + default background we want. + * debian/rules: + - Use the latest version of Colin's Build System. + + -- Colin Walters Thu, 19 Dec 2002 19:19:14 -0500 + +desktop-base (0.3.3) unstable; urgency=low + + * debian/rules: + - Use the latest version of Colin's Build System. + + -- Colin Walters Thu, 21 Nov 2002 00:47:57 -0500 + +desktop-base (0.3.2) unstable; urgency=low + + * debian/backgrounds/bluedeb-1024x768.jpg: + - New background from Roger So. + + -- Colin Walters Wed, 20 Nov 2002 23:49:14 -0500 + +desktop-base (0.3.1) unstable; urgency=low + + * Update splash/Debian-Splash.xcf, splash/Debian-Splash.png. + * debian/rules: + - Use Colin's Build System. + * debian/desktop-base.install: + - New. + + -- Colin Walters Wed, 06 Nov 2002 14:26:22 -0500 + +desktop-base (0.3) unstable; urgency=low + + * Remove debian-wallpaper1280x1024.png; it was big and useless. + * Add splash/Debian-Splash.xcf, splash/Debian-Splash.png. + + -- Colin Walters Thu, 31 Oct 2002 15:01:53 -0500 + +desktop-base (0.2-1) unstable; urgency=low + + * Actually link to the installed images (Closes: #166245). + Oops. + + -- Colin Walters Fri, 25 Oct 2002 00:55:19 -0400 + +desktop-base (0.1-1) unstable; urgency=low + + * Initial Version (Closes: #165928). + + -- Colin Walters Tue, 22 Oct 2002 15:05:34 -0400 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..685b169 --- /dev/null +++ b/debian/control @@ -0,0 +1,18 @@ +Source: desktop-base +Section: x11 +Priority: optional +Maintainer: Gustavo Noronha Silva +Build-Depends-Indep: cdbs, debhelper (>> 4.0.0) +Standards-Version: 3.6.1 + +Package: desktop-base +Architecture: all +Recommends: epiphany-browser | konqueror | www-browser +Suggests: gnome | kde | wmaker +Description: common files for the Debian Desktop + This package contains various miscellaneous files which are used by + Debian Desktop installations. Currently, it provides some + Debian-related artwork and themes, .desktop files containing links to + Debian related material (suitable for placement on a user's desktop), + and other common files between the available desktop environments + such as GNOME and KDE. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..b9652ec --- /dev/null +++ b/debian/copyright @@ -0,0 +1,39 @@ +This package was debianized by Colin Walters on +Tue, 22 Oct 2002 15:05:34 -0400. + +This package is comprised of bits and pieces from various sources. + +Copyright: + +The Debian swirl background images included in this package were +created by gfburke@earthlink.net (Gary Burke), and were derived from +copyright-free stock artwork. It can be downloaded from +http://wm.themes.org, as "Debian.tar.gz". + +The Debian "bluedeb" background was created by Roger So +, and is under the terms of the BSD license. See +../backgrounds/bluedeb.COPYING for more information. + +The Debian splash screen was created by Mirko Hufnagel +, and is placed into the public domain. + +The Debian_red splash screen imagem was created by + and is copyright-free. It can be downloaded +from http://art.gnome.org/themes/splash_screens/488.php. + +The EvolvingTux splash screen was modified by Filip Van Raemdonck + based on a GPL work found at +http://www.kde-look.org. + +The debian-security.xcf file (and the resulting .png file) were +created by Colin Walters from the Debian Open Use +Logo and a GNOME icon; both are free software. + +The debian-official-logo-small.png image is more or less a simple +reformatting of the Debian Official Use Logo. + +The .desktop files included in this package were compiled by Colin +Walters . + +The GPL license can be found in plain text format, on Debian systems, +at /usr/share/common-licenses/GPL. diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..da18335 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,11 @@ +#!/bin/bash -e + +#DEBHELPER# + +if [ "${1}" = "configure" ] && [ "$2" != "" ] ; then + if dpkg --compare-versions ${2} lt 0.3.11 && dpkg --compare-versions ${2} gt 0.3.5; then + if test -x /var/lib/dpkg/info/libgnome2-common.postinst; then + /var/lib/dpkg/info/libgnome2-common.postinst configure + fi + fi +fi diff --git a/debian/preinst b/debian/preinst new file mode 100644 index 0000000..95e85d3 --- /dev/null +++ b/debian/preinst @@ -0,0 +1,18 @@ +#!/bin/sh -e + +#DEBHELPER# + +if [ "${1}" = "upgrade" ]; then + if dpkg --compare-versions ${2} lt 0.3.11 && dpkg --compare-versions ${2} gt 0.3.5; then + update-alternatives --remove gnome-splash \ + /usr/share/images/desktop-base/Splash-Debian.png + update-alternatives --remove gnome-splash \ + /usr/share/images/desktop-base/Splash-EvolvingTux.png + update-alternatives --remove gnome-splash \ + /usr/share/images/desktop-base/Splash-Debian_red.png + + dpkg-divert --package desktop-base --rename \ + --divert /usr/share/pixmaps/splash/gnome-splash.png.orig \ + --remove /usr/share/pixmaps/splash/gnome-splash.png + fi +fi \ No newline at end of file diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..efdf14e --- /dev/null +++ b/debian/rules @@ -0,0 +1,7 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/buildcore.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/makefile.mk + +DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/desktop-base/ \ No newline at end of file diff --git a/pixmaps/debian-security.png b/pixmaps/debian-security.png new file mode 100644 index 0000000..672ceca Binary files /dev/null and b/pixmaps/debian-security.png differ diff --git a/pixmaps/debian-security.xcf b/pixmaps/debian-security.xcf new file mode 100644 index 0000000..e806fcd Binary files /dev/null and b/pixmaps/debian-security.xcf differ diff --git a/splash/Splash-Debian.png b/splash/Splash-Debian.png new file mode 100644 index 0000000..fc3eeb2 Binary files /dev/null and b/splash/Splash-Debian.png differ diff --git a/splash/Splash-Debian.xcf b/splash/Splash-Debian.xcf new file mode 100644 index 0000000..4caca4d Binary files /dev/null and b/splash/Splash-Debian.xcf differ diff --git a/splash/Splash-Debian_red.png b/splash/Splash-Debian_red.png new file mode 100644 index 0000000..ad62c58 Binary files /dev/null and b/splash/Splash-Debian_red.png differ