[Pkg-xfce-commits] r403 - in desktop/trunk: orage/debian thunar/debian xfce4-mixer/debian

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2005-12-30 16:38:00 +0000 (Fri, 30 Dec 2005)
New Revision: 403

Modified:
   desktop/trunk/orage/debian/copyright
   desktop/trunk/thunar/debian/copyright
   desktop/trunk/xfce4-mixer/debian/rules
Log:
Changes on copyright files (thunar, orage)
Changed rules files for xfce4-mixer so it builds fine in pbuilder



Modified: desktop/trunk/orage/debian/copyright
===================================================================
--- desktop/trunk/orage/debian/copyright	2005-12-28 17:16:26 UTC (rev 402)
+++ desktop/trunk/orage/debian/copyright	2005-12-30 16:38:00 UTC (rev 403)
@@ -7,19 +7,25 @@
 
 License:
 
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
+Orage is licensed under the GNU General Public License. It contains libical, 
+which is licensed under Mozilla Public License and GNU Library General Public License. There are few files licensed under BSD License.
 
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+Under libical directory, the copyright holders are:
 
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+Copyright (c) 1986-2000, Hiram Clawson
+Copyright (c) 1997 Theo de Raadt
+Copyright (c) 1999-2002, Eric Busboom
+Copyright (c) 2000, Andrea Campi
+Copyright (c) 2001, Damon Chaplin
+Copyright (c) 2001, Ximian, Inc.
 
+Some Orage code comes from xfcalendar, and are:
+
+Copyright (c) 2003 Benedikt Meurer <benny at xfce.org>
+Copyright (c) 2003 Edscott Wilson Garcia <edscott at users.sourceforge.net>
+Copyright (c) 2005 Juha Kautto <kautto.juha at kolumbus.fi>
+
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
-
+The complete text of the GNU Library General Public License can be found
+in `/usr/share/common-licenses/LGPL', for BSD license in `/usr/share/common-licenses/BSD'. The text of Mozilla Public License can be found at http://www.mozilla.org/MPL/

Modified: desktop/trunk/thunar/debian/copyright
===================================================================
--- desktop/trunk/thunar/debian/copyright	2005-12-28 17:16:26 UTC (rev 402)
+++ desktop/trunk/thunar/debian/copyright	2005-12-30 16:38:00 UTC (rev 403)
@@ -5,9 +5,11 @@
 
 Copyright Holder: Benedikt Meurer <benny at xfce.org>
 
-License: GNU/GPL
+Licenses: 
+GNU/LGPL for files under thunarx/ and thunar-vfs folders
+GNU/GPL for the others
 
-You are free to distribute this software under the terms of
-the GNU General Public License.
 On Debian systems, the complete text of the GNU General Public
 License can be found in the file `/usr/share/common-licenses/GPL'
+The complete text of the GNU Library General Public License can be
+found in the file `/usr/share/common-licenses/LGPL'

Modified: desktop/trunk/xfce4-mixer/debian/rules
===================================================================
--- desktop/trunk/xfce4-mixer/debian/rules	2005-12-28 17:16:26 UTC (rev 402)
+++ desktop/trunk/xfce4-mixer/debian/rules	2005-12-30 16:38:00 UTC (rev 403)
@@ -16,7 +16,7 @@
 	dh_testdir
 
 	#configure the two variants:
-	for variant in alsa oss; do\
+	for variant in alsa oss; do \
 	mkdir $(CURDIR)/debian/build-$$variant && \
 	cd $(CURDIR)/debian/build-$$variant && \
 	$(CURDIR)/configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --enable-final --with-sound=$$variant;\
@@ -30,7 +30,7 @@
 	dh_testdir
 	
 	#build the two variants:
-	for variant in alsa oss;do\
+	for variant in alsa oss;do \
 	cd $(CURDIR)/debian/build-$$variant/lib && $(MAKE);\
 	done
 
@@ -45,7 +45,7 @@
 	dh_testroot
 	rm -f build-stamp 
 	
-	for variant in alsa oss;do\
+	for variant in alsa oss;do \
 	rm -rf $(CURDIR)/debian/build-$$variant;\
 	done
 
@@ -68,8 +68,8 @@
 	dh_installdirs
 
 	#install the two variants:
-	for variant in alsa oss;do\
-	cd $(CURDIR)/debian/build-$$variant/lib &&\
+	for variant in alsa oss;do \
+	cd $(CURDIR)/debian/build-$$variant/lib && \
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-mixer-$$variant;\
 	done