Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (014f7cf29dfd77e1b737f9597daf3f39b3578c6f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (014f7cf29dfd77e1b737f9597daf3f39b3578c6f)
  • Date: Tue, 27 Oct 2009 16:22:51 -0500

GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

dev/null |binary
xorg-app/xclipboard/DETAILS | 11 ++++-------
xorg-app/xclipboard/HISTORY | 7 +++++++
xorg-app/xclipboard/xclipboard-1.1.0.tar.bz2.sig |binary
xorg-app/xclipboard/xclipboard-X11R7.0-1.0.1.tar.bz2.sig | 0
xorg-util/xorg-cf-files/05_xaw_without_xp.diff | 15
++++-----------
xorg-util/xorg-cf-files/DETAILS | 12 +++++-------
xorg-util/xorg-cf-files/HISTORY | 8 ++++++++
xorg-util/xorg-cf-files/PRE_BUILD | 2 +-
xorg-util/xorg-cf-files/xorg-cf-files-1.0.3.tar.bz2.sig |binary
10 files changed, 29 insertions(+), 26 deletions(-)

New commits:
commit 014f7cf29dfd77e1b737f9597daf3f39b3578c6f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xclipboard: Removed PKG

commit 267356e1e7a7f2391d18815bdaf8a9bad1f05ea3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xclipboard: Updated to 1.1.0
SOURCE matches upstream posted MD5
Removed PATCHLEVEL and XORG_VER
SOURCE_URL now uses individual/app/

commit 8d20fa640ebec9b1f23a6132ac742dc8cdf6dd08
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-cf-files: Removed XORG_VER and PKG

commit 7709dbc71a8747de0c0fc74856b3730d636de825
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-cf-files: Updated to 1.0.3
SOURCE matches upstream posted MD5
Removed PATCHLEVEL
05_xaw_without_xp.diff synched against 1.0.3 and applies with -p1

diff --git a/xorg-app/xclipboard/DETAILS b/xorg-app/xclipboard/DETAILS
index b496faa..ad02c59 100755
--- a/xorg-app/xclipboard/DETAILS
+++ b/xorg-app/xclipboard/DETAILS
@@ -1,15 +1,12 @@
SPELL=xclipboard
- PKG=xclipboard
- VERSION=1.0.1
- XORG_VER=X11R7.0
- SOURCE=${PKG}-${XORG_VER}-${VERSION}.tar.bz2
-
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/${XORG_VER}/src/app/${SOURCE}
+ VERSION=1.1.0
+ SOURCE=$SPELL-$VERSION.tar.bz2
+
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
- PATCHLEVEL=1
SHORT="Module xclipboard for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/xclipboard/HISTORY b/xorg-app/xclipboard/HISTORY
index 2243033..878d55a 100644
--- a/xorg-app/xclipboard/HISTORY
+++ b/xorg-app/xclipboard/HISTORY
@@ -1,3 +1,10 @@
+2009-10-27 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.1.0
+ SOURCE matches upstream posted MD5
+ Removed PATCHLEVEL and XORG_VER
+ SOURCE_URL now uses individual/app/
+ Removed PKG
+
2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: patchlevel++
* DEPENDS: killing off XPrint
diff --git a/xorg-app/xclipboard/xclipboard-1.1.0.tar.bz2.sig
b/xorg-app/xclipboard/xclipboard-1.1.0.tar.bz2.sig
new file mode 100644
index 0000000..e57641f
Binary files /dev/null and b/xorg-app/xclipboard/xclipboard-1.1.0.tar.bz2.sig
differ
diff --git a/xorg-app/xclipboard/xclipboard-X11R7.0-1.0.1.tar.bz2.sig
b/xorg-app/xclipboard/xclipboard-X11R7.0-1.0.1.tar.bz2.sig
deleted file mode 100644
index 7e9103d..0000000
Binary files a/xorg-app/xclipboard/xclipboard-X11R7.0-1.0.1.tar.bz2.sig and
/dev/null differ
diff --git a/xorg-util/xorg-cf-files/05_xaw_without_xp.diff
b/xorg-util/xorg-cf-files/05_xaw_without_xp.diff
index d327c45..79fdb18 100644
--- a/xorg-util/xorg-cf-files/05_xaw_without_xp.diff
+++ b/xorg-util/xorg-cf-files/05_xaw_without_xp.diff
@@ -1,14 +1,7 @@
----
- xorg-cf-files/FreeBSD.cf | 10 ++++++++++
- xorg-cf-files/gnu.cf | 10 ++++++++++
- xorg-cf-files/linux.cf | 10 ++++++++++
- 3 files changed, 30 insertions(+)
-
-Index: xutils-dev/xorg-cf-files/linux.cf
-===================================================================
---- xutils-dev.orig/xorg-cf-files/linux.cf 2008-06-01 18:36:51.000000000
+0200
-+++ xutils-dev/xorg-cf-files/linux.cf 2008-06-01 18:36:51.000000000 +0200
-@@ -1153,6 +1153,16 @@
+diff -Naur xorg-cf-files-1.0.3.orig/linux.cf xorg-cf-files-1.0.3/linux.cf
+--- xorg-cf-files-1.0.3.orig/linux.cf 2009-10-27 14:13:33.480912412 -0700
++++ xorg-cf-files-1.0.3/linux.cf 2009-10-27 14:14:01.877916656 -0700
+@@ -1052,6 +1052,16 @@
#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)

diff --git a/xorg-util/xorg-cf-files/DETAILS b/xorg-util/xorg-cf-files/DETAILS
index e0357b3..62c8320 100755
--- a/xorg-util/xorg-cf-files/DETAILS
+++ b/xorg-util/xorg-cf-files/DETAILS
@@ -1,15 +1,13 @@
SPELL=xorg-cf-files
- PKG=xorg-cf-files
- VERSION=1.0.2
- XORG_VER=X11R7.0
- SOURCE=${PKG}-${VERSION}.tar.bz2
+ VERSION=1.0.3
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/util/${SOURCE}
-
SOURCE_HASH=sha512:ccee7f26febb51aacefa04508acf4706cacee675dc0652e40891ad00925b9600612342c8d51d99730c2afa97bfde9bebf1c33d360362805369f5c682ab56d7a8
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
+#
SOURCE_HASH=sha512:ccee7f26febb51aacefa04508acf4706cacee675dc0652e40891ad00925b9600612342c8d51d99730c2afa97bfde9bebf1c33d360362805369f5c682ab56d7a8
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
- PATCHLEVEL=1
SHORT="host.def files for X window"
cat << EOF
host.def files for X window.
diff --git a/xorg-util/xorg-cf-files/HISTORY b/xorg-util/xorg-cf-files/HISTORY
index 2f961bd..4c73922 100644
--- a/xorg-util/xorg-cf-files/HISTORY
+++ b/xorg-util/xorg-cf-files/HISTORY
@@ -1,3 +1,11 @@
+2009-10-27 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.0.3
+ SOURCE matches upstream posted MD5
+ Removed PATCHLEVEL
+ Removed XORG_VER and PKG
+ * 05_xaw_without_xp.diff: Synched against 1.0.3
+ * PRE_BUILD: 05_xaw_without_xp.diff now applies with -p1
+
2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* PRE_BUILD: patch added
* 05_xaw_without_xp.diff: debian patch to fix:
diff --git a/xorg-util/xorg-cf-files/PRE_BUILD
b/xorg-util/xorg-cf-files/PRE_BUILD
index 2a50af8..40345a0 100755
--- a/xorg-util/xorg-cf-files/PRE_BUILD
+++ b/xorg-util/xorg-cf-files/PRE_BUILD
@@ -1,5 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
patch -Np0 < "$SCRIPT_DIRECTORY/lib64.patch" &&
-patch -p2 < $SPELL_DIRECTORY/05_xaw_without_xp.diff &&
+patch -p1 < $SPELL_DIRECTORY/05_xaw_without_xp.diff &&
sedit "s:/X11R6::" $SOURCE_DIRECTORY/site.def
diff --git a/xorg-util/xorg-cf-files/xorg-cf-files-1.0.3.tar.bz2.sig
b/xorg-util/xorg-cf-files/xorg-cf-files-1.0.3.tar.bz2.sig
new file mode 100644
index 0000000..4f21022
Binary files /dev/null and
b/xorg-util/xorg-cf-files/xorg-cf-files-1.0.3.tar.bz2.sig differ



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (014f7cf29dfd77e1b737f9597daf3f39b3578c6f), Eric Sandall, 10/27/2009

Archive powered by MHonArc 2.6.24.

Top of Page