summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2007-07-01 23:01:04 -0700
committerEric Sandall2007-07-01 23:01:04 -0700
commit61a15161d269436427a9490a8b3a616a9bece9c1 (patch)
tree7a1516d26912a60410740d39f5965d26d20c9287
parent446c8642eff2ec25ff0b5680a117ce3b9298cf15 (diff)
parent93b4ba6eb25dfb444d68f3e4c4e76537d68000c7 (diff)
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
-rwxr-xr-xgnome2-apps/epiphany-extensions/DETAILS2
-rw-r--r--gnome2-apps/epiphany-extensions/HISTORY3
-rw-r--r--gnome2-apps/epiphany-extensions/epiphany-extensions-2.18.2.tar.bz2.sigbin536 -> 0 bytes
-rw-r--r--gnome2-apps/epiphany-extensions/epiphany-extensions-2.18.3.tar.bz2.sigbin0 -> 536 bytes
-rwxr-xr-xgnome2-apps/epiphany/DETAILS2
-rw-r--r--gnome2-apps/epiphany/HISTORY3
-rw-r--r--gnome2-apps/epiphany/epiphany-2.18.2.tar.bz2.sigbin536 -> 0 bytes
-rw-r--r--gnome2-apps/epiphany/epiphany-2.18.3.tar.bz2.sigbin0 -> 536 bytes
-rwxr-xr-xgnome2-libs/gnome-backgrounds/DETAILS2
-rw-r--r--gnome2-libs/gnome-backgrounds/HISTORY3
-rw-r--r--gnome2-libs/gnome-backgrounds/gnome-backgrounds-2.16.2.tar.bz2.sigbin536 -> 0 bytes
-rw-r--r--gnome2-libs/gnome-backgrounds/gnome-backgrounds-2.18.3.tar.bz2.sigbin0 -> 536 bytes
-rw-r--r--kernels/linux/HISTORY4
-rwxr-xr-xkernels/linux/info/patches/PRE_2_6/patch-2.6.22-rc77
-rw-r--r--kernels/linux/latest.defaults2
15 files changed, 24 insertions, 4 deletions
diff --git a/gnome2-apps/epiphany-extensions/DETAILS b/gnome2-apps/epiphany-extensions/DETAILS
index d3ab7a3ced..5f6fac5264 100755
--- a/gnome2-apps/epiphany-extensions/DETAILS
+++ b/gnome2-apps/epiphany-extensions/DETAILS
@@ -1,5 +1,5 @@
SPELL=epiphany-extensions
- VERSION=2.18.2
+ VERSION=2.18.3
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/epiphany-extensions/HISTORY b/gnome2-apps/epiphany-extensions/HISTORY
index b550b822c2..6d8454fc0a 100644
--- a/gnome2-apps/epiphany-extensions/HISTORY
+++ b/gnome2-apps/epiphany-extensions/HISTORY
@@ -1,3 +1,6 @@
+2007-07-01 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 2.18.3
+
2007-05-28 Robin Cook <rcook@wyrms.net>
* DETAILS: updated VERSION to 2.18.2
diff --git a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.18.2.tar.bz2.sig b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.18.2.tar.bz2.sig
deleted file mode 100644
index 558197ebd7..0000000000
--- a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.18.2.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.18.3.tar.bz2.sig b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.18.3.tar.bz2.sig
new file mode 100644
index 0000000000..e4d65eb151
--- /dev/null
+++ b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.18.3.tar.bz2.sig
Binary files differ
diff --git a/gnome2-apps/epiphany/DETAILS b/gnome2-apps/epiphany/DETAILS
index ed030bc943..e40786b347 100755
--- a/gnome2-apps/epiphany/DETAILS
+++ b/gnome2-apps/epiphany/DETAILS
@@ -1,5 +1,5 @@
SPELL=epiphany
- VERSION=2.18.2
+ VERSION=2.18.3
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index c429d1c6f6..24cf3d084d 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,6 @@
+2007-07-01 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 2.18.3
+
2007-05-28 Robin Cook <rcook@wyrms.net>
* DETAILS: updated VERSION to 2.18.2
diff --git a/gnome2-apps/epiphany/epiphany-2.18.2.tar.bz2.sig b/gnome2-apps/epiphany/epiphany-2.18.2.tar.bz2.sig
deleted file mode 100644
index 09d454234e..0000000000
--- a/gnome2-apps/epiphany/epiphany-2.18.2.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-apps/epiphany/epiphany-2.18.3.tar.bz2.sig b/gnome2-apps/epiphany/epiphany-2.18.3.tar.bz2.sig
new file mode 100644
index 0000000000..e6b208cfeb
--- /dev/null
+++ b/gnome2-apps/epiphany/epiphany-2.18.3.tar.bz2.sig
Binary files differ
diff --git a/gnome2-libs/gnome-backgrounds/DETAILS b/gnome2-libs/gnome-backgrounds/DETAILS
index 054388b92b..de2340041b 100755
--- a/gnome2-libs/gnome-backgrounds/DETAILS
+++ b/gnome2-libs/gnome-backgrounds/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-backgrounds
- VERSION=2.16.2
+ VERSION=2.18.3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-backgrounds/HISTORY b/gnome2-libs/gnome-backgrounds/HISTORY
index 2ba62bd32c..24fadb8cf4 100644
--- a/gnome2-libs/gnome-backgrounds/HISTORY
+++ b/gnome2-libs/gnome-backgrounds/HISTORY
@@ -1,3 +1,6 @@
+2007-07-01 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 2.18.3
+
2007-02-27 Robin Cook <rcook@wyrms.net>
* DETAILS: updated VERSION to 2.16.2
diff --git a/gnome2-libs/gnome-backgrounds/gnome-backgrounds-2.16.2.tar.bz2.sig b/gnome2-libs/gnome-backgrounds/gnome-backgrounds-2.16.2.tar.bz2.sig
deleted file mode 100644
index 8c93dab3ca..0000000000
--- a/gnome2-libs/gnome-backgrounds/gnome-backgrounds-2.16.2.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/gnome-backgrounds/gnome-backgrounds-2.18.3.tar.bz2.sig b/gnome2-libs/gnome-backgrounds/gnome-backgrounds-2.18.3.tar.bz2.sig
new file mode 100644
index 0000000000..74d8099352
--- /dev/null
+++ b/gnome2-libs/gnome-backgrounds/gnome-backgrounds-2.18.3.tar.bz2.sig
Binary files differ
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 1aa3d4edf8..497a3341ca 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2007-07-01 David Brown <dmlb2000@gmail.com>
+ * latest.defaults: updated latest to patch-2.6.22-rc7
+ * info/patches/PRE_2_6/patch-2.6.22-rc7: added
+
2007-06-28 David Brown <dmlb2000@gmail.com>
* latest.defaults: updated latest to 2.6.22-rc6-mm1
* info/patches/mm_patches/2.6.22-rc6-mm1: added
diff --git a/kernels/linux/info/patches/PRE_2_6/patch-2.6.22-rc7 b/kernels/linux/info/patches/PRE_2_6/patch-2.6.22-rc7
new file mode 100755
index 0000000000..c8704d27d7
--- /dev/null
+++ b/kernels/linux/info/patches/PRE_2_6/patch-2.6.22-rc7
@@ -0,0 +1,7 @@
+patchversion="2.6.22-rc7"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/testing/${source}"
+appliedkernels="2.6.21"
+gpg_source_url="${source_url}.sign"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+md5sum=""
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index aa4267cc76..3e7d281446 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,5 +1,5 @@
LATEST_2_6=2.6.21
-LATEST_PRE_2_6=patch-2.6.22-rc6
+LATEST_PRE_2_6=patch-2.6.22-rc7
LATEST_maintenance_patches=patch-2.6.21.5
LATEST_git_patches=patch-2.6.12-rc5-git8
LATEST_2_4=2.4.32