r14484 - in /packages/unstable/gdesklets/debian: changelog control control.in copyright postinst prerm rules

lool at users.alioth.debian.org lool at users.alioth.debian.org
Mon Feb 11 16:34:27 UTC 2008


Author: lool
Date: Mon Feb 11 16:34:26 2008
New Revision: 14484

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14484
Log:
* Wrap build-deps and deps.
* Cleanups.
* Print "GCONF_CONFIG_SOURCE=" before printing the value of this env var --
  looks like old debug output.
* Use set -e in maintainer scripts.

Modified:
    packages/unstable/gdesklets/debian/changelog
    packages/unstable/gdesklets/debian/control
    packages/unstable/gdesklets/debian/control.in
    packages/unstable/gdesklets/debian/copyright
    packages/unstable/gdesklets/debian/postinst
    packages/unstable/gdesklets/debian/prerm
    packages/unstable/gdesklets/debian/rules

Modified: packages/unstable/gdesklets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/changelog?rev=14484&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/changelog (original)
+++ packages/unstable/gdesklets/debian/changelog Mon Feb 11 16:34:26 2008
@@ -1,4 +1,4 @@
-gdesklets (0.35.4-1) UNRELEASED; urgency=high
+gdesklets (0.35.4-1) unstable; urgency=high
 
   [ Loic Minier ]
   * Drop config.guess and config.sub from 01_relibtoolise.diff; build-deps on
@@ -28,6 +28,13 @@
   * debian/watch
     + Fix URL.  (Closes: #449663)
 
+  [ Loic Minier ]
+  * Wrap build-deps and deps.
+  * Cleanups.
+  * Print "GCONF_CONFIG_SOURCE=" before printing the value of this env var --
+    looks like old debug output.
+  * Use set -e in maintainer scripts.
+
  -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Wed, 06 Feb 2008 13:49:53 +0800
 
 gdesklets (0.35.3-4) unstable; urgency=high

Modified: packages/unstable/gdesklets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/control?rev=14484&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/control (original)
+++ packages/unstable/gdesklets/debian/control Mon Feb 11 16:34:26 2008
@@ -3,22 +3,45 @@
 Priority: optional
 Maintainer: Clément Stenac <zorglub at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>, Loic Minier <lool at dooz.org>, Sebastien Bacher <seb128 at debian.org>
-Build-Depends: cdbs, debhelper (>> 4.1.65), python-dev, python-gnome2-dev, python-gtk2-dev, python-pyorbit-dev, libglib2.0-dev (>= 2.4.1-2), pkg-config, swig, libgtk2.0-dev (>= 2.4.1-3), libgnomevfs2-dev (>= 2.8.4), libgtop2-dev (>= 2.6.0-4), gnome-pkg-tools, libgnomeui-dev (>= 2.6.1.1-2), libxml-parser-perl, librsvg2-dev, autotools-dev
+Build-Depends: cdbs,
+               debhelper (>> 4.1.65),
+               python-dev,
+               python-gnome2-dev,
+               python-gtk2-dev,
+               python-pyorbit-dev,
+               libglib2.0-dev (>= 2.4.1-2),
+               pkg-config,
+               swig,
+               libgtk2.0-dev (>= 2.4.1-3),
+               libgnomevfs2-dev (>= 2.8.4),
+               libgtop2-dev (>= 2.6.0-4),
+               gnome-pkg-tools,
+               libgnomeui-dev (>= 2.6.1.1-2),
+               libxml-parser-perl,
+               librsvg2-dev,
+               autotools-dev
 Standards-Version: 3.7.3
 
 Package: gdesklets
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-gnome2 (>= 2.0), python-gtk2 (>= 2.0), python-numeric (>= 23.0-7), python, python-xml
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         ${python:Depends},
+         python-gnome2 (>= 2.0),
+         python-gtk2 (>= 2.0),
+         python-numeric (>= 23.0-7),
+         python,
+         python-xml
 Recommends: gdesklets-data
 Replaces: gdesklets-data (<< 0.21)
 Conflicts: gdesklets-data (<< 0.21)
-Description: Architecture for desktop applets 
+Description: Architecture for desktop applets
  gDesklets is an architecture for "desklets", which are tiny applets
- sitting on your desktop in a symbiotic relationship of eye candy and   
+ sitting on your desktop in a symbiotic relationship of eye candy and
  usefulness.
  .
  You can populate your desktop with status meters, icon bars,
  weather sensors, news tickers... whatever you can imagine...
- Virtually anything is possible and may even be available some day. 
+ Virtually anything is possible and may even be available some day.
  .
  This package only provides the gdesklets base, no applets.

Modified: packages/unstable/gdesklets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/control.in?rev=14484&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/control.in (original)
+++ packages/unstable/gdesklets/debian/control.in Mon Feb 11 16:34:26 2008
@@ -3,22 +3,45 @@
 Priority: optional
 Maintainer: Clément Stenac <zorglub at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs, debhelper (>> 4.1.65), python-dev, python-gnome2-dev, python-gtk2-dev, python-pyorbit-dev, libglib2.0-dev (>= 2.4.1-2), pkg-config, swig, libgtk2.0-dev (>= 2.4.1-3), libgnomevfs2-dev (>= 2.8.4), libgtop2-dev (>= 2.6.0-4), gnome-pkg-tools, libgnomeui-dev (>= 2.6.1.1-2), libxml-parser-perl, librsvg2-dev, autotools-dev
+Build-Depends: cdbs,
+               debhelper (>> 4.1.65),
+               python-dev,
+               python-gnome2-dev,
+               python-gtk2-dev,
+               python-pyorbit-dev,
+               libglib2.0-dev (>= 2.4.1-2),
+               pkg-config,
+               swig,
+               libgtk2.0-dev (>= 2.4.1-3),
+               libgnomevfs2-dev (>= 2.8.4),
+               libgtop2-dev (>= 2.6.0-4),
+               gnome-pkg-tools,
+               libgnomeui-dev (>= 2.6.1.1-2),
+               libxml-parser-perl,
+               librsvg2-dev,
+               autotools-dev
 Standards-Version: 3.7.3
 
 Package: gdesklets
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-gnome2 (>= 2.0), python-gtk2 (>= 2.0), python-numeric (>= 23.0-7), python, python-xml
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         ${python:Depends},
+         python-gnome2 (>= 2.0),
+         python-gtk2 (>= 2.0),
+         python-numeric (>= 23.0-7),
+         python,
+         python-xml
 Recommends: gdesklets-data
 Replaces: gdesklets-data (<< 0.21)
 Conflicts: gdesklets-data (<< 0.21)
-Description: Architecture for desktop applets 
+Description: Architecture for desktop applets
  gDesklets is an architecture for "desklets", which are tiny applets
- sitting on your desktop in a symbiotic relationship of eye candy and   
+ sitting on your desktop in a symbiotic relationship of eye candy and
  usefulness.
  .
  You can populate your desktop with status meters, icon bars,
  weather sensors, news tickers... whatever you can imagine...
- Virtually anything is possible and may even be available some day. 
+ Virtually anything is possible and may even be available some day.
  .
  This package only provides the gdesklets base, no applets.

Modified: packages/unstable/gdesklets/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/copyright?rev=14484&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/copyright (original)
+++ packages/unstable/gdesklets/debian/copyright Mon Feb 11 16:34:26 2008
@@ -4,8 +4,8 @@
 It was downloaded from http://www.gdesklets.de/
 
 Upstream Authors: Martin Grimme <martin at pycage.de>
- 	          Christian Meyer <chrisime at gnome-de.org>
-		  Jesse Andrews <jdandr2 at cs.uky.edu>
+                  Christian Meyer <chrisime at gnome-de.org>
+                  Jesse Andrews <jdandr2 at cs.uky.edu>
 
 Copyright:
 

Modified: packages/unstable/gdesklets/debian/postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/postinst?rev=14484&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/postinst (original)
+++ packages/unstable/gdesklets/debian/postinst Mon Feb 11 16:34:26 2008
@@ -1,8 +1,10 @@
-#! /bin/sh
+#!/bin/sh
+
+set -e
 
 if [ "$1" = configure ] && dpkg --compare-versions "$2" le "0.35.3-2"; then
-	TMP_HOME=`mktemp -d /tmp/gconf.XXXXXX`
-	cat << EOSCHEMA >> $TMP_HOME/schema
+    TMP_HOME=`mktemp -d /tmp/gconf.XXXXXX`
+    cat << EOSCHEMA >> $TMP_HOME/schema
 <gconfschemafile>
     <schemalist>
 
@@ -32,10 +34,10 @@
     </schemalist>
 </gconfschemafile>
 EOSCHEMA
-	echo $GCONF_CONFIG_SOURCE
-	GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-	HOME=$TMP_HOME gconftool-2  --makefile-uninstall-rule $TMP_HOME/schema > /dev/null
-	rm -rf $TMP_HOME
+    echo GCONF_CONFIG_SOURCE=$GCONF_CONFIG_SOURCE
+    GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+    HOME=$TMP_HOME gconftool-2  --makefile-uninstall-rule $TMP_HOME/schema >/dev/null
+    rm -rf $TMP_HOME
 fi
 
 #DEBHELPER#

Modified: packages/unstable/gdesklets/debian/prerm
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/prerm?rev=14484&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/prerm (original)
+++ packages/unstable/gdesklets/debian/prerm Mon Feb 11 16:34:26 2008
@@ -1,10 +1,10 @@
-#! /bin/sh
+#!/bin/sh
 
 set -e
 
 # Remove old cruft let by previous versions
 if [ "$1" = remove ] || [ "$1" = upgrade ]; then
-	rm -f /etc/gconf/schemas/gdesklets-display-thumbnail.schemas
+    rm -f /etc/gconf/schemas/gdesklets-display-thumbnail.schemas
 fi
 
 #DEBHELPER#

Modified: packages/unstable/gdesklets/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/rules?rev=14484&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/rules (original)
+++ packages/unstable/gdesklets/debian/rules Mon Feb 11 16:34:26 2008
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
 
 GNOME_DOWNLOAD_URL = http://www.gdesklets.de/files/gDesklets-$(DEB_UPSTREAM_VERSION).tar.bz2
 TARBALL_EXT := tar.bz2




More information about the pkg-gnome-commits mailing list