Move experimental branch of zenity to unstable

10 files changed, 93 insertions, 23 deletions

diff --git a/debian/changelog b/debian/changelog
index 33d2e402..b5257af9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,37 @@
+zenity (3.0.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Frederic Peters <fpeters@debian.org>  Fri, 15 Apr 2011 14:06:51 +0200
+
+zenity (2.91.90-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control.in:
+    + Update for the new gtk+ 3 package names.
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 22 Feb 2011 19:53:35 +0100
+
+zenity (2.91.5-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control.in:
+    - Bump Build-dependencies
+    - Drop libnotify-dev-gtk2.10 build-dependency
+    - Add zenity-common package
+    - Bump Standards-Version to 3.9.1 (no further changes)
+    - Bump debhelper version
+    - Use Breaks instead of Conflicts
+    - Add Homepage field
+    - Add Vcs-* field
+  * Switch to dpkg-source 3.0 (quilt) format
+  * debian/watch: Bump version to 3
+  * debian/zenity.install, zenity-common.install:
+    - Move all arch independent files to zenity-common
+  * debian/rules: Remove unneeded stuff
+
+ -- Laurent Bigonville <bigon@debian.org>  Mon, 07 Feb 2011 03:20:14 +0100
+
 zenity (2.30.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/compat b/debian/compat
index 7ed6ff82..45a4fb75 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8
diff --git a/debian/control b/debian/control
index 43f0a428..29337f21 100644
--- a/debian/control
+++ b/debian/control
@@ -7,24 +7,27 @@ Source: zenity
 Section: gnome
 Priority: optional
 Maintainer: Ross Burton <ross@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Luca Falavigna <dktrkranz@debian.org>, Sebastian Dröge <slomo@debian.org>
-Build-Depends: debhelper (>= 5),
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Frederic Peters <fpeters@debian.org>, Josselin Mouette <joss@debian.org>, Laurent Bigonville <bigon@debian.org>, Loic Minier <lool@dooz.org>, Luca Falavigna <dktrkranz@debian.org>
+Build-Depends: debhelper (>= 8),
                cdbs (>= 0.4.4),
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.40.0),
-               libgtk2.0-dev (>= 2.15.1),
+               libgtk-3-dev (>= 3.0.0),
                gnome-doc-utils (>= 0.3.2),
-               libnotify-dev (>= 0.4.3-2),
-               libnotify-dev-gtk2.10,
+               libnotify-dev (>= 0.6.1),
                libglib2.0-dev,
                docbook-xml
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/zenity
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/zenity
+Homepage: http://live.gnome.org/Zenity
 
 Package: zenity
 Architecture: any
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Conflicts: libgtkada2-bin (<< 2.12.0-4)
+         ${shlibs:Depends},
+         zenity-common (= ${source:Version})
+Breaks: 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
@@ -32,3 +35,17 @@ Description: Display graphical dialog boxes from shell scripts
  .
  Zenity includes a gdialog wrapper script so that it can be used with
  legacy scripts.
+
+Package: zenity-common
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: zenity (<< 2.91.5-1~)
+Replaces: zenity (<< 2.91.5-1~)
+Description: Display graphical dialog boxes from shell scripts (common files)
+ Zenity allows you to display GTK+ dialogs from shell scripts; it is a
+ rewrite of the `gdialog' command from GNOME 1.
+ .
+ Zenity includes a gdialog wrapper script so that it can be used with
+ legacy scripts.
+ .
+ This package contains architecture independent files.
diff --git a/debian/control.in b/debian/control.in
index 8eb900f4..c9b62a2c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,23 +3,26 @@ Section: gnome
 Priority: optional
 Maintainer: Ross Burton <ross@debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 8),
                cdbs (>= 0.4.4),
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.40.0),
-               libgtk2.0-dev (>= 2.15.1),
+               libgtk-3-dev (>= 3.0.0),
                gnome-doc-utils (>= 0.3.2),
-               libnotify-dev (>= 0.4.3-2),
-               libnotify-dev-gtk2.10,
+               libnotify-dev (>= 0.6.1),
                libglib2.0-dev,
                docbook-xml
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/zenity
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/zenity
+Homepage: http://live.gnome.org/Zenity
 
 Package: zenity
 Architecture: any
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Conflicts: libgtkada2-bin (<< 2.12.0-4)
+         ${shlibs:Depends},
+         zenity-common (= ${source:Version})
+Breaks: 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
@@ -27,3 +30,17 @@ Description: Display graphical dialog boxes from shell scripts
  .
  Zenity includes a gdialog wrapper script so that it can be used with
  legacy scripts.
+
+Package: zenity-common
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: zenity (<< 2.91.5-1~)
+Replaces: zenity (<< 2.91.5-1~)
+Description: Display graphical dialog boxes from shell scripts (common files)
+ Zenity allows you to display GTK+ dialogs from shell scripts; it is a
+ rewrite of the `gdialog' command from GNOME 1.
+ .
+ Zenity includes a gdialog wrapper script so that it can be used with
+ legacy scripts.
+ .
+ This package contains architecture independent files.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 00000000..777963c8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_dont_quit_zenity_when_stdin_ends.patch
diff --git a/debian/rules b/debian/rules
index 3d35a594..8cc7fccc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,15 +3,9 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
 
 LDFLAGS += -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
-
-clean::
-	rm -f intltool-extract intltool-merge intltool-update
-	rm -f po/.intltool-merge-cache
-	rm -f help/C/zenity-C.omf.out
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 00000000..163aaf8d
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
index 620cb945..954547d7 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=2
+version=3
 http://ftp.gnome.org/pub/gnome/sources/zenity/([\d\.]+)[02468]/zenity-([\d\.]+)\.tar\.gz
diff --git a/debian/zenity-common.install b/debian/zenity-common.install
new file mode 100644
index 00000000..9d158dc1
--- /dev/null
+++ b/debian/zenity-common.install
@@ -0,0 +1,4 @@
+usr/share/omf/
+usr/share/zenity/
+usr/share/locale/
+usr/share/gnome/help/zenity/
diff --git a/debian/zenity.install b/debian/zenity.install
new file mode 100644
index 00000000..9b1d778e
--- /dev/null
+++ b/debian/zenity.install
@@ -0,0 +1,2 @@
+usr/bin/
+usr/share/man/