Skip to Content.
Sympa Menu

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

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 (01fee6d0043a77530423e75308d7ad830210eb25)
  • Date: Mon, 1 Feb 2016 09:12:47 +0000

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

kde4-sdk/kdiff4/BUILD | 1 +
kde4-sdk/kdiff4/CONFIGURE | 1 -
kde4-sdk/kdiff4/CONFLICTS | 1 +
kde4-sdk/kdiff4/DEPENDS | 1 -
kde4-sdk/kdiff4/DETAILS | 20 +++++---------------
kde4-sdk/kdiff4/DOWNLOAD | 1 +
kde4-sdk/kdiff4/HISTORY | 23 ++++-------------------
kde4-sdk/kdiff4/INSTALL | 1 +
kde4-sdk/kdiff4/PRE_BUILD | 1 +
kde4-sdk/kdiff4/UP_TRIGGERS | 1 +
xorg-lib/pixman/DETAILS | 5 ++---
xorg-lib/pixman/HISTORY | 3 +++
12 files changed, 20 insertions(+), 39 deletions(-)

New commits:
commit 01fee6d0043a77530423e75308d7ad830210eb25
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pixman: => 0.34.0

commit 657d78bd2019ead04f7a576693a1fc300f74a7c6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

deprecate kde4-sdk/kdiff4 [replaced by kompare]

diff --git a/kde4-sdk/kdiff4/BUILD b/kde4-sdk/kdiff4/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/kde4-sdk/kdiff4/BUILD
@@ -0,0 +1 @@
+true
diff --git a/kde4-sdk/kdiff4/CONFIGURE b/kde4-sdk/kdiff4/CONFIGURE
deleted file mode 100755
index b2f02c3..0000000
--- a/kde4-sdk/kdiff4/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/kde4-sdk/kdiff4/CONFLICTS b/kde4-sdk/kdiff4/CONFLICTS
new file mode 100755
index 0000000..83db16f
--- /dev/null
+++ b/kde4-sdk/kdiff4/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdiff4 y
diff --git a/kde4-sdk/kdiff4/DEPENDS b/kde4-sdk/kdiff4/DEPENDS
deleted file mode 100755
index 168c85e..0000000
--- a/kde4-sdk/kdiff4/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-source $GRIMOIRE/KDE4_DEPENDS
diff --git a/kde4-sdk/kdiff4/DETAILS b/kde4-sdk/kdiff4/DETAILS
index 49a8bc1..d1957d7 100755
--- a/kde4-sdk/kdiff4/DETAILS
+++ b/kde4-sdk/kdiff4/DETAILS
@@ -1,18 +1,8 @@
SPELL=kdiff4
- SPELLX=kdiff3
- VERSION=0.9.97
- PATCHLEVEL=1
- SOURCE="${SPELLX}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELLX}/${SOURCE}
-
SOURCE_HASH=sha512:8f4e89e594894a3fbfaa2e5c9cc345ab16e6787c4efc4324fffe55fbe45b94c2ff10ba411279d2b433a0a5fa752653f7b3e663577cc0d658dfc4d5b797a22fab
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
- WEB_SITE="http://${SPELLX}.sourceforge.net/";
- LICENSE[0]=GPL
- ENTERED=20090108
- SHORT="A graphical text and directory diff and merge tool."
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
-KDiff3 is a program that compares two or three text input files or
directories,
-shows the differences line by line and character by character, provides an
-automatic merge facility and an integrated editor for comfortable solving
-of merge conflicts, and has an intuitive graphical user interface.
+deprecated spell [replaced by kompare]
EOF
+
diff --git a/kde4-sdk/kdiff4/DOWNLOAD b/kde4-sdk/kdiff4/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/kde4-sdk/kdiff4/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/kde4-sdk/kdiff4/HISTORY b/kde4-sdk/kdiff4/HISTORY
index 146db6f..6a659c5 100644
--- a/kde4-sdk/kdiff4/HISTORY
+++ b/kde4-sdk/kdiff4/HISTORY
@@ -1,19 +1,4 @@
-2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
- * DETAILS: remove SOURCEFORGE_URL usage (automated)
-
-2012-10-01 Julien "_kaze_" ROZO <julien AT rozo.org>
- * DETAILS: updated version to 0.9.97
-
-2011-09-04 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 0.9.96
- PATCHLEVEL++ for /opt/kde4 -> /usr change
-
-2009-03-05 Julien "_kaze_" ROZO <julien AT rozo.org>
- * DETAILS: updated version to 0.9.95
-
-2009-01-20 Julien "_kaze_" ROZO <julien AT rozo.org>
- * DETAILS: updated version to 0.9.94
-
-2009-01-08 Julien "_kaze_" ROZO <julien AT rozo.org>
- * DEPENDS, DETAILS, HISTORY: spell created
-
+2016-01-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by kompare]
diff --git a/kde4-sdk/kdiff4/INSTALL b/kde4-sdk/kdiff4/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/kde4-sdk/kdiff4/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/kde4-sdk/kdiff4/PRE_BUILD b/kde4-sdk/kdiff4/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/kde4-sdk/kdiff4/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/kde4-sdk/kdiff4/UP_TRIGGERS b/kde4-sdk/kdiff4/UP_TRIGGERS
new file mode 100755
index 0000000..d2818a8
--- /dev/null
+++ b/kde4-sdk/kdiff4/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger kompare cast_self
diff --git a/xorg-lib/pixman/DETAILS b/xorg-lib/pixman/DETAILS
index 9e21ff2..f0de3e2 100755
--- a/xorg-lib/pixman/DETAILS
+++ b/xorg-lib/pixman/DETAILS
@@ -1,7 +1,6 @@
SPELL=pixman
- VERSION=0.32.8
- PATCHLEVEL=2
-
SOURCE_HASH=sha512:5d4bb17822ea3fef762e7a8ea6a6d0af1a73367af0636732675150dc1cde0cd688808f8dceee5eaad6f1ba6b10f7907bc370605a2a7a836ff8e465eb3f7bc14d
+ VERSION=0.34.0
+
SOURCE_HASH=sha512:81caca5b71582b53aaac473bc37145bd66ba9acebb4773fa8cdb51f4ed7fbcb6954790d8633aad85b2826dd276bcce725e26e37997a517760e9edd72e2669a6d
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
SOURCE_URL[1]=http://xorg.freedesktop.org/releases/individual/lib/$SOURCE
diff --git a/xorg-lib/pixman/HISTORY b/xorg-lib/pixman/HISTORY
index a99cdb5..73be4fc 100644
--- a/xorg-lib/pixman/HISTORY
+++ b/xorg-lib/pixman/HISTORY
@@ -1,3 +1,6 @@
+2016-02-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.34.0
+
2015-10-31 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: .bz2 -> .gz, PATCHLEVEL++




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (01fee6d0043a77530423e75308d7ad830210eb25), Treeve Jelbert, 02/01/2016

Archive powered by MHonArc 2.6.24.

Top of Page