[X2Go-Commits] [nx-libs] 22/219: Rename libdamage to (correct) libdamageext

git-admin at x2go.org git-admin at x2go.org
Sat Sep 28 12:10:13 CEST 2019


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 0312a8cfed0fa8211cb4cbc92a83bfb0233ac3ef
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Wed May 1 20:11:14 2019 +0200

    Rename libdamage to (correct) libdamageext
    
    upstream xorg is also using that name
---
 nx-X11/programs/Xserver/Imakefile           | 2 +-
 nx-X11/programs/Xserver/damageext/Imakefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 64c4e2e7f..95628651b 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -115,7 +115,7 @@ INSTPGMFLAGS =
 #endif
 #if BuildDamage
       DAMAGEDIR = damageext
-      DAMAGELIB = $(DAMAGEDIR)/libdamage.a
+      DAMAGELIB = $(DAMAGEDIR)/libdamageext.a
 #endif
 #if BuildComposite
           CWDIR = miext/cw
diff --git a/nx-X11/programs/Xserver/damageext/Imakefile b/nx-X11/programs/Xserver/damageext/Imakefile
index d8cc1bfa4..b80853f6a 100644
--- a/nx-X11/programs/Xserver/damageext/Imakefile
+++ b/nx-X11/programs/Xserver/damageext/Imakefile
@@ -20,9 +20,9 @@
               $(NX_DEFINES)	\
               $(NULL)
 
-NormalLibraryTarget(damage,$(OBJS))
+NormalLibraryTarget(damageext,$(OBJS))
 NormalLibraryObjectRule()
-LintLibraryTarget(damage,$(SRCS))
+LintLibraryTarget(damageext,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list