[Pkg-bazaar-commits] ./bzr-gtk/unstable r48: Package new version.

Jelmer Vernooij jelmer at samba.org
Mon Aug 4 18:53:13 UTC 2008 

------------------------------------------------------------
revno: 48
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Mon 2008-08-04 20:53:13 +0200
message:
  Package new version.
removed:
  debian/patches/02-disable-nautilus-integration.dpatch
  debian/patches/03-ghost-window.dpatch
renamed:
  .bzr-builddeb/local.conf => .bzr-builddeb/default.conf
modified:
  debian/changelog
  debian/control
  debian/patches/00list
  debian/rules
    ------------------------------------------------------------
    revno: 47.1.1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: debian
    timestamp: Fri 2008-07-18 21:59:10 +0200
    message:
      Fix bzr-builddeb use.
    renamed:
      .bzr-builddeb/local.conf => .bzr-builddeb/default.conf
    ------------------------------------------------------------
    revno: 47.1.2
    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
      debian/patches/03-ghost-window.dpatch
    modified:
      debian/changelog
      debian/patches/00list
      debian/rules
    ------------------------------------------------------------
    revno: 47.1.3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: debian
    timestamp: Fri 2008-07-18 22:01:35 +0200
    message:
      New snapshot.
    modified:
      debian/changelog
    ------------------------------------------------------------
    revno: 47.1.4
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: debian
    timestamp: Fri 2008-07-25 23:54:10 +0200
    message:
      Recommend python-nautilus.
    modified:
      debian/control
-------------- next part --------------
=== renamed file '.bzr-builddeb/local.conf' => '.bzr-builddeb/default.conf'
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-12 10:39:02 +0000
+++ b/debian/changelog	2008-08-04 18:53:13 +0000
@@ -1,3 +1,10 @@
+bzr-gtk (0.95.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump standards version to 3.8.0.
+
+ -- Jelmer Vernooij <jelmer at samba.org>  Mon, 04 Aug 2008 20:47:29 +0200
+
 bzr-gtk (0.94.0-1) unstable; urgency=low
 
   [ Jelmer Vernooij ]

=== modified file 'debian/control'
--- a/debian/control	2008-07-18 13:05:13 +0000
+++ b/debian/control	2008-08-04 18:53:13 +0000
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint at lists.alioth.debian.org>
 Uploaders: Chris Lamb <chris at chris-lamb.co.uk>, Jelmer Vernooij <jelmer at samba.org>, Adeodato Sim? <dato at net.com.org.es>
-Build-Depends-Indep: bzr (>= 1.0~)
+Build-Depends-Indep: bzr (>= 1.6~)
 Build-Depends: python-central (>= 0.5), cdbs (>= 0.4.43), dpatch, python, debhelper (>= 5.0.37.2)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://bazaar-vcs.org/bzr-gtk
 XS-Python-Version: >= 2.4
 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-gtk/unstable
@@ -13,10 +13,9 @@
 
 Package: bzr-gtk
 Architecture: all
-Depends: bzr (>= 1.0~), python-gtk2 (>= 2.8), python-glade2 (>= 2.10), ${python:Depends}
-Recommends: python-cairo (>= 1.0), bzr-dbus, seahorse, bzr-avahi, bzr-search
-Suggests: python-gnome2-desktop
-Enhances: bzr
+Depends: bzr (>= 1.6~), python-gtk2 (>= 2.8), python-glade2 (>= 2.10), ${python:Depends}
+Recommends: python-cairo (>= 1.0), bzr-dbus, seahorse, bzr-avahi, bzr-search, python-nautilus, python-gnome2-desktop
+Enhances: bzr, nautilus
 XB-Python-Version: ${python:Versions}
 Description: provides graphical interfaces to Bazaar (bzr) version control
  bzr-gtk provides GTK+ interfaces to the Bazaar (bzr) source code management
@@ -24,5 +23,5 @@
  .
  This package provides Olive, which aims to be a fully-featured graphical
  frontend for bzr, and adds the following commands to the bzr command line
- tool: gannotate, gbranch, gcheckout, gcommit, gconflicts, gdiff, gmissing,
- gpreferences, gpush, gstatus, visualise.
+ tool: gannotate, gbranch, gcheckout, gcommit, gconflicts, gdiff, gloom, 
+ gmissing, gpreferences, gpush, gstatus, visualise.

=== 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

More information about the Pkg-bazaar-commits mailing list