This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch 3.6.x-rpm-debug in repository nx-libs. discards bcaf5c2 Merge branch 'bugfix/rpath' into 3.6.x-rpm-debug new 86b4532 Merge branch 'bugfix/rpath' into 3.6.x-rpm-debug This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (bcaf5c2) \ N -- N -- N refs/heads/3.6.x-rpm-debug (86b4532) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: nx-X11/config/cf/Imake.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit 86b45321d6f20646dba2103a1e3c7953f276a6eb Merge: b21228f d23fc94 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Dec 29 21:46:38 2017 +0100 Merge branch 'bugfix/rpath' into 3.6.x-rpm-debug nx-X11/config/cf/Imake.rules | 33 ++++++++++++++++++++++++++++++--- nx-X11/config/cf/Imake.tmpl | 1 + nx-X11/config/cf/README | 1 + nx-X11/config/cf/cross.def | 2 ++ nx-X11/config/cf/gnuLib.rules | 17 ++++++++++++++++- nx-X11/config/cf/lnxLib.rules | 22 +++++++++++++++++++++- nx-X11/programs/Xserver/Imakefile | 4 ++-- 7 files changed, 73 insertions(+), 7 deletions(-) diff --cc nx-X11/config/cf/Imake.rules index f53a15b,b0d38fe..3cf429c --- a/nx-X11/config/cf/Imake.rules +++ b/nx-X11/config/cf/Imake.rules @@@ -1586,6 -1602,17 +1602,17 @@@ install:: file @@ /* + * RelinkProgram - relinks an executable program in preparation of installation + */ + #ifndef RelinkProgram + #define RelinkProgram(program,objects,libs,syslibs) @@\ + ProgramRelinkName(server): program @@\ + MoveToBakFile($@) @@\ - LinkInstallRule($@,$(SERVERLDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\ ++ LinkInstallRule($@,$(SERVERLDOPTIONS),objects,libs $(LDLIBS) syslibs) + #endif /* RelinkProgram */ + + + /* * InstallProgramWithFlags - generate rules to install an executable program * using given install flags. */ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org