From cc8d829d9b50ba372a5bf1d028d9a12792b1613c Mon Sep 17 00:00:00 2001
From: NiR- <stratege3@gmail.com>
Date: Mon, 9 Jun 2014 18:12:36 +0200
Subject: [PATCH 1/2] Removing lxc daily ppa from travis build for ensuring
 that the ubuntu package is used.

---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0cd65ed..fa64958 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,12 +5,11 @@ rvm:
   - 2.1.0
 branches:
   only:
-    - master
+    - 1.1.x
 before_install:
   - sudo apt-get update -y
   - sudo apt-get install -y python-software-properties
-  - sudo add-apt-repository -y ppa:ubuntu-lxc/daily
   - sudo apt-get update -y
-  - sudo apt-get install -y liblxc0 lxc lxc-dbg lxc-dev lxc-templates lxc-tests lxctl python3-lxc
+  - sudo apt-get install -y liblxc0
 script:
   - bundle exec rake clean package

From 89082e1db11a807d8ee5a0af56c136d8b380ee8c Mon Sep 17 00:00:00 2001
From: NiR- <stratege3@gmail.com>
Date: Mon, 9 Jun 2014 22:34:58 +0200
Subject: [PATCH 2/2] Adding rdoc dependencies for ruby 1.8

---
 ruby-lxc.gemspec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ruby-lxc.gemspec b/ruby-lxc.gemspec
index 2802efa..4df7fcb 100644
--- a/ruby-lxc.gemspec
+++ b/ruby-lxc.gemspec
@@ -13,6 +13,8 @@ Gem::Specification.new do |s|
   s.extensions = 'ext/lxc/extconf.rb'
   s.has_rdoc   = true
 
+  s.add_development_dependency "rdoc"
+  s.add_development_dependency "rdoc-data"
   s.add_development_dependency "rake-compiler"
 
   s.homepage    = 'https://github.com/lxc/ruby-lxc'