Merge lp:~isantop/system76-driver/horiz-scroll into lp:~system76-dev/system76-driver/3.1

[Ian Santopietro]

base_system.py - Remove horizontal scrolling from 13.04

[Ian Santopietro (isantop)]

looks good

review: Approve

[Ian Santopietro (isantop)]

review: Needs Fixing

[lp:~isantop/system76-driver/horiz-scroll]

58. By Ian Santopietro on 2013-04-24

Remove Inline Debian packaging to simplfy package creation.

[Ian Santopietro (isantop)]

review: Approve

=== modified file 'base_system.py'
--- base_system.py	2013-04-23 22:43:20 +0000
+++ base_system.py	2013-04-24 16:54:26 +0000
@@ -166,7 +166,6 @@
             sources.add()
             os.system('sudo apt-get --assume-yes install system76-driver')
             for user in os.listdir('/home'):
-                os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad horiz-scroll-enabled "true"\'' % user)
                 os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad scroll-method "two-finger-scrolling"\'' % user)
             os.system('sudo cp /opt/system76/system76-driver/src/system76-touchpad.gschema.override /usr/share/glib-2.0/schemas/')
             os.system('sudo glib-compile-schemas /usr/share/glib-2.0/schemas')
@@ -193,7 +192,6 @@
             sources.add()
             os.system('sudo apt-get --assume-yes install system76-driver')
             for user in os.listdir('/home'):
-                os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad horiz-scroll-enabled "true"\'' % user)
                 os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad scroll-method "two-finger-scrolling"\'' % user)
             os.system('sudo cp /opt/system76/system76-driver/src/system76-touchpad.gschema.override /usr/share/glib-2.0/schemas/')
             os.system('sudo glib-compile-schemas /usr/share/glib-2.0/schemas')
@@ -767,7 +765,6 @@
             sources.add()
             os.system('sudo apt-get --assume-yes install system76-driver')
             for user in os.listdir('/home'):
-                os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad horiz-scroll-enabled "true"\'' % user)
                 os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad scroll-method "two-finger-scrolling"\'' % user)
             os.system('sudo cp /opt/system76/system76-driver/src/system76-touchpad.gschema.override /usr/share/glib-2.0/schemas/')
             os.system('sudo glib-compile-schemas /usr/share/glib-2.0/schemas')
@@ -794,7 +791,6 @@
             sources.add()
             os.system('sudo apt-get --assume-yes install system76-driver')
             for user in os.listdir('/home'):
-                os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad horiz-scroll-enabled "true"\'' % user)
                 os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad scroll-method "two-finger-scrolling"\'' % user)
             os.system('sudo cp /opt/system76/system76-driver/src/system76-touchpad.gschema.override /usr/share/glib-2.0/schemas/')
             os.system('sudo glib-compile-schemas /usr/share/glib-2.0/schemas')
@@ -821,7 +817,6 @@
             sources.add()
             os.system('sudo apt-get --assume-yes install system76-driver')
             for user in os.listdir('/home'):
-                os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad horiz-scroll-enabled "true"\'' % user)
                 os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad scroll-method "two-finger-scrolling"\'' % user)
             os.system('sudo cp /opt/system76/system76-driver/src/system76-touchpad.gschema.override /usr/share/glib-2.0/schemas/')
             os.system('sudo glib-compile-schemas /usr/share/glib-2.0/schemas')
@@ -1245,7 +1240,6 @@
             sources.add()
             os.system('sudo apt-get --assume-yes install system76-driver')
             for user in os.listdir('/home'):
-                os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad horiz-scroll-enabled "true"\'' % user)
                 os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad scroll-method "two-finger-scrolling"\'' % user)
             os.system('sudo cp /opt/system76/system76-driver/src/system76-touchpad.gschema.override /usr/share/glib-2.0/schemas/')
             os.system('sudo glib-compile-schemas /usr/share/glib-2.0/schemas')
@@ -1293,7 +1287,6 @@
             sources.add()
             os.system('sudo apt-get --assume-yes install system76-driver')
             for user in os.listdir('/home'):
-                os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad horiz-scroll-enabled "true"\'' % user)
                 os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad scroll-method "two-finger-scrolling"\'' % user)
             os.system('sudo cp /opt/system76/system76-driver/src/system76-touchpad.gschema.override /usr/share/glib-2.0/schemas/')
             os.system('sudo glib-compile-schemas /usr/share/glib-2.0/schemas')
@@ -1335,7 +1328,6 @@
             sources.add()
             os.system('sudo apt-get --assume-yes install system76-driver')
             for user in os.listdir('/home'):
-                os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad horiz-scroll-enabled "true"\'' % user)
                 os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad scroll-method "two-finger-scrolling"\'' % user)
             os.system('sudo cp /opt/system76/system76-driver/src/system76-touchpad.gschema.override /usr/share/glib-2.0/schemas/')
             os.system('sudo glib-compile-schemas /usr/share/glib-2.0/schemas')
@@ -1370,7 +1362,6 @@
             sources.add()
             os.system('sudo apt-get --assume-yes install system76-driver')
             for user in os.listdir('/home'):
-                os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad horiz-scroll-enabled "true"\'' % user)
                 os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad scroll-method "two-finger-scrolling"\'' % user)
             os.system('sudo cp /opt/system76/system76-driver/src/system76-touchpad.gschema.override /usr/share/glib-2.0/schemas/')
             os.system('sudo glib-compile-schemas /usr/share/glib-2.0/schemas')
@@ -1666,7 +1657,6 @@
             sources.add()
             os.system('sudo apt-get --assume-yes install system76-driver')
             for user in os.listdir('/home'):
-                os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad horiz-scroll-enabled "true"\'' % user)
                 os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad scroll-method "two-finger-scrolling"\'' % user)
             os.system('sudo cp /opt/system76/system76-driver/src/system76-touchpad.gschema.override /usr/share/glib-2.0/schemas/')
             os.system('sudo glib-compile-schemas /usr/share/glib-2.0/schemas')
@@ -1708,7 +1698,6 @@
             sources.add()
             os.system('sudo apt-get --assume-yes install system76-driver')
             for user in os.listdir('/home'):
-                os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad horiz-scroll-enabled "true"\'' % user)
                 os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad scroll-method "two-finger-scrolling"\'' % user)
             os.system('sudo cp /opt/system76/system76-driver/src/system76-touchpad.gschema.override /usr/share/glib-2.0/schemas/')
             os.system('sudo glib-compile-schemas /usr/share/glib-2.0/schemas')
@@ -1743,7 +1732,6 @@
             sources.add()
             os.system('sudo apt-get --assume-yes install system76-driver')
             for user in os.listdir('/home'):
-                os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad horiz-scroll-enabled "true"\'' % user)
                 os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad scroll-method "two-finger-scrolling"\'' % user)
             os.system('sudo cp /opt/system76/system76-driver/src/system76-touchpad.gschema.override /usr/share/glib-2.0/schemas/')
             os.system('sudo glib-compile-schemas /usr/share/glib-2.0/schemas')
@@ -2838,7 +2826,6 @@
             sources.add()
             os.system('sudo apt-get --assume-yes install system76-driver')
             for user in os.listdir('/home'):
-                os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad horiz-scroll-enabled "true"\'' % user)
                 os.system('su %s -c \'gsettings set org.gnome.settings-daemon.peripherals.touchpad scroll-method "two-finger-scrolling"\'' % user)
             os.system('sudo cp /opt/system76/system76-driver/src/system76-touchpad.gschema.override /usr/share/glib-2.0/schemas/')
             os.system('sudo glib-compile-schemas /usr/share/glib-2.0/schemas')

=== removed directory 'debian'
=== removed file 'debian/README.source'
--- debian/README.source	2013-04-23 23:22:15 +0000
+++ debian/README.source	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-system76-driver for Debian
---------------------------
-
-<this file describes information about the source package, see Debian policy
-manual section 4.14. You WILL either need to modify or delete this file>
-
-
-
-

=== removed file 'debian/changelog'
--- debian/changelog	2013-04-23 23:22:15 +0000
+++ debian/changelog	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-system76-driver (3.2.3) UNRELEASED; urgency=low
-
-  * Package build 3.2.3 build 5
-  * 
-  * 
-  * 
-  * 
-  * 
-  * 
-
- -- System76 Development <[e-mail]>  Mon, 12 Nov 2012 10:20:48 -0700

=== removed file 'debian/compat'
--- debian/compat	2013-04-23 23:22:15 +0000
+++ debian/compat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-8

=== removed file 'debian/control'
--- debian/control	2013-04-23 23:22:15 +0000
+++ debian/control	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-Source: system76-driver
-Section: utils
-Priority: extra
-Maintainer: System76, Inc. <[e-mail]>
-Build-Depends: debhelper (>= 8.0.0), python-support, python (>=2.7)
-Standards-Version: 3.9.2
-Homepage: http://www.system76.com/
-#Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/+branch/system76-driver/
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/system76-driver.git;a=summary
-
-Package: system76-driver
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python, python-gtk2, python-gnome2, python-glade2, librsvg2-common
-Description: Universal driver for System76 computers.
- System76 Driver provides drivers, restore, and regression support for System76 computers running Ubuntu.  Click the Device Menu (power icon at the top right of your screen) and choose System Settings. Click System76 Driver to install drivers or restore your computer.

=== removed file 'debian/copyright'
--- debian/copyright	2013-04-23 23:22:15 +0000
+++ debian/copyright	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: system76-driver
-Source: <bzr+ssh://bazaar.launchpad.net/+branch/system76-driver/>
-
-Files: *
-Copyright: 2006, 2007, 2008, 2009, 2010, 2011, 2012 Carl Richell
-           2006, 2007, 2008, 2009, 2010, 2011 Tom Aaron
-           2012 Ian Santopietro
-License: GPL-2.0+
-
-Files: debian/*
-Copyright: 2012 Ian Santopietro <[e-mail]>
-License: GPL-2.0+
-
-License: GPL-2.0+
- This package 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 package 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.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

=== removed file 'debian/files'
--- debian/files	2013-04-23 23:22:15 +0000
+++ debian/files	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-system76-driver_3.2.3_all.deb utils extra

=== removed directory 'debian/patches'
=== removed file 'debian/pyversions'
--- debian/pyversions	2013-04-23 23:22:15 +0000
+++ debian/pyversions	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2.7-

=== removed file 'debian/rules'
--- debian/rules	2013-04-23 23:22:15 +0000
+++ debian/rules	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
-	dh $@ 

=== removed directory 'debian/source'
=== removed file 'debian/source/format'
--- debian/source/format	2013-04-23 23:22:15 +0000
+++ debian/source/format	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-3.0 (quilt)

=== removed file 'debian/system76-driver.debhelper.log'
--- debian/system76-driver.debhelper.log	2013-04-23 23:22:15 +0000
+++ debian/system76-driver.debhelper.log	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-dh_auto_configure
-dh_auto_build
-dh_auto_test
-dh_prep
-dh_installdirs
-dh_auto_install
-dh_install
-dh_installdocs
-dh_installchangelogs
-dh_installexamples
-dh_installman
-dh_installcatalogs
-dh_installcron
-dh_installdebconf
-dh_installemacsen
-dh_installifupdown
-dh_installinfo
-dh_pysupport
-dh_installinit
-dh_installmenu
-dh_installmime
-dh_installmodules
-dh_installlogcheck
-dh_installlogrotate
-dh_installpam
-dh_installppp
-dh_installudev
-dh_installwm
-dh_installxfonts
-dh_installgsettings
-dh_bugfiles
-dh_ucf
-dh_lintian
-dh_gconf
-dh_icons
-dh_perl
-dh_usrlocal
-dh_link
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_builddeb

=== removed file 'debian/system76-driver.install'
--- debian/system76-driver.install	2013-04-23 23:22:15 +0000
+++ debian/system76-driver.install	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-76-panel-setup.entries				/opt/system76/system76-driver/src
-acpi								/opt/system76/system76-driver/src
-acpi.py								/opt/system76/system76-driver/src
-alsa-1.0.17.sh						/opt/system76/system76-driver/src
-AUTHORS								/opt/system76/system76-driver/src
-base_system.py						/opt/system76/system76-driver/src
-ChangeLog							/opt/system76/system76-driver/src
-configure.in						/opt/system76/system76-driver/src
-detect.py							/opt/system76/system76-driver/src
-driverscontrol.py					/opt/system76/system76-driver/src
-driversdescribe.py					/opt/system76/system76-driver/src
-drivers.py							/opt/system76/system76-driver/src
-fprint								/opt/system76/system76-driver/src
-fprint.py							/opt/system76/system76-driver/src
-hardy_led.py						/opt/system76/system76-driver/src
-hotkey.py							/opt/system76/system76-driver/src
-hotkeys								/opt/system76/system76-driver/src
-images								/opt/system76/system76-driver/src
-jme									/opt/system76/system76-driver/src
-jme-1.0.5.tar.gz					/opt/system76/system76-driver/src
-jme_kernel_latest.py				/opt/system76/system76-driver/src
-jme_kernel_update.py				/opt/system76/system76-driver/src
-lemu1uvc							/opt/system76/system76-driver/src
-LICENSE								/opt/system76/system76-driver/src
-Makefile.am							/opt/system76/system76-driver/src
-misc.py								/opt/system76/system76-driver/src
-model.py							/opt/system76/system76-driver/src
-nvidia-settings.desktop				/opt/system76/system76-driver/src
-po/*								/opt/system76/system76-driver/src/po
-README								/opt/system76/system76-driver/src
-restore.py							/opt/system76/system76-driver/src
-ricoh								/opt/system76/system76-driver/src
-ricoh_cr.py							/opt/system76/system76-driver/src
-rtl8187b							/opt/system76/system76-driver/src
-rtl8187b_kernel_update.py			/opt/system76/system76-driver/src
-sound.py							/opt/system76/system76-driver/src
-sources.list_dapper					/opt/system76/system76-driver/src
-sources.list_edgy					/opt/system76/system76-driver/src
-sources.list_feisty					/opt/system76/system76-driver/src
-sources.list_gutsy					/opt/system76/system76-driver/src
-sources.py							/opt/system76/system76-driver/src
-stamp-h.in							/opt/system76/system76-driver/src
-system76driver.glade				/opt/system76/system76-driver/src
-system76driver.gladep				/opt/system76/system76-driver/src
-system76Driver-gtk3.glade			/opt/system76/system76-driver/src
-System76Drivergtk3.py				/opt/system76/system76-driver/src
-System76Driver.py					/opt/system76/system76-driver/src
-system76-touchpad.gschema.override	/opt/system76/system76-driver/src
-system.py							/opt/system76/system76-driver/src
-tifm_modules.sh						/opt/system76/system76-driver/src
-ubuntuversion.py					/opt/system76/system76-driver/src
-usplash.py							/opt/system76/system76-driver/src
-usr/*								/usr
-uvc									/opt/system76/system76-driver/src
-uvcinstall							/opt/system76/system76-driver/src
-uvc_kernel_update.py				/opt/system76/system76-driver/src
-uvc.py								/opt/system76/system76-driver/src
-xorg.conf_intel_desktop				/opt/system76/system76-driver/src
-xorg.conf_intel_new_notebook		/opt/system76/system76-driver/src
-xorg.conf_intel_notebook			/opt/system76/system76-driver/src
-xorg.conf_nvidia_desktop			/opt/system76/system76-driver/src
-xorg.conf_nvidia_new				/opt/system76/system76-driver/src
-xorg.conf_nvidia_notebook			/opt/system76/system76-driver/src
-xorg.conf_via_desktop				/opt/system76/system76-driver/src

=== removed file 'debian/system76-driver.substvars'
--- debian/system76-driver.substvars	2013-04-23 23:22:15 +0000
+++ debian/system76-driver.substvars	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-python:Depends=python (>= 2.7)
-misc:Depends=