summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJosselin Mouette <joss@debian.org>2009-06-21 08:42:06 +0000
committerJosselin Mouette <joss@debian.org>2009-06-21 08:42:06 +0000
commit68ed09c2dcf927da6a2d3ab84980a00bc997cd96 (patch)
tree9c7a48a13c30412b1955dedd9e6f4d033363790a /debian
parentUpload to unstable (diff)
downloadzenity-68ed09c2dcf927da6a2d3ab84980a00bc997cd96.tar.gz
zenity-68ed09c2dcf927da6a2d3ab84980a00bc997cd96.tar.bz2
zenity-68ed09c2dcf927da6a2d3ab84980a00bc997cd96.zip
Only conflict with libgtkada-bin << 2.12.0-4, add replaces.
Closes: #533867.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/control3
-rw-r--r--debian/control.in3
3 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index e8d26ade..c5e6e3bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+zenity (2.26.0-2) UNRELEASED; urgency=low
+
+ * Only conflict with libgtkada-bin << 2.12.0-4, add replaces.
+ Closes: #533867.
+
+ -- Josselin Mouette <joss@debian.org> Sun, 21 Jun 2009 10:41:27 +0200
+
zenity (2.26.0-1) unstable; urgency=low
[ Luca Bruno ]
diff --git a/debian/control b/debian/control
index 1be30947..d28f6e7c 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,8 @@ Package: zenity
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends}
-Conflicts: libgtkada2-bin
+Conflicts: libgtkada2-bin (<< 2.12.0-4)
+Replaces: libgtkada2-bin (<< 2.12.0-4)
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 c5407f30..ac7ea9d5 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -19,7 +19,8 @@ Package: zenity
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends}
-Conflicts: libgtkada2-bin
+Conflicts: libgtkada2-bin (<< 2.12.0-4)
+Replaces: libgtkada2-bin (<< 2.12.0-4)
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.
bgstack15