summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-01-24 17:02:51 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-01-24 17:02:51 +0000
commitf68ff6a19d85b3f7dd8f2cfd72840e340fa0b328 (patch)
treea0f7c7179b4b75f91ecefbcf6273d0078a5e378a /contrib
parentca2dd4565504ad3239ca73c5cf23c234d57a71b8 (diff)
parent62d4698b651ec93b84dcb2f04fffdbd2b420f103 (diff)
merge of 'bc23cf53ce799d3e52d33fa659150040636e3134'
and 'c0a3e474625678b13727e12b833983f6e3389de1'
Diffstat (limited to 'contrib')
-rw-r--r--contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog2
-rw-r--r--contrib/distro-packages/debian/openembedded-essential-1.4/ubuntu.patch22
2 files changed, 23 insertions, 1 deletions
diff --git a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog b/contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog
index 74193e30fd..8485f3e720 100644
--- a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog
+++ b/contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog
@@ -3,7 +3,7 @@ openembedded-essential (1.4) unstable; urgency=low
* remove gfortran from dependency after a5c7b007eaa675cc904f5285291d2f8a597efc84 caused controversy.
Ultimately it was decided that OE should not depend on gfortran and that another solution ought
to be found. The gfortran check in sanity.bbclass was dropped in 63c7ad87655c2781ad8b9c81af430596f48a24a6
-* add bc and python-pysqlite2
+ * add bc and python-pysqlite2 for rpm
-- Rolf Leggewie <oe-devel@rolf.leggewie.biz> Mon, 19 Jan 2008 14:25:00 +0100
diff --git a/contrib/distro-packages/debian/openembedded-essential-1.4/ubuntu.patch b/contrib/distro-packages/debian/openembedded-essential-1.4/ubuntu.patch
new file mode 100644
index 0000000000..80863d59fe
--- /dev/null
+++ b/contrib/distro-packages/debian/openembedded-essential-1.4/ubuntu.patch
@@ -0,0 +1,22 @@
+#
+# old_revision [63896b37ec0e055133c2e295f7c89e4677091511]
+#
+# patch "contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog"
+# from [b1e7c5d0ed3dddbab736f23b57df2386b6937e4d]
+# to [bb02f8caa6f5eaa903b4d65150392583072c7bea]
+#
+============================================================
+--- contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog
+b1e7c5d0ed3dddbab736f23b57df2386b6937e4d
++++ contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog
+bb02f8caa6f5eaa903b4d65150392583072c7bea
+@@ -1,3 +1,9 @@
++openembedded-essential (1.4ubuntu1) gutsy; urgency=low
++
++ * prepare ubuntu package
++
++ -- Rolf Leggewie <oe-devel@rolf.leggewie.biz> Thu, 24 Jan 2008 13:49:26 +0100
++
+ openembedded-essential (1.4) unstable; urgency=low
+
+ * remove gfortran from dependency after a5c7b007eaa675cc904f5285291d2f8a597efc84 caused controversy.