From 538de888b88a13b83044849dedfbf2b39fa7967f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 20 Apr 2004 15:23:37 +0000 Subject: New upstream --- debian/changelog | 10 ++++++++++ debian/control | 6 ++++-- debian/control.in | 4 +++- debian/postrm | 9 --------- debian/preinst | 5 +++-- 5 files changed, 20 insertions(+), 14 deletions(-) delete mode 100644 debian/postrm diff --git a/debian/changelog b/debian/changelog index 02bfa0b1..b59a918b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +zenity (2.6.1-1) experimental; urgency=low + + * New upstream release + * debian/control.in: Replace and conflict with old gnome-utils + * Remove postrm, and remove the diversion in preinst. + * OK button is default in entry dialogs (closes: #202332) + * Fixed typos in docs (closes: #232475) + + -- Ross Burton Mon, 19 Apr 2004 17:12:29 +0100 + zenity (1.8-1) unstable; urgency=low * New upstream release (closes: #232383) diff --git a/debian/control b/debian/control index 0021abc5..57c0231e 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,15 @@ Source: zenity Section: gnome Priority: optional Maintainer: Ross Burton -Build-Depends: debhelper (>= 4.1.54), cdbs (>= 0.4.4), gnome-pkg-tools, scrollkeeper (>= 0.3.9), libgtk2.0-dev, libglade2-dev, libgconf2-dev, libgnomecanvas2-dev -Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andrew Lau , Edd Dumbill , Emil Soleyman-Zomalan , Gustavo Noronha Silva , Johannes Rohr , Jordi Mallach , Josselin Mouette , Rob Bradford , Robert McQueen , Ross Burton , Takuo KITAME +Build-Depends: debhelper (>= 4.1.54), cdbs (>= 0.4.4), gnome-pkg-tools, scrollkeeper (>= 0.3.9), libgtk2.0-dev (>= 2.4.0), libglade2-dev, libgconf2-dev, libgnomecanvas2-dev +Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Carlos Perelló Marín , Edd Dumbill , Emil Soleyman-Zomalan , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Ondřej Surý , Rob Bradford , Rob Taylor , Robert McQueen , Sebastien Bacher , Takuo KITAME Standards-Version: 3.6.1.0 Package: zenity Architecture: any Depends: ${shlibs:Depends}, scrollkeeper (>= 0.3.9) +Replaces: gnome-utils (<< 2.4.1-1) +Conflicts: gnome-utils (<< 2.4.1-1) Description: Display graphical dialog boxes from shell scripts Zenity allows you to display GTK+ dialogs from shell scripts; it is a rewrite of the `gdialog' command from GNOME 1. diff --git a/debian/control.in b/debian/control.in index d840b6da..ef74e5f5 100644 --- a/debian/control.in +++ b/debian/control.in @@ -2,13 +2,15 @@ Source: zenity Section: gnome Priority: optional Maintainer: Ross Burton -Build-Depends: debhelper (>= 4.1.54), cdbs (>= 0.4.4), gnome-pkg-tools, scrollkeeper (>= 0.3.9), libgtk2.0-dev, libglade2-dev, libgconf2-dev, libgnomecanvas2-dev +Build-Depends: debhelper (>= 4.1.54), cdbs (>= 0.4.4), gnome-pkg-tools, scrollkeeper (>= 0.3.9), libgtk2.0-dev (>= 2.4.0), libglade2-dev, libgconf2-dev, libgnomecanvas2-dev Uploaders: @GNOME_TEAM@ Standards-Version: 3.6.1.0 Package: zenity Architecture: any Depends: ${shlibs:Depends}, scrollkeeper (>= 0.3.9) +Replaces: gnome-utils (<< 2.4.1-1) +Conflicts: gnome-utils (<< 2.4.1-1) Description: Display graphical dialog boxes from shell scripts Zenity allows you to display GTK+ dialogs from shell scripts; it is a rewrite of the `gdialog' command from GNOME 1. diff --git a/debian/postrm b/debian/postrm deleted file mode 100644 index 88a8b796..00000000 --- a/debian/postrm +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -set -e - -if [ "$1" = remove ]; then - dpkg-divert --rename --remove /usr/bin/gdialog -fi - -#DEBHELPER# diff --git a/debian/preinst b/debian/preinst index a9f4654d..886d11a3 100644 --- a/debian/preinst +++ b/debian/preinst @@ -3,8 +3,9 @@ set -e if [ "install" = "$1" ] || [ "upgrade" = "$1" ]; then - dpkg-divert --package zenity --add --rename \ - --divert /usr/bin/gdialog.real /usr/bin/gdialog + if [ "`dpkg-divert --list zenity`" != "" ]; then + dpkg-divert --package zenity --remove /usr/bin/gdialog + fi fi #DEBHELPER# -- cgit