Rev 49: Package new upstream snapshot. in file:///data/jelmer/bzr-gtk/debian/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/debian/

------------------------------------------------------------
revno: 49
revision-id: jelmer at samba.org-20080718195933-n3wci75aavjyxizt
parent: jelmer at samba.org-20080718195910-kk1q35qyi7vx6pkc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Fri 2008-07-18 21:59:33 +0200
message:
  Package new upstream snapshot.
removed:
  debian/patches/02-disable-nautilus-integration.dpatch 02disablenautilusint-20080501114125-87kn21pvdhpdp0cg-17
  debian/patches/03-ghost-window.dpatch 03ghostwindow.dpatch-20080501114125-87kn21pvdhpdp0cg-18
modified:
  debian/changelog               changelog-20080501114125-87kn21pvdhpdp0cg-4
  debian/patches/00list          00list-20080501114125-87kn21pvdhpdp0cg-16
  debian/rules                   rules-20080501114125-87kn21pvdhpdp0cg-13
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-12 10:39:02 +0000
+++ b/debian/changelog	2008-07-18 19:59:33 +0000
@@ -1,3 +1,9 @@
+bzr-gtk (0.94.0+bzr553-1) unstable; urgency=low
+
+  * New upstream snapshot.
+
+ -- Jelmer Vernooij <jelmer at samba.org>  Fri, 18 Jul 2008 21:55:19 +0200
+
 bzr-gtk (0.94.0-1) unstable; urgency=low
 
   [ Jelmer Vernooij ]

=== modified file 'debian/patches/00list'
--- a/debian/patches/00list	2008-05-01 22:18:05 +0000
+++ b/debian/patches/00list	2008-07-18 19:59:33 +0000
@@ -1,2 +0,0 @@
-02-disable-nautilus-integration.dpatch
-03-ghost-window.dpatch

=== removed file 'debian/patches/02-disable-nautilus-integration.dpatch'
--- a/debian/patches/02-disable-nautilus-integration.dpatch	2008-05-01 11:41:35 +0000
+++ b/debian/patches/02-disable-nautilus-integration.dpatch	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-disable-nautilus-integration.dpatch by Chris Lamb <chris at chris-lamb.co.uk>
-##
-## DP: Disables installation of the Nautilus integration script.
-
- at DPATCH@
-diff -urNad bzr-gtk-0.15.2~/setup.py bzr-gtk-0.15.2/setup.py
---- bzr-gtk-0.15.2~/setup.py	2007-04-03 18:18:00.000000000 +0100
-+++ bzr-gtk-0.15.2/setup.py	2007-04-24 20:38:26.000000000 +0100
-@@ -56,7 +56,7 @@
-             
-             if ret is None:
-                 dest = res[5:]
--                files.append((dest, ['nautilus-bzr.py']))
-+                #files.append((dest, ['nautilus-bzr.py']))
-         
-         return files
- 

=== removed file 'debian/patches/03-ghost-window.dpatch'
--- a/debian/patches/03-ghost-window.dpatch	2008-05-01 11:41:35 +0000
+++ b/debian/patches/03-ghost-window.dpatch	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03-ghost-window.dpatch by Jean-François Fortin Tam <jeff at ecchi.ca>.
-##
-## DP: Fixes Debian bug #440354 and Launchpad bug 127531.
-## DP: Patch by Jean-François Fortin Tam <jeff at ecchi.ca>
-
- at DPATCH@
-diff -urNad bzr-gtk~/ui.py bzr-gtk/ui.py
---- bzr-gtk~/ui.py	2007-12-18 22:05:21.000000000 +0000
-+++ bzr-gtk/ui.py	2007-12-18 22:06:08.000000000 +0000
-@@ -85,6 +85,8 @@
- 
-     def remove(self, pb):
-         self.vbox.remove(pb)
-+        if len(self.vbox.get_children()) == 0: # If there is nothing to show, don't leave a ghost window here
-+             self.destroy()
- 
- 
- class PasswordDialog(gtk.Dialog):

=== modified file 'debian/rules'
--- a/debian/rules	2008-07-01 02:05:00 +0000
+++ b/debian/rules	2008-07-18 19:59:33 +0000
@@ -4,7 +4,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 
 install/bzr-gtk::
 	install -m644 -D debian/bzr-gtk.lintian-overrides $(DEB_DESTDIR)/usr/share/lintian/overrides/bzr-gtk