Updated package cuttlefish-bzr 76-6

3 files changed, 30 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e2f77f3509f5..444826230961 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,28 @@
 pkgbase = cuttlefish-bzr
 	pkgdesc = Adapt your computer's appearance and settings according to the environment.
 	pkgver = 76
-	pkgrel = 5
+	pkgrel = 6
 	url = https://launchpad.net/cuttlefish
 	install = cuttlefish-bzr.install
 	arch = any
 	license = GPL
 	makedepends = bzr
-	depends = python2
 	depends = python2-distutils-extra
 	depends = python2-psutil
 	depends = python2-udev
+	depends = python2-dbus
+	depends = python2-xdg
 	depends = gnome-menus
 	depends = libwnck3
-	source = cuttlefish::bzr+https://code.launchpad.net/~noneed4anick/cuttlefish/trunk
+	conflicts = cuttlefish
+	source = cuttlefish-bzr::bzr+https://code.launchpad.net/~noneed4anick/cuttlefish/trunk
 	source = plugins-use-site-packages.patch
 	source = desktop-autostart.patch
-	md5sums = SKIP
-	md5sums = 7c631a9a83197b4d2ae5274d53b5ec73
-	md5sums = b555d227e909a61788a4d2c8acd3120d
-	sha1sums = SKIP
-	sha1sums = 43cd8935b8db879fb383164358d0dcd1d59cfd69
-	sha1sums = 3498c050110cb84fe36706c627ac232652afb4b3
+	source = remove-ubuntu_almost_fixed_height_mode.patch
 	sha256sums = SKIP
 	sha256sums = e7cf831a5083655a29a765626a765fe44069b05c31f5749ca76f6d9f22160480
 	sha256sums = 26a91ab2ff6c21f8f3e8eb3474396ec8940313f158778b1fd8711f2643357a5d
+	sha256sums = 30d17a770792016d07c9a695376bddca17c201143b2e2e04aa30f3b83d90905b
 
 pkgname = cuttlefish-bzr
 
diff --git a/PKGBUILD b/PKGBUILD
index b27418e52bbd..ab3dd13f4ead 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,40 @@
-# Maintainer: Muflone <webreg@vbsimple.net>
+# Maintainer: Muflone http://www.muflone.com/contacts/english/
 # Contributor: Ryon Sherman <ryon.sherman@gmail.com>
 
 pkgname=cuttlefish-bzr
-_pkgname=cuttlefish
 pkgver=76
-pkgrel=5
+pkgrel=6
 pkgdesc="Adapt your computer's appearance and settings according to the environment."
 arch=('any')
 url="https://launchpad.net/cuttlefish"
 license=('GPL')
-depends=('python2' 'python2-distutils-extra' 'python2-psutil' 'python2-udev' 'gnome-menus' 'libwnck3')
+depends=('python2-distutils-extra' 'python2-psutil' 'python2-udev' 'python2-dbus' 'python2-xdg' 'gnome-menus' 'libwnck3')
 makedepends=('bzr')
+conflicts=('cuttlefish')
 install="${pkgname}.install"
-source=("${_pkgname}"::"bzr+https://code.launchpad.net/~noneed4anick/cuttlefish/trunk"
+source=("${pkgname}"::"bzr+https://code.launchpad.net/~noneed4anick/cuttlefish/trunk"
         "plugins-use-site-packages.patch"
         "desktop-autostart.patch"
-       )
-md5sums=('SKIP'
-         '7c631a9a83197b4d2ae5274d53b5ec73'
-         'b555d227e909a61788a4d2c8acd3120d')
-sha1sums=('SKIP'
-          '43cd8935b8db879fb383164358d0dcd1d59cfd69'
-          '3498c050110cb84fe36706c627ac232652afb4b3')
+        "remove-ubuntu_almost_fixed_height_mode.patch")
 sha256sums=('SKIP'
             'e7cf831a5083655a29a765626a765fe44069b05c31f5749ca76f6d9f22160480'
-            '26a91ab2ff6c21f8f3e8eb3474396ec8940313f158778b1fd8711f2643357a5d')
+            '26a91ab2ff6c21f8f3e8eb3474396ec8940313f158778b1fd8711f2643357a5d'
+            '30d17a770792016d07c9a695376bddca17c201143b2e2e04aa30f3b83d90905b')
 
 pkgver() {
-  cd "${_pkgname}"
+  cd "${pkgname}"
   bzr revno
 }
 
 prepare() {
-  cd "${_pkgname}"
+  cd "${pkgname}"
   patch -p1 -i "../plugins-use-site-packages.patch"
   patch -p1 -i "../desktop-autostart.patch"
+  patch -p1 -i "../remove-ubuntu_almost_fixed_height_mode.patch"
 }
 
 package() {
-  cd "${_pkgname}"
+  cd "${pkgname}"
   glib-compile-schemas "data/glib-2.0/schemas"
   GSETTINGS_SCHEMA_DIR="data/glib-2.0/schemas" python2 setup.py install --root="${pkgdir}/" --optimize=1
 }
diff --git a/remove-ubuntu_almost_fixed_height_mode.patch b/remove-ubuntu_almost_fixed_height_mode.patch
new file mode 100644
index 000000000000..fddfc23028db
--- /dev/null
+++ b/remove-ubuntu_almost_fixed_height_mode.patch
@@ -0,0 +1,11 @@
+diff -Naur cuttlefish.orig/data/ui/CuttlefishWindow.ui cuttlefish/data/ui/CuttlefishWindow.ui
+--- cuttlefish.orig/data/ui/CuttlefishWindow.ui	2012-07-30 01:59:11.000000000 +0200
++++ cuttlefish/data/ui/CuttlefishWindow.ui	2015-06-13 20:54:31.750518028 +0200
+@@ -606,7 +606,6 @@
+                             <property name="can_focus">True</property>
+                             <property name="headers_clickable">False</property>
+                             <property name="search_column">0</property>
+-                            <property name="ubuntu_almost_fixed_height_mode">True</property>
+                             <signal name="cursor-changed" handler="on_tvActions_cursor_changed" swapped="no"/>
+                             <child internal-child="selection">
+                               <object class="GtkTreeSelection" id="treeview-selection1"/>