Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1ebcf03dec597c33e39686f57254136b2d98cf48)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1ebcf03dec597c33e39686f57254136b2d98cf48)
  • Date: Mon, 28 Mar 2016 15:39:34 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

archive/gzip/DETAILS | 2 +-
archive/gzip/HISTORY | 3 +++
kde5-pim/kdepim/CONFLICTS | 17 -----------------
kde5-pim/kdepim/HISTORY | 3 +++
4 files changed, 7 insertions(+), 18 deletions(-)

New commits:
commit 1ebcf03dec597c33e39686f57254136b2d98cf48
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gzip: => 1.7

commit 85da68e9c0892f1c516e10e3d99cf85fba8936c7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdepim - remove bad conflicts

diff --git a/archive/gzip/DETAILS b/archive/gzip/DETAILS
index 226e4e3..49d6dc1 100755
--- a/archive/gzip/DETAILS
+++ b/archive/gzip/DETAILS
@@ -1,5 +1,5 @@
SPELL=gzip
- VERSION=1.6
+ VERSION=1.7
SECURITY_PATCH=1
SOURCE=$SPELL-${VERSION}.tar.xz
SOURCE2=$SOURCE.sig
diff --git a/archive/gzip/HISTORY b/archive/gzip/HISTORY
index 17ae2a3..f6fb0fb 100644
--- a/archive/gzip/HISTORY
+++ b/archive/gzip/HISTORY
@@ -1,3 +1,6 @@
+2016-03-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7
+
2015-05-09 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: LZMA -> xz-utils

diff --git a/kde5-pim/kdepim/CONFLICTS b/kde5-pim/kdepim/CONFLICTS
deleted file mode 100755
index 03830c0..0000000
--- a/kde5-pim/kdepim/CONFLICTS
+++ /dev/null
@@ -1,17 +0,0 @@
- conflicts calendarsupport y
- conflicts eventviews y
- conflicts grantleetheme y
- conflicts incidenceeditor y
- conflicts kdepim-addons y
- conflicts kdepim-apps-libs y
- conflicts kdgantt2 y
- conflicts libgravatar y
- conflicts libkdepim y
- conflicts libkleo y
- conflicts libksieve y
- conflicts mailcommon y
- conflicts mailimporter y
- conflicts messagelib y
- conflicts pimcommon y
- conflicts kdepim y
- conflicts kdepim4 y
diff --git a/kde5-pim/kdepim/HISTORY b/kde5-pim/kdepim/HISTORY
index 4dde6f9..0837ca3 100644
--- a/kde5-pim/kdepim/HISTORY
+++ b/kde5-pim/kdepim/HISTORY
@@ -1,3 +1,6 @@
+2016-03-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: delete, it was incorrect
+
2016-03-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 15.12.3




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1ebcf03dec597c33e39686f57254136b2d98cf48), Treeve Jelbert, 03/28/2016

Archive powered by MHonArc 2.6.24.

Top of Page