tags 722531 + patch tags 722531 + pending thanks Dear maintainer,
I've prepared an NMU for groundcontrol (versioned as 1.6.6-1.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards.
diff -Nru groundcontrol-1.6.6/debian/changelog groundcontrol-1.6.6/debian/changelog
--- groundcontrol-1.6.6/debian/changelog 2010-08-02 10:26:40.000000000 -0700
+++ groundcontrol-1.6.6/debian/changelog 2013-10-16 23:14:25.000000000 -0700
@@ -1,3 +1,11 @@
+groundcontrol (1.6.6-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add 01_no_bzr_gtk: comments out dependencies on bzr-gtk, which is
+ due to be removed from the archive. Closes: #722531
+
+ -- Jelmer Vernooij <jel...@debian.org> Wed, 16 Oct 2013 23:14:19 -0700
+
groundcontrol (1.6.6-1) unstable; urgency=low
* New upstream release
diff -Nru groundcontrol-1.6.6/debian/control groundcontrol-1.6.6/debian/control
--- groundcontrol-1.6.6/debian/control 2010-05-29 09:12:36.000000000 -0700
+++ groundcontrol-1.6.6/debian/control 2013-10-16 23:13:49.000000000 -0700
@@ -15,7 +15,7 @@
Architecture: all
Depends: ${python:Depends}, ${misc:Depends},
python-gtk2, python-gobject, python-launchpadlib,
- bzr, bzr-gtk, bzrtools,
+ bzr, bzrtools,
python-httplib2, python-nautilus, python-yaml,
python-lazr.restfulclient | python-lazr-restfulclient,
python-lazr.uri | python-lazr-uri,
diff -Nru groundcontrol-1.6.6/debian/patches/01_no_bzr_gtk groundcontrol-1.6.6/debian/patches/01_no_bzr_gtk
--- groundcontrol-1.6.6/debian/patches/01_no_bzr_gtk 1969-12-31 16:00:00.000000000 -0800
+++ groundcontrol-1.6.6/debian/patches/01_no_bzr_gtk 2013-10-16 23:13:19.000000000 -0700
@@ -0,0 +1,49 @@
+Description: Comment out single dependency on bzr-gtk (which no longer in the archive)
+Author: Jelmer Vernooij <jel...@debian.org>
+Status: Not upstream, but trunk has similar code
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722531
+
+diff -ur groundcontrol-1.6.6/GroundControl/commiter.py groundcontrol-1.6.6-no-bzr-gtk/GroundControl/commiter.py
+--- groundcontrol-1.6.6/GroundControl/commiter.py 2010-07-25 01:25:09.000000000 -0700
++++ groundcontrol-1.6.6-no-bzr-gtk/GroundControl/commiter.py 2013-10-16 23:10:56.030191231 -0700
+@@ -28,7 +28,7 @@
+ IconManager, GtkApp
+ )
+ from GroundControl.bugs import BugSelection
+-from bzrlib.plugins.gtk.diff import DiffView
++#from bzrlib.plugins.gtk.diff import DiffView
+
+ change_types = (
+ 'added', # (path, id, kind)
+@@ -70,10 +70,10 @@
+ self.dirs = {}
+ self.fixes = []
+ super(CommitWindow, self).load(*args, **kwargs)
+- self.diffview = DiffView()
++ #self.diffview = DiffView()
+ #self.diffview.set_trees(self.prevt, self.wtr)
+- self.diffview.set_trees(self.wtr, self.prevt)
+- self.widget('viewchanges').add(self.diffview)
++ #self.diffview.set_trees(self.wtr, self.prevt)
++ #self.widget('viewchanges').add(self.diffview)
+ self.slist = ChangesView(self.widget('changes'),
+ selected=self.selected)
+ all_changes = self.branch.get_changes()
+@@ -178,12 +178,12 @@
+ """Show in the diff any items which we want"""
+ if not item.isdir and item.type == 'modified':
+ logging.debug("Showing diff for %s" % item.stem)
+- self.diffview.show_diff([item.stem])
++ #self.diffview.show_diff([item.stem])
+ self.widget("viewchanges").set_position(300)
+ self.window.resize(800, 600)
+- self.diffview.show()
+- else:
+- self.diffview.hide()
++ #self.diffview.show()
++ #else:
++ #self.diffview.hide()
+
+ def remove_bug(self, widget):
+ """It doesn't fix this bug at all!"""
+Only in groundcontrol-1.6.6-no-bzr-gtk/GroundControl: commiter.py~
diff -Nru groundcontrol-1.6.6/debian/patches/series groundcontrol-1.6.6/debian/patches/series
--- groundcontrol-1.6.6/debian/patches/series 1969-12-31 16:00:00.000000000 -0800
+++ groundcontrol-1.6.6/debian/patches/series 2013-10-16 23:13:27.000000000 -0700
@@ -0,0 +1 @@
+01_no_bzr_gtk
signature.asc
Description: Digital signature
