Merge lp:~andreserl/maas/packaging_bzr1908_2 into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

debian/patches/*: Refreshed.

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-07 16:17:11 +0000
+++ debian/changelog	2014-02-07 16:25:31 +0000
@@ -11,6 +11,7 @@
   * Get rid of dfsg on the versioning as we no longer strip any code from
     the orig tarball.
     - debian/rules: Do not strip any files out of the tarball.
+  * debian/patches/*: Refreshed.
 
  -- Andres Rodriguez <[e-mail]>  Fri, 31 Jan 2014 09:38:51 -0500
 

=== modified file 'debian/patches/01-fix-database-settings.patch'
--- debian/patches/01-fix-database-settings.patch	2012-06-29 19:46:35 +0000
+++ debian/patches/01-fix-database-settings.patch	2014-02-07 16:25:31 +0000
@@ -1,7 +1,5 @@
-Index: maas-0.1+bzr702+dfsg.orig/contrib/maas_local_settings.py
-===================================================================
---- maas-0.1+bzr702+dfsg.orig.orig/contrib/maas_local_settings.py	2012-06-29 12:03:20.000000000 -0400
-+++ maas-0.1+bzr702+dfsg.orig/contrib/maas_local_settings.py	2012-06-29 12:17:00.733389757 -0400
+--- maas-1.5+bzr1908.orig.orig/contrib/maas_local_settings.py	2014-02-07 11:22:59.330556956 -0500
++++ maas-1.5+bzr1908.orig/contrib/maas_local_settings.py	2014-02-07 11:22:59.326556956 -0500
 @@ -7,7 +7,7 @@
  DEFAULT_MAAS_URL = "http://maas.internal.example.com/"
  
@@ -11,7 +9,7 @@
  
  # Prefix to use for MAAS's urls.
  # If FORCE_SCRIPT_NAME is None (the default), all the urls will start with
-@@ -68,9 +68,9 @@
+@@ -81,9 +81,9 @@
      'default': {
          # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' etc.
          'ENGINE': 'django.db.backends.postgresql_psycopg2',

=== modified file 'debian/patches/02-pserv-config.patch'
--- debian/patches/02-pserv-config.patch	2013-05-31 17:05:48 +0000
+++ debian/patches/02-pserv-config.patch	2014-02-07 16:25:31 +0000
@@ -3,10 +3,8 @@
  include port, logfile, oops directory, cobbler url and username
 Author: Andres Rodriguez <[e-mail]>
 
-Index: maas-0.1+bzr917+dfsg.orig/etc/maas/pserv.yaml
-===================================================================
---- maas-0.1+bzr917+dfsg.orig.orig/etc/maas/pserv.yaml	2012-08-23 16:22:46.483599114 -0400
-+++ maas-0.1+bzr917+dfsg.orig/etc/maas/pserv.yaml	2012-08-23 16:22:56.579599373 -0400
+--- maas-1.5+bzr1908.orig.orig/etc/maas/pserv.yaml	2014-02-07 11:21:21.686557887 -0500
++++ maas-1.5+bzr1908.orig/etc/maas/pserv.yaml	2014-02-07 11:21:21.678557887 -0500
 @@ -6,7 +6,7 @@
  ## running server.
  #
@@ -34,5 +32,5 @@
    # generator: http://localhost/MAAS/api/1.0/pxeconfig/
 -  generator: http://localhost:5243/api/1.0/pxeconfig/
  
- ## Boot configuration.
- boot:
+ ## RPC configuration, for region<-->cluster communications.
+ #

=== modified file 'debian/patches/03-txlongpoll-config.patch'
--- debian/patches/03-txlongpoll-config.patch	2012-04-23 18:15:07 +0000
+++ debian/patches/03-txlongpoll-config.patch	2014-02-07 16:25:31 +0000
@@ -3,10 +3,8 @@
  include  oops directory, Message broker configuration, logfile.
 Author: Andres Rodriguez <[e-mail]>
 
-Index: maas-0.1+bzr398+dfsg.orig/etc/txlongpoll.yaml
-===================================================================
---- maas-0.1+bzr398+dfsg.orig.orig/etc/txlongpoll.yaml	2012-04-03 09:49:48.109427702 -0400
-+++ maas-0.1+bzr398+dfsg.orig/etc/txlongpoll.yaml	2012-04-03 09:53:07.276282800 -0400
+--- maas-1.5+bzr1908.orig.orig/etc/txlongpoll.yaml	2014-02-07 11:21:12.578557974 -0500
++++ maas-1.5+bzr1908.orig/etc/txlongpoll.yaml	2014-02-07 11:21:12.578557974 -0500
 @@ -17,7 +17,7 @@
    # or directories other than what the oops machinery creates there.
    #