sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Sukneet Basuta (38f6e378733d0194aa99f210dac06dd7e9678390)

From: Sukneet Basuta <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (38f6e378733d0194aa99f210dac06dd7e9678390)
Date: Mon, 14 Nov 2011 22:29:42 -0600

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

dev/null |binary
gnome2-apps/file-roller/CONFLICTS | 1 -
gnome2-apps/file-roller/DETAILS | 2 +-
gnome2-apps/file-roller/HISTORY | 4 ++++
gnome2-apps/file-roller/file-roller-3.2.0.tar.bz2.sig | 0
gnome2-apps/file-roller/file-roller-3.2.2.tar.bz2.sig |binary
6 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 38f6e378733d0194aa99f210dac06dd7e9678390
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

file-roller: => 3.2.2
removed CONFLICTS, file-roller2 is not a spell, so it cannot conflict
with it

diff --git a/gnome2-apps/file-roller/CONFLICTS
b/gnome2-apps/file-roller/CONFLICTS
deleted file mode 100755
index 7df4651..0000000
--- a/gnome2-apps/file-roller/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts file-roller2 y
diff --git a/gnome2-apps/file-roller/DETAILS b/gnome2-apps/file-roller/DETAILS
index 0c28c92..08312a4 100755
--- a/gnome2-apps/file-roller/DETAILS
+++ b/gnome2-apps/file-roller/DETAILS
@@ -1,5 +1,5 @@
SPELL=file-roller
- VERSION=3.2.0
+ VERSION=3.2.2
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/file-roller/HISTORY b/gnome2-apps/file-roller/HISTORY
index 3105c7a..2eeec3e 100644
--- a/gnome2-apps/file-roller/HISTORY
+++ b/gnome2-apps/file-roller/HISTORY
@@ -1,3 +1,7 @@
+2011-11-14 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 3.2.2
+ * CONFLICTS: removed, file-roller2 spell does not exist
+
2011-10-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.2.0, gz -> bz2

diff --git a/gnome2-apps/file-roller/file-roller-3.2.0.tar.bz2.sig
b/gnome2-apps/file-roller/file-roller-3.2.0.tar.bz2.sig
deleted file mode 100644
index 7d46985..0000000
Binary files a/gnome2-apps/file-roller/file-roller-3.2.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-apps/file-roller/file-roller-3.2.2.tar.bz2.sig
b/gnome2-apps/file-roller/file-roller-3.2.2.tar.bz2.sig
new file mode 100644
index 0000000..4eb8841
Binary files /dev/null and
b/gnome2-apps/file-roller/file-roller-3.2.2.tar.bz2.sig differ

[SM-Commit] GIT changes to master grimoire by Sukneet Basuta (38f6e378733d0194aa99f210dac06dd7e9678390), Sukneet Basuta, 11/14/2011