[systemd-commits] 2 commits - Makefile.am src/bootchart

[Zbigniew Jędrzejewski-Szmek]

 Makefile.am               |    1 -
 src/bootchart/bootchart.c |    2 +-
 src/bootchart/bootchart.h |    2 +-
 src/bootchart/store.c     |    2 +-
 src/bootchart/store.h     |    2 +-
 src/bootchart/svg.c       |    2 +-
 src/bootchart/svg.h       |    2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 622004565eca385c685086cd478aa79afe73b785
Author: Ross Burton <ross.burton at intel.com>
Date:   Tue Jun 11 17:16:37 2013 +0100

    build-sys: don't install quotaon.service twice
    
    quotaon.service is already installed through dist_systemunit_DATA, so it doesn't
    need to be added to nodist_systemunit_DATA.  Installing the same file twice
    results in a race condition where the install process can fail.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=65659
    
    [zj: actually remove quotaon.service from the other list.]

diff --git a/Makefile.am b/Makefile.am
index 28ae7ed..3219762 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -389,7 +389,6 @@ dist_systemunit_DATA = \
 	units/sound.target \
 	units/bluetooth.target \
 	units/smartcard.target \
-	units/quotaon.service \
 	units/systemd-ask-password-wall.path \
 	units/systemd-ask-password-console.path \
 	units/systemd-udevd-control.socket \

commit 3c527fd195ed9acddedb6dd6f50be6bffc94e9ae
Author: Jason St. John <jstjohn at purdue.edu>
Date:   Tue Jun 11 18:26:03 2013 +0200

    bootchart: fix typos in copyright notices
    
    "Corporation" was misspelled as "Coproration"

diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index 8be5a27..14ccd3e 100644
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -3,7 +3,7 @@
 /***
   This file is part of systemd.
 
-  Copyright (C) 2009-2013 Intel Coproration
+  Copyright (C) 2009-2013 Intel Corporation
 
   Authors:
     Auke Kok <auke-jan.h.kok at intel.com>
diff --git a/src/bootchart/bootchart.h b/src/bootchart/bootchart.h
index d027342..968c38d 100644
--- a/src/bootchart/bootchart.h
+++ b/src/bootchart/bootchart.h
@@ -5,7 +5,7 @@
 /***
   This file is part of systemd.
 
-  Copyright (C) 2009-2013 Intel Coproration
+  Copyright (C) 2009-2013 Intel Corporation
 
   Authors:
     Auke Kok <auke-jan.h.kok at intel.com>
diff --git a/src/bootchart/store.c b/src/bootchart/store.c
index b2afb8d..f8c97c2 100755
--- a/src/bootchart/store.c
+++ b/src/bootchart/store.c
@@ -3,7 +3,7 @@
 /***
   This file is part of systemd.
 
-  Copyright (C) 2009-2013 Intel Coproration
+  Copyright (C) 2009-2013 Intel Corporation
 
   Authors:
     Auke Kok <auke-jan.h.kok at intel.com>
diff --git a/src/bootchart/store.h b/src/bootchart/store.h
index 7c8ad28..f211b6f 100644
--- a/src/bootchart/store.h
+++ b/src/bootchart/store.h
@@ -5,7 +5,7 @@
 /***
   This file is part of systemd.
 
-  Copyright (C) 2009-2013 Intel Coproration
+  Copyright (C) 2009-2013 Intel Corporation
 
   Authors:
     Auke Kok <auke-jan.h.kok at intel.com>
diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c
index 859cf81..5eee2d1 100644
--- a/src/bootchart/svg.c
+++ b/src/bootchart/svg.c
@@ -3,7 +3,7 @@
 /***
   This file is part of systemd.
 
-  Copyright (C) 2009-2013 Intel Coproration
+  Copyright (C) 2009-2013 Intel Corporation
 
   Authors:
     Auke Kok <auke-jan.h.kok at intel.com>
diff --git a/src/bootchart/svg.h b/src/bootchart/svg.h
index e7369f5..df3a7bf 100644
--- a/src/bootchart/svg.h
+++ b/src/bootchart/svg.h
@@ -5,7 +5,7 @@
 /***
   This file is part of systemd.
 
-  Copyright (C) 2009-2013 Intel Coproration
+  Copyright (C) 2009-2013 Intel Corporation
 
   Authors:
     Auke Kok <auke-jan.h.kok at intel.com>