[pkg-fso-commits] [SCM] xf86-video-glamo, SMedia Glamo video driver for X.Org branch, debian, updated. debian/0.0.0+20090224.git703acea1-1-4-ga4db5f1

[Luca Capello]

The following commit has been merged in the debian branch:
commit a4db5f1cff16aa7364a4de08346e129cd01695a5
Author: Luca Capello <luca at pca.it>
Date:   Sun May 17 22:50:46 2009 +0200

    debian/copyright: man/glamo.man from xf86-video-fbdev

diff --git a/debian/changelog b/debian/changelog
index c539bb0..9d32e03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xf86-video-glamo (0.0.0+20090224.git703acea1-2) UNRELEASED; urgency=low
 
   * debian/copyright:
+    + man/glamo.man comes from xf86-video-fbdev/man/fbdev.man.
     + src/glamo-driver.c comes from xf86-video-fbdev/src/fbdev.c,
       thanks to Cyril Brulebois <kibi at debian.org>.
 
diff --git a/debian/copyright b/debian/copyright
index 4d6189e..5b93d89 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -84,6 +84,16 @@ from C source files, MIT license used with X11R5:
 Individual copyright holders and licenses
 =========================================
 
+from man/glamo.man:
+-------------------
+
+	Authors include: Gerd Knorr, Michel Dänzer, Geert Uytterhoeven
+
+	While upstream file does not contain any license header,
+	this originally comes from xf86-video-fbdev/man/fbdev.man,
+	distributed under the XFree86 license.
+
+
 from src/glamo-cmdq.c:
 ----------------------
 

-- 
xf86-video-glamo, SMedia Glamo video driver for X.Org