[maemo-commits] [maemo-commits] r8771 - in projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge: debian modules

[From: subversion at stage.maemo.org]

Author: richard
Date: 2006-12-15 10:48:47 +0200 (Fri, 15 Dec 2006)
New Revision: 8771

Modified:
   projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/changelog
   projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/inotify-kernel.h
   projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/inotify-path.h
Log:
Update license from upstream.


Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/changelog
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/changelog	2006-12-14 17:59:46 UTC (rev 8770)
+++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/changelog	2006-12-15 08:48:47 UTC (rev 8771)
@@ -1,3 +1,10 @@
+osso-gnome-vfs2 (2.16.3-1osso5) unstable; urgency=low
+
+  * FIXME: UNRELEASED
+  * Update inotify headers from upstream GNOME CVS to get the right license
+
+ -- Richard Hult <richard at imendio.com>  Fri, 15 Dec 2006 09:46:01 +0100
+
 osso-gnome-vfs2 (2.16.3-1osso4) unstable; urgency=low
 
   * Fixes: NB#49259, libosso-gnomevfs2-common package doesn't provide debug

Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/inotify-kernel.h
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/inotify-kernel.h	2006-12-14 17:59:46 UTC (rev 8770)
+++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/inotify-kernel.h	2006-12-15 08:48:47 UTC (rev 8771)
@@ -1,17 +1,23 @@
 /*
-	Copyright (C) 2006 John McCutchan <john at johnmccutchan.com>
+   Copyright (C) 2005 John McCutchan
 
-	This program 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.
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-	This program 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 version 2 for more details.
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software Foundation,
-	Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   The Gnome Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors:.
+		John McCutchan <john at johnmccutchan.com>
 */
 
 #ifndef __INOTIFY_KERNEL_H

Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/inotify-path.h
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/inotify-path.h	2006-12-14 17:59:46 UTC (rev 8770)
+++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/modules/inotify-path.h	2006-12-15 08:48:47 UTC (rev 8771)
@@ -1,17 +1,23 @@
 /*
-	Copyright (C) 2006 John McCutchan <john at johnmccutchan.com>
+   Copyright (C) 2005 John McCutchan
 
-	This program 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.
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-	This program 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 version 2 for more details.
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software Foundation,
-	Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   The Gnome Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors:.
+		John McCutchan <john at johnmccutchan.com>
 */
 
 #ifndef __INOTIFY_PATH_H