diff -u upstart-1.6.1/debian/changelog upstart-1.6.1/debian/changelog
--- upstart-1.6.1/debian/changelog
+++ upstart-1.6.1/debian/changelog
@@ -1,3 +1,9 @@
+upstart (1.6.1-1ubuntu3) raring; urgency=low
+
+  * Remove some malloc function attributes.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 19 Feb 2013 11:36:37 +0100
+
 upstart (1.6.1-1ubuntu2) raring; urgency=low
 
   [ Stéphane Graber ]
diff -u upstart-1.6.1/init/job_class.h upstart-1.6.1/init/job_class.h
--- upstart-1.6.1/init/job_class.h
+++ upstart-1.6.1/init/job_class.h
@@ -226,7 +226,7 @@
 JobClass  * job_class_new                  (const void *parent,
 					    const char *name,
 					    Session *session)
-	__attribute__ ((warn_unused_result, malloc));
+	__attribute__ ((warn_unused_result));
 
 int         job_class_consider             (JobClass *class);
 int         job_class_reconsider           (JobClass *class);
@@ -240,7 +240,7 @@
 
 char      **job_class_environment          (const void *parent,
 					    JobClass *class, size_t *len)
-	__attribute__ ((warn_unused_result, malloc));
+	__attribute__ ((warn_unused_result));
 
 
 int         job_class_get_instance         (JobClass *class,
@@ -321,13 +321,13 @@
 	__attribute__ ((warn_unused_result));
 
 json_object *job_class_serialise (const JobClass *class)
-	__attribute__ ((warn_unused_result, malloc));
+	__attribute__ ((warn_unused_result));
 
 JobClass *job_class_deserialise (json_object *json)
 	__attribute__ ((malloc, warn_unused_result));
 
 json_object * job_class_serialise_all (void)
-	__attribute__ ((warn_unused_result, malloc));
+	__attribute__ ((warn_unused_result));
 
 int job_class_deserialise_all (json_object *json)
 	__attribute__ ((warn_unused_result));
only in patch2:
unchanged:
--- upstart-1.6.1.orig/init/event_operator.h
+++ upstart-1.6.1/init/event_operator.h
@@ -78,10 +78,10 @@
 EventOperator *event_operator_new         (const void *parent,
 					   EventOperatorType type,
 					   const char *name, char **env)
-	__attribute__ ((warn_unused_result, malloc));
+	__attribute__ ((warn_unused_result));
 EventOperator *event_operator_copy        (const void *parent,
 					   const EventOperator *old_oper)
-	__attribute__ ((warn_unused_result, malloc));
+	__attribute__ ((warn_unused_result));
 
 int            event_operator_destroy     (EventOperator *oper);
 
@@ -109,7 +109,7 @@
 void           event_operator_reset       (EventOperator *root);
 
 char *event_operator_collapse (EventOperator *condition)
-	__attribute__ ((malloc, warn_unused_result));
+	__attribute__ ((warn_unused_result));
 
 NIH_END_EXTERN
 
only in patch2:
unchanged:
--- upstart-1.6.1.orig/init/event.h
+++ upstart-1.6.1/init/event.h
@@ -89,8 +89,7 @@
 
 void   event_init    (void);
 
-Event *event_new     (const void *parent, const char *name, char **env)
-	__attribute__ ((malloc));
+Event *event_new     (const void *parent, const char *name, char **env);
 
 void   event_block   (Event *event);
 void   event_unblock (Event *event);
@@ -98,13 +97,13 @@
 void   event_poll    (void);
 
 json_object *event_serialise (const Event *event)
-	__attribute__ ((malloc, warn_unused_result));
+	__attribute__ ((warn_unused_result));
 
 Event *event_deserialise (json_object *json)
 	__attribute__ ((malloc, warn_unused_result));
 
 json_object  * event_serialise_all (void)
-	__attribute__ ((malloc, warn_unused_result));
+	__attribute__ ((warn_unused_result));
 
 int            event_deserialise_all (json_object *json)
 	__attribute__ ((warn_unused_result));
only in patch2:
unchanged:
--- upstart-1.6.1.orig/init/blocked.h
+++ upstart-1.6.1/init/blocked.h
@@ -77,7 +77,7 @@
 NIH_BEGIN_EXTERN
 
 Blocked *blocked_new (const void *parent, BlockedType type, void *data)
-	__attribute__ ((warn_unused_result, malloc));
+	__attribute__ ((warn_unused_result));
 
 const char *
 blocked_type_enum_to_str (BlockedType type)
only in patch2:
unchanged:
--- upstart-1.6.1.orig/init/conf.h
+++ upstart-1.6.1/init/conf.h
@@ -115,9 +115,9 @@
 
 ConfSource *conf_source_new    (const void *parent, const char *path,
 				ConfSourceType type)
-	__attribute__ ((warn_unused_result, malloc));
+	__attribute__ ((warn_unused_result));
 ConfFile *  conf_file_new      (ConfSource *source, const char *path)
-	__attribute__ ((warn_unused_result, malloc));
+	__attribute__ ((warn_unused_result));
 
 void        conf_reload        (void);
 int         conf_source_reload (ConfSource *source)
only in patch2:
unchanged:
--- upstart-1.6.1.orig/init/session.h
+++ upstart-1.6.1/init/session.h
@@ -82,7 +82,7 @@
 void           session_init        (void);
 
 Session      * session_new         (const void *parent, const char *chroot, uid_t user)
-	__attribute__ ((malloc, warn_unused_result));
+	__attribute__ ((warn_unused_result));
 
 Session      * session_from_dbus   (const void *parent, NihDBusMessage *message);
 
only in patch2:
unchanged:
--- upstart-1.6.1.orig/init/job.h
+++ upstart-1.6.1/init/job.h
@@ -165,7 +165,7 @@
 NIH_BEGIN_EXTERN
 
 Job *       job_new             (JobClass *class, const char *name)
-	__attribute__ ((warn_unused_result, malloc));
+	__attribute__ ((warn_unused_result));
 void        job_register        (Job *job, DBusConnection *conn, int signal);
 
 void        job_change_goal     (Job *job, JobGoal goal);
@@ -176,8 +176,7 @@
 void        job_failed          (Job *job, ProcessType process, int status);
 void        job_finished        (Job *job, int failed);
 
-Event      *job_emit_event      (Job *job)
-	__attribute__ ((malloc));
+Event      *job_emit_event      (Job *job);
 
 
 const char *job_name            (Job *job);
@@ -215,7 +214,7 @@
 Job *job_deserialise (JobClass *parent, json_object *json);
 
 json_object *job_serialise_all (const NihHash *jobs)
-	__attribute__ ((malloc, warn_unused_result));
+	__attribute__ ((warn_unused_result));
 
 int         job_deserialise_all (JobClass *parent, json_object *json)
 	__attribute__ ((warn_unused_result));