From 8efd01140f48bf8e30fdac05d980b523d150c85f Mon Sep 17 00:00:00 2001
From: Vitja Makarov <vitja.makarov@gmail.com>
Date: Sat, 8 Jan 2011 08:41:10 +0300
Subject: [PATCH] Update stuff

---
 Makefile                | 8 +++++++-
 README                  | 5 -----
 bzr/authentication.conf | 4 ++++
 bzr/bazaar.conf         | 2 ++
 bzr/ignore              | 8 ++++++++
 vim/vimrc               | 2 +-
 6 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 bzr/authentication.conf
 create mode 100644 bzr/bazaar.conf
 create mode 100644 bzr/ignore

diff --git a/Makefile b/Makefile
index e3abd5d..a09cebb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GCONFTOOL = gconftool-2
 
-install: install-git install-hg install-emacs install-vim install-gconf
+install: install-git install-hg install-bzr install-emacs install-vim install-gconf
 
 install-git:
 	install -m 0644 git/gitconfig ~/.gitconfig
@@ -9,6 +9,12 @@ install-git:
 install-hg:
 	install -m 0644 hgrc ~/.hgrc
 
+install-bzr:
+	install -d ~/.bazaar
+	for i in authentication.conf bazaar.conf ignore; do \
+	    install -m 0644 bzr/$$i ~/.bazaar/;                 \
+	done;
+
 install-emacs:
 	install -m 0644 emacs/emacs.el ~/.emacs
 
diff --git a/README b/README
index d979067..f2e5312 100644
--- a/README
+++ b/README
@@ -1,7 +1,2 @@
 This is my public rc-files.
 Feel free to examine and use it.
-
-vim requires:
- * ropemode
- * ropevim
-
diff --git a/bzr/authentication.conf b/bzr/authentication.conf
new file mode 100644
index 0000000..4b149f7
--- /dev/null
+++ b/bzr/authentication.conf
@@ -0,0 +1,4 @@
+[Launchpad]
+host = .launchpad.net
+scheme = ssh
+user = vitja-makarov
diff --git a/bzr/bazaar.conf b/bzr/bazaar.conf
new file mode 100644
index 0000000..5aad659
--- /dev/null
+++ b/bzr/bazaar.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+launchpad_username = vitja-makarov
diff --git a/bzr/ignore b/bzr/ignore
new file mode 100644
index 0000000..a9081c2
--- /dev/null
+++ b/bzr/ignore
@@ -0,0 +1,8 @@
+*.a
+*.o
+*.py[co]
+*.so
+*.sw[nop]
+*~
+.#*
+[#]*#
diff --git a/vim/vimrc b/vim/vimrc
index 6c01cc7..c6d0ebc 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -16,7 +16,7 @@ filetype indent on
 
 set ttyfast
 
-set tabstop=4 shiftwidth=4 softtabstop=4 autoindent smartindent
+set tabstop=4 shiftwidth=4 softtabstop=4 autoindent smartindent expandtab
 
 " prefer unix over windows over mac formats
 set ffs=unix,dos,mac