Hi,

I made following changes for Ubuntu. You probably want them all:

bzr-gtk (0.97.0+bzr674-3ubuntu1) lucid; urgency=low

  * Add pkg-config to Build-Depends-Indep to fix FTBFS (LP: #521353).
  * Remove build/ directory on clean (for building twice in a row).
  * debian/control: Wrap and Sort dependencies.
  * Switch to debhelper 7.
  * Use debian/bzr-gtk.install instead of using install/bzr-gtk target and
    remove DEB_DH_INSTALL_SOURCEDIR (requires debhelper 7).

 -- Benjamin Drung <bdr...@ubuntu.com>  Sun, 14 Feb 2010 23:10:08 +0100

-- 
Benjamin Drung
Ubuntu Developer (www.ubuntu.com) | Debian Maintainer (www.debian.org)
diff -Nru bzr-gtk-0.97.0+bzr674/debian/bzr-gtk.install bzr-gtk-0.97.0+bzr674/debian/bzr-gtk.install
--- bzr-gtk-0.97.0+bzr674/debian/bzr-gtk.install	2010-02-08 03:55:23.000000000 +0100
+++ bzr-gtk-0.97.0+bzr674/debian/bzr-gtk.install	2010-02-14 23:09:35.000000000 +0100
@@ -1,11 +1,10 @@
-/usr/share/lintian/overrides/bzr-gtk
 /usr/share/pixmaps/bzr-icon-64.png
 /usr/lib/python*
 /usr/share/bzr-gtk
 /usr/bin/bzr-notify
 /usr/bin/olive-gtk
 /usr/bin/bzr-handle-patch
-/etc/xdg/autostart/bzr-notify.desktop
+bzr-notify.desktop etc/xdg/autostart
 /usr/share/locale/*/LC_MESSAGES/olive-gtk.mo
 /usr/share/olive/cmenu.ui
 /usr/share/applications/*.desktop
diff -Nru bzr-gtk-0.97.0+bzr674/debian/compat bzr-gtk-0.97.0+bzr674/debian/compat
--- bzr-gtk-0.97.0+bzr674/debian/compat	2010-02-08 03:55:23.000000000 +0100
+++ bzr-gtk-0.97.0+bzr674/debian/compat	2010-02-14 23:09:35.000000000 +0100
@@ -1 +1 @@
-5
+7
diff -Nru bzr-gtk-0.97.0+bzr674/debian/control bzr-gtk-0.97.0+bzr674/debian/control
--- bzr-gtk-0.97.0+bzr674/debian/control	2010-02-08 03:55:23.000000000 +0100
+++ bzr-gtk-0.97.0+bzr674/debian/control	2010-02-14 23:14:53.000000000 +0100
@@ -3,8 +3,14 @@
 Priority: optional
 Maintainer: Debian Bazaar Maintainers <pkg-bazaar-ma...@lists.alioth.debian.org>
 Uploaders: Jelmer Vernooij <jel...@debian.org>, John Francesco Ferlito <jo...@inodes.org>
-Build-Depends-Indep: bzr (>= 1.17~), bzr-stats, python-nautilus (>= 0.5.0)
-Build-Depends: python-central (>= 0.5), cdbs (>= 0.4.43), python, debhelper (>= 5.0.37.2)
+Build-Depends-Indep: bzr (>= 1.17~),
+                     bzr-stats,
+                     pkg-config,
+                     python-nautilus (>= 0.5.0)
+Build-Depends: cdbs (>= 0.4.43),
+               debhelper (>= 7),
+               python,
+               python-central (>= 0.5)
 Standards-Version: 3.8.4
 Homepage: http://bazaar-vcs.org/bzr-gtk
 XS-Python-Version: >= 2.4
@@ -12,9 +18,22 @@
 
 Package: bzr-gtk
 Architecture: all
-Depends: bzr (>= 1.17~), bzr (<< 2.2~), python-gtk2 (>= 2.8), python-glade2 (>= 2.10), python-notify, ${python:Depends}, ${misc:Depends}
-Recommends: python-cairo (>= 1.0), bzr-dbus, seahorse, python-gnome2-desktop, python-gtksourceview2, python-gnomekeyring
-Suggests: bzr-loom, bzr-search, bzr-avahi
+Depends: bzr (>= 1.17~),
+         bzr (<< 2.2~),
+         python-gtk2 (>= 2.8),
+         python-glade2 (>= 2.10),
+         python-notify,
+         ${python:Depends},
+         ${misc:Depends}
+Recommends: bzr-dbus,
+            python-cairo (>= 1.0),
+            python-gnome2-desktop,
+            python-gnomekeyring,
+            python-gtksourceview2,
+            seahorse
+Suggests: bzr-avahi,
+          bzr-loom,
+          bzr-search
 Enhances: bzr
 XB-Python-Version: ${python:Versions}
 Description: provides graphical interfaces to Bazaar (bzr) version control
@@ -28,7 +47,9 @@
 
 Package: nautilus-bzr
 Architecture: all
-Depends: bzr-gtk (= ${source:Version}), python-nautilus (>= 0.5.0), ${misc:Depends}
+Depends: bzr-gtk (= ${source:Version}),
+         python-nautilus (>= 0.5.0),
+         ${misc:Depends}
 Enhances: nautilus
 XB-Python-Version: ${python:Versions}
 Description: Bazaar (bzr) integration for nautilus
diff -Nru bzr-gtk-0.97.0+bzr674/debian/rules bzr-gtk-0.97.0+bzr674/debian/rules
--- bzr-gtk-0.97.0+bzr674/debian/rules	2010-02-08 03:55:23.000000000 +0100
+++ bzr-gtk-0.97.0+bzr674/debian/rules	2010-02-14 23:09:35.000000000 +0100
@@ -1,13 +1,10 @@
 #!/usr/bin/make -f
 
 DEB_PYTHON_SYSTEM=pycentral
-DEB_DH_INSTALL_SOURCEDIR=debian/tmp
 DEB_DH_INSTALL_ARGS=--list-missing
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
-install/bzr-gtk::
-	install -m644 -D debian/bzr-gtk.lintian-overrides $(DEB_DESTDIR)/usr/share/lintian/overrides/bzr-gtk
-	install -d $(DEB_DESTDIR)/etc/xdg/autostart
-	install -m644 -D bzr-notify.desktop $(DEB_DESTDIR)/etc/xdg/autostart
+clean::
+	rm -rf build

Attachment: signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil

Reply via email to