Hi Mihai,

On  So 15 Feb 2015 19:48:49 CET, Mihai Moldovan wrote:

On 14.02.2015 05:47 PM, [email protected] wrote:
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 902dc519d96be582088e5fe0644cefac7ecc0133
Author: Mike Gabriel <[email protected]>
Date:   Sat Feb 14 15:58:11 2015 +0100

    Move COPYING.full+lite as COPYING to /

      Adapted packaging scripts:

       debian/roll-tarballs.sh
       nx-libs.spec
---
 debian/COPYING.full+lite => COPYING |    0
 debian/roll-tarballs.sh             |    1 -
 nx-libs.spec                        |   11 +++++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/COPYING.full+lite b/COPYING
similarity index 100%
rename from debian/COPYING.full+lite
rename to COPYING
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index fcb8367..c7cac5f 100755
--- a/debian/roll-tarballs.sh
+++ b/debian/roll-tarballs.sh
@@ -96,7 +96,6 @@ else
         echo ${file##*/} >> doc/applied-patches/series
     done
 fi
-cp -v debian/COPYING.full+lite COPYING

# apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball
 if [ -s "doc/applied-patches/series" ]; then
diff --git a/nx-libs.spec b/nx-libs.spec
index 5c1064f..f4084d9 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -768,7 +768,8 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama

 %files
 %defattr(-,root,root)
-%doc nx-X11/{COPYING,LICENSE,README}
+%doc COPYING
+%doc nx-X11/README

Have you removed LICENSE by accident or was that intended?


 %dir %{_libdir}/nx
 %dir %{_libdir}/nx/X11
 %dir %{_datadir}/nx
@@ -913,7 +914,8 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama

 %files -n libXcomp3
 %defattr(-,root,root)
-%doc nxcomp/{COPYING,LICENSE,README}
+%doc COPYING
+%doc nxcomp/README

Same here.


 %_libdir/libXcomp.so.3*

 %files -n libXcompext-devel
@@ -924,7 +926,8 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama

 %files -n libXcompext3
 %defattr(-,root,root)
-%doc nxcompext/{COPYING,LICENSE,README}
+%doc COPYING
+%doc nxcompext/README

Same here.


 %_libdir/libXcompext.so.3*

 %files -n libXcompshad-devel
@@ -944,7 +947,7 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama

 %files -n libXcompshad3
 %defattr(-,root,root)
-%doc nxcompshad/{COPYING,LICENSE}
+%doc COPYING

Same here.

This is work not yet finished. I have it on my agenda to create a complete debian/copyright file.

When that is done, I may re-add various license files.

Note, that I only removed the full-text LICENSE files from the .spec files. Not sure about RPM distros, but in Debian full-text license files are normally shipped by the distro somewhere (/usr/share/common-licenses).

Ping me, if you think they should be re-added for nx* subdirs. For nx-X11, the licensing is everything other than simple and I have a FIXME in the back of my head for that.

Mike
--

DAS-NETZWERKTEAM
mike gabriel, herweg 7, 24357 fleckeby
fon: +49 (1520) 1976 148

GnuPG Key ID 0x25771B31
mail: [email protected], http://das-netzwerkteam.de

freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb

Attachment: pgp3Q7XDtNuI5.pgp
Description: Digitale PGP-Signatur

_______________________________________________
x2go-dev mailing list
[email protected]
http://lists.x2go.org/listinfo/x2go-dev

Reply via email to