Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (a5e7d58149f5011e0ff5ad2cc88b7707327515d0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (a5e7d58149f5011e0ff5ad2cc88b7707327515d0)
  • Date: Tue, 28 Apr 2015 02:10:22 -0500

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

xorg-xserver/xorg-server/DEPENDS | 5 -----
xorg-xserver/xorg-server/HISTORY | 3 +++
2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit a5e7d58149f5011e0ff5ad2cc88b7707327515d0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xorg-server: removed junk of the previous patch

diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index 59081b3..0f2f1ba 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -154,11 +154,6 @@ depends font-cursor-misc &&
depends font-misc-misc &&
depends font-alias &&
depends libpciaccess &&
-<<<<<<< HEAD
-depends SSL &&
-=======
-depends libxtst &&
->>>>>>> 7b17606... xorg-server: fixed build with upgrading of libgcrypt and
further upgrades of all crypto libraries (because of missing actual
dependencies)

if list_find "$XORG_SERVER_FONT_100DPI" "all"
then
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index a88eec8..1b97947 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2015-04-28 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: corrected previous patchage
+
2015-04-25 Vlad Glagolev <stealth AT sourcemage.org>
* CONFIGURE: added selection of SHA1 implementation
* DEPENDS: fixed dependencies on a crypto library



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (a5e7d58149f5011e0ff5ad2cc88b7707327515d0), Vlad Glagolev, 04/28/2015

Archive powered by MHonArc 2.6.24.

Top of Page