r10232 - in /desktop/unstable/gnome-session/debian: changelog copyright postinst prerm rules

Sun Apr 22 13:23:31 UTC 2007

Author: lool
Date: Sun Apr 22 13:23:31 2007
New Revision: 10232

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10232
Log:
* Rewrite rules generating the PNG splash; misc cleanups.
* Fix copyright to really document licensing and copyright holders.

Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/copyright
    desktop/unstable/gnome-session/debian/postinst
    desktop/unstable/gnome-session/debian/prerm
    desktop/unstable/gnome-session/debian/rules

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=10232&op=diff
==============================================================================

--- desktop/unstable/gnome-session/debian/changelog (original)
+++ desktop/unstable/gnome-session/debian/changelog Sun Apr 22 13:23:31 2007
@@ -10,8 +10,10 @@
   * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on
     cdbs >= 0.4.41.
   * Prepend -z defs to LDFLAGS for additional safety.
-
- -- Loic Minier <lool at dooz.org>  Sun, 22 Apr 2007 14:03:37 +0200
+  * Rewrite rules generating the PNG splash; misc cleanups.
+  * Fix copyright to really document licensing and copyright holders.
+
+ -- Loic Minier <lool at dooz.org>  Sun, 22 Apr 2007 15:23:12 +0200
 
 gnome-session (2.16.3-2) experimental; urgency=low
 

Modified: desktop/unstable/gnome-session/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/copyright?rev=10232&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/copyright (original)
+++ desktop/unstable/gnome-session/debian/copyright Sun Apr 22 13:23:31 2007
@@ -5,8 +5,27 @@
 
 It was downloaded from <http://ftp.gnome.org/pub/GNOME/sources/gnome-session/>.
 
-Copyright: 1998,99,2000 Free Software Foundation, Inc.
+Upstream Authors and Copyright Holders:
+    Tom Tromey <tromey at cygnus.com>
+    Felix Bellaby <felix at pooh.u-net.com>
+    Ralph Mor, X Consortium
 
-This code is released under the terms of the GPL license.
+License:
 
-See /usr/share/common-licenses/GPL for the full license.
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+

Modified: desktop/unstable/gnome-session/debian/postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/postinst?rev=10232&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/postinst (original)
+++ desktop/unstable/gnome-session/debian/postinst Sun Apr 22 13:23:31 2007
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 if [ "$1" = configure ]; then
   update-alternatives --install /usr/bin/x-session-manager \
@@ -12,5 +14,3 @@
 fi
 
 #DEBHELPER#
-
-exit 0

Modified: desktop/unstable/gnome-session/debian/prerm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/prerm?rev=10232&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/prerm (original)
+++ desktop/unstable/gnome-session/debian/prerm Sun Apr 22 13:23:31 2007
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 if [ "$1" = "remove" ] || [ "$1" = upgrade ]; then
   update-alternatives --remove x-session-manager /usr/bin/gnome-session
@@ -9,5 +11,3 @@
 fi
 
 #DEBHELPER#
-
-exit 0

Modified: desktop/unstable/gnome-session/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/rules?rev=10232&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/rules (original)
+++ desktop/unstable/gnome-session/debian/rules Sun Apr 22 13:23:31 2007
@@ -7,27 +7,36 @@
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --localstatedir=/var/lib \
+DEB_CONFIGURE_EXTRA_FLAGS += --localstatedir=/var/lib \
 	--with-window-manager=metacity \
 	--enable-ipv6 \
 	--with-at-spi-registryd-directory=/usr/lib/at-spi
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-INSTDIR = debian/gnome-session/usr
+%.png: %.sng
+	sng $<
 
-common-build-arch::
-	sng debian/gnome-debian-splash.sng
+SPLASH := debian/gnome-debian-splash.png
+
+common-build-arch:: $(SPLASH)
 
 clean::
-	rm -f intltool-extract intltool-merge intltool-update \
-		po/.intltool-merge-cache gnome-session/default.session \
+	rm -vf $(SPLASH)
+
+clean::
+	rm -vf \
+		gnome-session/default.session \
 		gnome-session/default.wm \
 		gnome-session/session-properties.desktop \
-		gnome-session/gnome-session.schemas \
-		debian/gnome-debian-splash.png
+		gnome-session/gnome-session.schemas
 
 binary-post-install/gnome-session::
-# Hack manpages
-	perl -i -pe 's,\$$\{prefix},/usr,' $(INSTDIR)/share/man/man5/default.session.5
-	perl -i -pe 's,\$$\{prefix},/usr,' $(INSTDIR)/share/man/man1/gnome-session.1
+	# fix bogus ${prefix} in manpages
+	cd debian/gnome-session/usr/share/man/ && \
+		sed \
+			-i \
+			's#\$${prefix}#/usr#g' \
+			man5/default.session.5 \
+			man1/gnome-session.1
+


