[Pkg-bazaar-commits] ./bzr-gtk/unstable r32: Move to debian/ -style RCS packaging

Chris Lamb chris at chris-lamb.co.uk
Thu May 1 11:41:35 UTC 2008


------------------------------------------------------------
revno: 32
committer: Chris Lamb <chris at chris-lamb.co.uk>
branch nick: pkg-bzr-gtk
timestamp: Thu 2008-05-01 12:41:35 +0100
message:
  Move to debian/ -style RCS packaging
removed:
  README.Debian
  bzr-gtk.lintian-overrides
  changelog
  compat
  control
  copyright
  docs
  man/
  man/olive-gtk.1
  manpages
  patches/
  patches/00list
  patches/02-disable-nautilus-integration.dpatch
  patches/03-ghost-window.dpatch
  patches/04-add-missing-icons.dpatch
  pycompat
  rules
  watch
added:
  debian/
  debian/README.Debian
  debian/bzr-gtk.lintian-overrides
  debian/changelog
  debian/compat
  debian/control
  debian/copyright
  debian/docs
  debian/man/
  debian/man/olive-gtk.1
  debian/manpages
  debian/patches/
  debian/patches/00list
  debian/patches/02-disable-nautilus-integration.dpatch
  debian/patches/03-ghost-window.dpatch
  debian/patches/04-add-missing-icons.dpatch
  debian/pycompat
  debian/rules
  debian/watch
-------------- next part --------------
=== removed file 'README.Debian'
--- a/README.Debian	2007-06-15 16:32:41 +0000
+++ b/README.Debian	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-bzr-gtk for Debian
-------------------
-
-* The commit-notify command has been disabled due to incomplete bzr/DBus
-  integration.
-
-* The Nautilus integration facility has not been packaged because it is
-  incompatible with the current bzr and bzr-gtk API.
-
- -- Chris Lamb <chris at chris-lamb.co.uk>  Tue, 24 Apr 2007 12:58:57 +0100

=== removed file 'bzr-gtk.lintian-overrides'
--- a/bzr-gtk.lintian-overrides	2008-01-05 13:17:53 +0000
+++ b/bzr-gtk.lintian-overrides	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-bzr-gtk binary: desktop-command-not-in-package /usr/share/applications/bazaar-properties.desktop bzr
-bzr-gtk binary: desktop-command-not-in-package /usr/share/applications/bzr-notify.desktop bzr

=== removed file 'changelog'
--- a/changelog	2008-03-04 23:23:33 +0000
+++ b/changelog	1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-bzr-gtk (0.93.0-4) unstable; urgency=low
-
-  * Remove commit-notify disable patch and recommend bzr-dbus.
-
- -- Jelmer Vernooij <jelmer at samba.org>  Wed, 05 Mar 2008 00:22:55 +0100
-
-bzr-gtk (0.93.0-3) unstable; urgency=low
-
-  [ Chris Lamb ]
-  * debian/rules: Delete empty usr/lib dir (reported by Lintian)
-  * Override "desktop-command-not-in-package" Lintian warnings - the
-    commands are called via bzr itself.
-
- -- Chris Lamb <chris at chris-lamb.co.uk>  Sat, 05 Jan 2008 12:56:35 +0000
-
-bzr-gtk (0.93.0-2) unstable; urgency=low
-
-  [ Chris Lamb ]
-  * Add patch for unclosed progress window. (Closes: #440354)
-    Patch by Jean-Fran?ois Fortin Tam <jeff at ecchi.ca>
-  * Fix broken icons in .desktop files (Closes: #456438).
-
- -- Chris Lamb <chris at chris-lamb.co.uk>  Fri, 28 Dec 2007 17:08:48 +0100
-
-bzr-gtk (0.93.0-1) unstable; urgency=low
-
-  [ Adeodato Sim? ]
-  * New upstream release.
-  * No longer enforce a << dependency on bzr: talking with upstream, it seems
-    that from now on releases ought to work with newer bzr versions.
-
-  [ Jelmer Vernooij ]
-  * Set homepage field.
-
-  [ Arnaud Fontaine ]
-  * Rename X-Vcs-Bzr to Vcs-Bzr (dpkg supports it now).
-  * Update GPL path to GPL-2 as GPL-3 is now the default.
-
-  [ Chris Lamb ]
-  * Bump Standards-Version from 3.7.2 to 3.7.3.
-
- -- Adeodato Sim? <dato at net.com.org.es>  Mon, 10 Dec 2007 15:53:07 +0100
-
-bzr-gtk (0.92.1-1) unstable; urgency=low
-
-  * New upstream release.
-    + Log window does not take forever to start. (Closes: #438745)
-
- -- Adeodato Sim? <dato at net.com.org.es>  Sun, 11 Nov 2007 19:55:56 +0100
-
-bzr-gtk (0.91.0-1) unstable; urgency=low
-
-  * New upstream release.
-  * Add myself to uploaders, to please lintian.
-
- -- Adeodato Sim? <dato at net.com.org.es>  Wed, 26 Sep 2007 22:23:21 +0200
-
-bzr-gtk (0.90.0-1) unstable; urgency=low
-
-  * New upstream release. (Closes: #439867)
-
- -- Jelmer Vernooij <jelmer at samba.org>  Mon, 27 Aug 2007 14:55:00 +0200
-
-bzr-gtk (0.18.0-1) unstable; urgency=low
-
-  [ Jelmer Vernooij ]
-  * New upstream release.
-  * Add bzr to Enhances.
-
-  [ Adeodato Sim? ]
-  * Add python-gnome2-desktop to Suggests, needed for syntax highlighting of
-    diffs.
-
- -- Jelmer Vernooij <jelmer at samba.org>  Thu, 19 Jul 2007 14:33:13 +0200
-
-bzr-gtk (0.17.0-1) unstable; urgency=low
-
-  * New upstream release
-  * make the dependency on bzr more strict as discussed on pkg-bazaar-maint
-
- -- Reinhard Tartler <siretart at tauware.de>  Fri, 15 Jun 2007 17:38:56 +0100
-
-bzr-gtk (0.16.0-1) unstable; urgency=low
-
-  * New upstream release (Closes: #423133).
-  * Move to pycentral in line with pkg-bazaar team (Closes: #422770).
-
- -- Chris Lamb <chris at chris-lamb.co.uk>  Wed, 23 May 2007 21:54:49 +0100
-
-bzr-gtk (0.15.2-2) unstable; urgency=low
-
-  * Add debian/pyversions (Closes: #422770).
-  * Cosmetic changes to debian/copyright.
-
- -- Chris Lamb <chris at chris-lamb.co.uk>  Tue, 08 May 2007 08:57:58 +0100
-
-bzr-gtk (0.15.2-1) unstable; urgency=low
-
-  * Initial release.
-
- -- Chris Lamb <chris at chris-lamb.co.uk>  Tue, 24 Apr 2007 12:58:57 +0100

=== removed file 'compat'
--- a/compat	2007-06-15 16:32:41 +0000
+++ b/compat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-5

=== removed file 'control'
--- a/control	2008-04-01 20:16:01 +0000
+++ b/control	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-Source: bzr-gtk
-Section: python
-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: python-central (>= 0.5), cdbs (>= 0.4.43), dpatch, python, debhelper (>= 5.0.37.2)
-Standards-Version: 3.7.3
-Homepage: http://bazaar-vcs.org/bzr-gtk
-XS-Python-Version: >= 2.4
-Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-gtk/unstable
-
-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
-Suggests: python-gnome2-desktop
-Enhances: bzr
-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
- tool.
- .
- 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.

=== removed file 'copyright'
--- a/copyright	2007-11-23 01:06:17 +0000
+++ b/copyright	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-This package was debianized by Chris Lamb <chris at chris-lamb.co.uk> on
-Tue, 24 Apr 2007 12:58:57 +0100.
-
-It was downloaded from <http://bazaar-vcs.org/bzr-gtk>.
-
-Upstream Authors: Jelmer Vernooij <jelmer at samba.org>
-                  Szilveszter Farkas <Szilveszter.Farkas at gmail.com>
-
-Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
-          (C) 2006 Szilveszter Farkas <Szilveszter.Farkas at gmail.com>
-          (C) 2006 Jeff Bailey <jeff.bailey at ubuntu.com>
-          (C) 2006 Wouter van Heyst <larstiq at larstiq.dyndns.org>
-          (C) 2005-2006 Canonical Ltd.
-          (C) 2005 Dan Loda <danloda at gmail.com>
-
-License:
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-On Debian systems, the complete text of the GNU General Public
-License can be found in the file `/usr/share/common-licenses/GPL-2'
-
-The Debian packaging is (C) 2007, Chris Lamb <chris at chris-lamb.co.uk> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

=== added directory 'debian'
=== added file 'debian/README.Debian'
--- a/debian/README.Debian	1970-01-01 00:00:00 +0000
+++ b/debian/README.Debian	2008-05-01 11:41:35 +0000
@@ -0,0 +1,10 @@
+bzr-gtk for Debian
+------------------
+
+* The commit-notify command has been disabled due to incomplete bzr/DBus
+  integration.
+
+* The Nautilus integration facility has not been packaged because it is
+  incompatible with the current bzr and bzr-gtk API.
+
+ -- Chris Lamb <chris at chris-lamb.co.uk>  Tue, 24 Apr 2007 12:58:57 +0100

=== added file 'debian/bzr-gtk.lintian-overrides'
--- a/debian/bzr-gtk.lintian-overrides	1970-01-01 00:00:00 +0000
+++ b/debian/bzr-gtk.lintian-overrides	2008-05-01 11:41:35 +0000
@@ -0,0 +1,2 @@
+bzr-gtk binary: desktop-command-not-in-package /usr/share/applications/bazaar-properties.desktop bzr
+bzr-gtk binary: desktop-command-not-in-package /usr/share/applications/bzr-notify.desktop bzr

=== added file 'debian/changelog'
--- a/debian/changelog	1970-01-01 00:00:00 +0000
+++ b/debian/changelog	2008-05-01 11:41:35 +0000
@@ -0,0 +1,101 @@
+bzr-gtk (0.93.0-4) unstable; urgency=low
+
+  * Remove commit-notify disable patch and recommend bzr-dbus.
+
+ -- Jelmer Vernooij <jelmer at samba.org>  Wed, 05 Mar 2008 00:22:55 +0100
+
+bzr-gtk (0.93.0-3) unstable; urgency=low
+
+  [ Chris Lamb ]
+  * debian/rules: Delete empty usr/lib dir (reported by Lintian)
+  * Override "desktop-command-not-in-package" Lintian warnings - the
+    commands are called via bzr itself.
+
+ -- Chris Lamb <chris at chris-lamb.co.uk>  Sat, 05 Jan 2008 12:56:35 +0000
+
+bzr-gtk (0.93.0-2) unstable; urgency=low
+
+  [ Chris Lamb ]
+  * Add patch for unclosed progress window. (Closes: #440354)
+    Patch by Jean-Fran?ois Fortin Tam <jeff at ecchi.ca>
+  * Fix broken icons in .desktop files (Closes: #456438).
+
+ -- Chris Lamb <chris at chris-lamb.co.uk>  Fri, 28 Dec 2007 17:08:48 +0100
+
+bzr-gtk (0.93.0-1) unstable; urgency=low
+
+  [ Adeodato Sim? ]
+  * New upstream release.
+  * No longer enforce a << dependency on bzr: talking with upstream, it seems
+    that from now on releases ought to work with newer bzr versions.
+
+  [ Jelmer Vernooij ]
+  * Set homepage field.
+
+  [ Arnaud Fontaine ]
+  * Rename X-Vcs-Bzr to Vcs-Bzr (dpkg supports it now).
+  * Update GPL path to GPL-2 as GPL-3 is now the default.
+
+  [ Chris Lamb ]
+  * Bump Standards-Version from 3.7.2 to 3.7.3.
+
+ -- Adeodato Sim? <dato at net.com.org.es>  Mon, 10 Dec 2007 15:53:07 +0100
+
+bzr-gtk (0.92.1-1) unstable; urgency=low
+
+  * New upstream release.
+    + Log window does not take forever to start. (Closes: #438745)
+
+ -- Adeodato Sim? <dato at net.com.org.es>  Sun, 11 Nov 2007 19:55:56 +0100
+
+bzr-gtk (0.91.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add myself to uploaders, to please lintian.
+
+ -- Adeodato Sim? <dato at net.com.org.es>  Wed, 26 Sep 2007 22:23:21 +0200
+
+bzr-gtk (0.90.0-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #439867)
+
+ -- Jelmer Vernooij <jelmer at samba.org>  Mon, 27 Aug 2007 14:55:00 +0200
+
+bzr-gtk (0.18.0-1) unstable; urgency=low
+
+  [ Jelmer Vernooij ]
+  * New upstream release.
+  * Add bzr to Enhances.
+
+  [ Adeodato Sim? ]
+  * Add python-gnome2-desktop to Suggests, needed for syntax highlighting of
+    diffs.
+
+ -- Jelmer Vernooij <jelmer at samba.org>  Thu, 19 Jul 2007 14:33:13 +0200
+
+bzr-gtk (0.17.0-1) unstable; urgency=low
+
+  * New upstream release
+  * make the dependency on bzr more strict as discussed on pkg-bazaar-maint
+
+ -- Reinhard Tartler <siretart at tauware.de>  Fri, 15 Jun 2007 17:38:56 +0100
+
+bzr-gtk (0.16.0-1) unstable; urgency=low
+
+  * New upstream release (Closes: #423133).
+  * Move to pycentral in line with pkg-bazaar team (Closes: #422770).
+
+ -- Chris Lamb <chris at chris-lamb.co.uk>  Wed, 23 May 2007 21:54:49 +0100
+
+bzr-gtk (0.15.2-2) unstable; urgency=low
+
+  * Add debian/pyversions (Closes: #422770).
+  * Cosmetic changes to debian/copyright.
+
+ -- Chris Lamb <chris at chris-lamb.co.uk>  Tue, 08 May 2007 08:57:58 +0100
+
+bzr-gtk (0.15.2-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Chris Lamb <chris at chris-lamb.co.uk>  Tue, 24 Apr 2007 12:58:57 +0100

=== added file 'debian/compat'
--- a/debian/compat	1970-01-01 00:00:00 +0000
+++ b/debian/compat	2008-05-01 11:41:35 +0000
@@ -0,0 +1,1 @@
+5

=== added file 'debian/control'
--- a/debian/control	1970-01-01 00:00:00 +0000
+++ b/debian/control	2008-05-01 11:41:35 +0000
@@ -0,0 +1,27 @@
+Source: bzr-gtk
+Section: python
+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: python-central (>= 0.5), cdbs (>= 0.4.43), dpatch, python, debhelper (>= 5.0.37.2)
+Standards-Version: 3.7.3
+Homepage: http://bazaar-vcs.org/bzr-gtk
+XS-Python-Version: >= 2.4
+Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-gtk/unstable
+
+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
+Suggests: python-gnome2-desktop
+Enhances: bzr
+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
+ tool.
+ .
+ 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.

=== added file 'debian/copyright'
--- a/debian/copyright	1970-01-01 00:00:00 +0000
+++ b/debian/copyright	2008-05-01 11:41:35 +0000
@@ -0,0 +1,32 @@
+This package was debianized by Chris Lamb <chris at chris-lamb.co.uk> on
+Tue, 24 Apr 2007 12:58:57 +0100.
+
+It was downloaded from <http://bazaar-vcs.org/bzr-gtk>.
+
+Upstream Authors: Jelmer Vernooij <jelmer at samba.org>
+                  Szilveszter Farkas <Szilveszter.Farkas at gmail.com>
+
+Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
+          (C) 2006 Szilveszter Farkas <Szilveszter.Farkas at gmail.com>
+          (C) 2006 Jeff Bailey <jeff.bailey at ubuntu.com>
+          (C) 2006 Wouter van Heyst <larstiq at larstiq.dyndns.org>
+          (C) 2005-2006 Canonical Ltd.
+          (C) 2005 Dan Loda <danloda at gmail.com>
+
+License:
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in the file `/usr/share/common-licenses/GPL-2'
+
+The Debian packaging is (C) 2007, Chris Lamb <chris at chris-lamb.co.uk> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

=== added file 'debian/docs'
--- a/debian/docs	1970-01-01 00:00:00 +0000
+++ b/debian/docs	2008-05-01 11:41:35 +0000
@@ -0,0 +1,3 @@
+NEWS
+README
+TODO

=== added directory 'debian/man'
=== added file 'debian/man/olive-gtk.1'
--- a/debian/man/olive-gtk.1	1970-01-01 00:00:00 +0000
+++ b/debian/man/olive-gtk.1	2008-05-01 11:41:35 +0000
@@ -0,0 +1,15 @@
+.TH OLIVE-GTK 1 "April 24, 2007"
+.SH NAME
+olive-gtk \- GTK+ frontend for Bazaar
+.SH SYNOPSIS
+.B olive-gtk
+.SH DESCRIPTION
+Olive aims to be a full-featured graphical frontend for the Bazaar (bzr)
+source code management tool.
+.SH SEE ALSO
+.BR bzr (1).
+.SH AUTHOR
+\fBolive-gtk\fP was written by Szilveszter Farkas <szilveszter.farkas at gmail.com>
+.PP
+This manual page was written by Chris Lamb <chris at chris-lamb.co.uk>,
+for the Debian project (but may be used by others).

=== added file 'debian/manpages'
--- a/debian/manpages	1970-01-01 00:00:00 +0000
+++ b/debian/manpages	2008-05-01 11:41:35 +0000
@@ -0,0 +1,1 @@
+debian/man/*

=== added directory 'debian/patches'
=== added file 'debian/patches/00list'
--- a/debian/patches/00list	1970-01-01 00:00:00 +0000
+++ b/debian/patches/00list	2008-05-01 11:41:35 +0000
@@ -0,0 +1,3 @@
+02-disable-nautilus-integration.dpatch
+03-ghost-window.dpatch
+04-add-missing-icons.dpatch

=== added file 'debian/patches/02-disable-nautilus-integration.dpatch'
--- a/debian/patches/02-disable-nautilus-integration.dpatch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/02-disable-nautilus-integration.dpatch	2008-05-01 11:41:35 +0000
@@ -0,0 +1,18 @@
+#! /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
+ 

=== added file 'debian/patches/03-ghost-window.dpatch'
--- a/debian/patches/03-ghost-window.dpatch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/03-ghost-window.dpatch	2008-05-01 11:41:35 +0000
@@ -0,0 +1,19 @@
+#! /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):

=== added file 'debian/patches/04-add-missing-icons.dpatch'
--- a/debian/patches/04-add-missing-icons.dpatch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/04-add-missing-icons.dpatch	2008-05-01 11:41:35 +0000
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04-add-missing-icons.dpatch by Chris Lamb <chris at chris-lamb.co.uk>
+##
+## DP: Fix broken icons in .desktop files (Closes: #456438).
+
+ at DPATCH@
+diff -urNad bzr-gtk~/bazaar-properties.desktop bzr-gtk/bazaar-properties.desktop
+--- bzr-gtk~/bazaar-properties.desktop	2007-12-18 23:20:54.000000000 +0000
++++ bzr-gtk/bazaar-properties.desktop	2007-12-18 23:24:17.000000000 +0000
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Name=Bazaar Preferences
+ Comment=Configure Bazaar settings
+-Icon=bazaar
++Icon=bzr-icon-64.png
+ Exec=bzr gpreferences
+ Terminal=false
+ Type=Application
+diff -urNad bzr-gtk~/setup.py bzr-gtk/setup.py
+--- bzr-gtk~/setup.py	2007-12-18 23:20:54.000000000 +0000
++++ bzr-gtk/setup.py	2007-12-18 23:24:01.000000000 +0000
+@@ -126,7 +126,8 @@
+                 ('share/applications', ['olive-gtk.desktop',
+                                         'bazaar-properties.desktop',
+                                         'bzr-notify.desktop']),
+-                ('share/pixmaps', ['icons/olive-gtk.png'])
++                ('share/pixmaps', ['icons/olive-gtk.png',
++                                   'bzr-icon-64.png'])
+                ],
+     cmdclass={'install_data': InstallData,
+               'check': Check}

=== added file 'debian/pycompat'
--- a/debian/pycompat	1970-01-01 00:00:00 +0000
+++ b/debian/pycompat	2008-05-01 11:41:35 +0000
@@ -0,0 +1,1 @@
+2

=== added file 'debian/rules'
--- a/debian/rules	1970-01-01 00:00:00 +0000
+++ b/debian/rules	2008-05-01 11:41:35 +0000
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+DEB_PYTHON_SYSTEM=pycentral
+
+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
+
+binary-install/bzr-gtk::
+	rm -rfv $(DEB_DESTDIR)/usr/lib

=== added file 'debian/watch'
--- a/debian/watch	1970-01-01 00:00:00 +0000
+++ b/debian/watch	2008-05-01 11:41:35 +0000
@@ -0,0 +1,2 @@
+version=3
+http://samba.org/~jelmer/bzr/bzr-gtk-(.*).tar.gz

=== removed file 'docs'
--- a/docs	2007-06-15 16:32:41 +0000
+++ b/docs	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-NEWS
-README
-TODO

=== removed directory 'man'
=== removed file 'man/olive-gtk.1'
--- a/man/olive-gtk.1	2008-03-04 23:35:17 +0000
+++ b/man/olive-gtk.1	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-.TH OLIVE-GTK 1 "April 24, 2007"
-.SH NAME
-olive-gtk \- GTK+ frontend for Bazaar
-.SH SYNOPSIS
-.B olive-gtk
-.SH DESCRIPTION
-Olive aims to be a full-featured graphical frontend for the Bazaar (bzr)
-source code management tool.
-.SH SEE ALSO
-.BR bzr (1).
-.SH AUTHOR
-\fBolive-gtk\fP was written by Szilveszter Farkas <szilveszter.farkas at gmail.com>
-.PP
-This manual page was written by Chris Lamb <chris at chris-lamb.co.uk>,
-for the Debian project (but may be used by others).

=== removed file 'manpages'
--- a/manpages	2007-06-15 16:32:41 +0000
+++ b/manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/man/*

=== removed directory 'patches'
=== removed file 'patches/00list'
--- a/patches/00list	2008-03-04 23:23:33 +0000
+++ b/patches/00list	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-02-disable-nautilus-integration.dpatch
-03-ghost-window.dpatch
-04-add-missing-icons.dpatch

=== removed file 'patches/02-disable-nautilus-integration.dpatch'
--- a/patches/02-disable-nautilus-integration.dpatch	2007-06-15 16:32:41 +0000
+++ b/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 'patches/03-ghost-window.dpatch'
--- a/patches/03-ghost-window.dpatch	2007-12-18 22:19:10 +0000
+++ b/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):

=== removed file 'patches/04-add-missing-icons.dpatch'
--- a/patches/04-add-missing-icons.dpatch	2007-12-18 23:27:21 +0000
+++ b/patches/04-add-missing-icons.dpatch	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04-add-missing-icons.dpatch by Chris Lamb <chris at chris-lamb.co.uk>
-##
-## DP: Fix broken icons in .desktop files (Closes: #456438).
-
- at DPATCH@
-diff -urNad bzr-gtk~/bazaar-properties.desktop bzr-gtk/bazaar-properties.desktop
---- bzr-gtk~/bazaar-properties.desktop	2007-12-18 23:20:54.000000000 +0000
-+++ bzr-gtk/bazaar-properties.desktop	2007-12-18 23:24:17.000000000 +0000
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- Name=Bazaar Preferences
- Comment=Configure Bazaar settings
--Icon=bazaar
-+Icon=bzr-icon-64.png
- Exec=bzr gpreferences
- Terminal=false
- Type=Application
-diff -urNad bzr-gtk~/setup.py bzr-gtk/setup.py
---- bzr-gtk~/setup.py	2007-12-18 23:20:54.000000000 +0000
-+++ bzr-gtk/setup.py	2007-12-18 23:24:01.000000000 +0000
-@@ -126,7 +126,8 @@
-                 ('share/applications', ['olive-gtk.desktop',
-                                         'bazaar-properties.desktop',
-                                         'bzr-notify.desktop']),
--                ('share/pixmaps', ['icons/olive-gtk.png'])
-+                ('share/pixmaps', ['icons/olive-gtk.png',
-+                                   'bzr-icon-64.png'])
-                ],
-     cmdclass={'install_data': InstallData,
-               'check': Check}

=== removed file 'pycompat'
--- a/pycompat	2007-06-15 16:32:41 +0000
+++ b/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== removed file 'rules'
--- a/rules	2008-01-05 13:20:33 +0000
+++ b/rules	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/usr/bin/make -f
-
-DEB_PYTHON_SYSTEM=pycentral
-
-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
-
-binary-install/bzr-gtk::
-	rm -rfv $(DEB_DESTDIR)/usr/lib

=== removed file 'watch'
--- a/watch	2007-06-15 16:32:41 +0000
+++ b/watch	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-version=3
-http://samba.org/~jelmer/bzr/bzr-gtk-(.*).tar.gz



More information about the Pkg-bazaar-commits mailing list