[PATCH] UBUNTU: [Config] Changes to patch templates to separate upstream and sauce

[Amit Kucheria]

This change might force us to think about what patches ought to go upstream
and what won't be accepted

It also annotates all config changes with [Config]

Signed-off-by: Amit Kucheria <amit.kucheria at canonical.com>
---
 debian/commit-templates/config-updates |   13 +++++++++++++
 debian/commit-templates/patch          |   28 ----------------------------
 debian/commit-templates/sauce-patch    |    2 ++
 debian/commit-templates/update-configs |   10 ----------
 debian/commit-templates/upstream-patch |   28 ++++++++++++++++++++++++++++
 5 files changed, 43 insertions(+), 38 deletions(-)
 create mode 100644 debian/commit-templates/config-updates
 delete mode 100644 debian/commit-templates/patch
 delete mode 100644 debian/commit-templates/update-configs
 create mode 100644 debian/commit-templates/upstream-patch

diff --git a/debian/commit-templates/config-updates b/debian/commit-templates/config-updates
new file mode 100644
index 0000000..21c6187
--- /dev/null
+++ b/debian/commit-templates/config-updates
@@ -0,0 +1,13 @@
+#
+# This template is used for commit messages that don't need to
+# show up in debian/changelog. Administrative stuff like config
+# updates, ABI bumps, etc. Setting 'Ignore: yes' prevents
+# 'debian/rules insertchanges' from inserting this commit meesage
+# as a changelog entry.
+#
+# Please give a one-line description of the config change followed
+# by a detailed explanation if necessary
+
+UBUNTU: [Config] XXXX
+
+#Ignore: yes
diff --git a/debian/commit-templates/patch b/debian/commit-templates/patch
deleted file mode 100644
index 35e0492..0000000
--- a/debian/commit-templates/patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# Ubuntu commit template.
-#
-# NOTE: This gets reformatted for debian/changelog
-#
-# The initial UBUNTU is a flag that this is an Ubuntu commit. It will be
-# referenced to the Author in the debian/changelog entry.
-#
-# The text following is the short message that will be placed in the
-# changelog. Extra text on the following lines will be ignored, but left
-# in the git commit. Lines with # will be ignored in the commit.
-#
-# OriginalAuthor allows for alternate attribution.
-#
-# OriginalLocation allows for a URL or description of where the patch came
-# from.
-#
-# Bug is a reference to a Malone bug number. Be sure to include the '#' as
-# part of the bug number, e.g., 'Bug: #1'.
-#
-# Ignore: yes will keep this commit from showing up in the changelog.
-#
-UBUNTU: 
-
-# OriginalAuthor: 
-# OriginalLocation: 
-# Bug: #
-# Ignore: yes
-# Other text below here.
diff --git a/debian/commit-templates/sauce-patch b/debian/commit-templates/sauce-patch
index eb72a7e..88771f5 100644
--- a/debian/commit-templates/sauce-patch
+++ b/debian/commit-templates/sauce-patch
@@ -31,6 +31,8 @@
 #
 UBUNTU: SAUCE: 
 
+<Why is this patch not going upstream?>
+
 # OriginalAuthor: 
 # OriginalLocation: 
 # Bug: #
diff --git a/debian/commit-templates/update-configs b/debian/commit-templates/update-configs
deleted file mode 100644
index 9120256..0000000
--- a/debian/commit-templates/update-configs
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This template is used for commit messages that don't need to
-# show up in debian/changelog. Administrative stuff like config
-# updates, ABI bumps, etc. Setting 'Ignore: yes' prevents
-# 'debian/rules insertchanges' from inserting this commit meesage
-# as a changelog entry.
-#
-UBUNTU: Updating configs
-
-Ignore: yes
diff --git a/debian/commit-templates/upstream-patch b/debian/commit-templates/upstream-patch
new file mode 100644
index 0000000..c4798fe
--- /dev/null
+++ b/debian/commit-templates/upstream-patch
@@ -0,0 +1,28 @@
+# Ubuntu commit template.
+#
+# NOTE: This gets reformatted for debian/changelog
+#
+# The initial UBUNTU is a flag that this is an Ubuntu commit. It will be
+# referenced to the Author in the debian/changelog entry.
+#
+# The text following is the short message that will be placed in the
+# changelog. Extra text on the following lines will be ignored, but left
+# in the git commit. Lines with # will be ignored in the commit.
+#
+# OriginalAuthor allows for alternate attribution.
+#
+# OriginalLocation allows for a URL or description of where the patch came
+# from.
+#
+# Bug is a reference to a Malone bug number. Be sure to include the '#' as
+# part of the bug number, e.g., 'Bug: #1'.
+#
+# Ignore: yes will keep this commit from showing up in the changelog.
+#
+UBUNTU: [Upstream]
+
+# OriginalAuthor: 
+# OriginalLocation: 
+# Bug: #
+# Ignore: yes
+# Other text below here.
-- 
1.6.0.4