r1469 - in /experimental/anjal/debian: changelog copyright

[yanli-guest at users.alioth.debian.org]

Author: yanli-guest
Date: Tue Dec 22 07:32:55 2009
New Revision: 1469

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1469
Log:
Anjal package copyright file updated according to Luca Falavigna's comment

Modified:
    experimental/anjal/debian/changelog
    experimental/anjal/debian/copyright

Modified: experimental/anjal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/changelog?rev=1469&op=diff
==============================================================================
--- experimental/anjal/debian/changelog (original)
+++ experimental/anjal/debian/changelog Tue Dec 22 07:32:55 2009
@@ -1,42 +1,3 @@
-anjal (0.1-2) UNRELEASED; urgency=low
-
-  * Patches are classified as "upstream" or "debian". "upstream"
-    patches include commits from upstream for bug fixing, and "debian"
-    patches are Debian-specific.
-
-  * patches/01-Revert-BUGFIX-GNOME-Bugzilla-593197-Fix-strings-in-r.patch
-    - dropped since it's no longer needed
-
-  * patches/upstream-001_scroll-well-with-webkit.patch
-    - commit 16b84e6 from upstream anjal-0-1 branch that fixes the wrong
-      webkit render height bug
-
-  * patches/upstream-002_BUGFIX-GNOME-Bugzilla-596050-Show-the-folder-loading-status.patch
-    - commit ee0fb58 from upstream anjal-0-1 branch that fixes GNOME
-      Bug #596050
-
-  * patches/upstream-003_BUGFIX-GNOME-Bug-596027-In-Anjal-although-invalid-ma.patch
-    - commit fb9bcb3 from upstream anjal-0-1 branch that fixes GNOME
-      Bug #596027
-
-  * patches/upstream-004_Save-password-enabled-by-default.patch
-    - commit ffd6d2c from upstream anjal-0-1 branch that enables save
-      password by default
-
-  * patches/upstream-005_BUGFIX-GNOME-Bug-599792-Anjal-composer-s-Send-button.patch
-    - commit 11eb247 from upstream anjal-0-1 branch that fixes GNOME
-      Bug #599792
-
-  * patches/upstream-006_BUGFIX-GNOME-Bugzill-600691-Remember-settings-for-Reply.patch
-    - commit 877290f from upstream anjal-0-1 branch that fixes GNOME
-      Bug #600691
-
-  * patches/upstream-007_BUGFIX-GNOME-Bug-592294-Use-pkgconfig-for-EVOLUTION2.patch
-    - commit 60407aa from upstream anjal-0-1 branch that fixes GNOME
-      Bug #592294
-
- -- Yan Li <yanli at infradead.org>  Wed, 02 Dec 2009 13:36:16 +0800
-
 anjal (0.1-1) experimental; urgency=low
 
   * Initial release (Closes: #520342)

Modified: experimental/anjal/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/copyright?rev=1469&op=diff
==============================================================================
--- experimental/anjal/debian/copyright (original)
+++ experimental/anjal/debian/copyright Tue Dec 22 07:32:55 2009
@@ -12,6 +12,7 @@
 Copyright:
 
     Copyright (C) 1999-2009 Novell, Inc. (www.novell.com)
+    Copyright (C) 2005 OpenedHand Ltd.
 
 License:
 
@@ -20,14 +21,25 @@
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) version 3.
 
-The Debian packaging is:
+    You should have received a copy of the GNU Lesser General Public
+    License with your Debian GNU/Linux system, in
+    /usr/share/common-licenses/LGPL-2 and
+    /usr/share/common-licenses/LGPL-3, or with the Debian GNU/Linux
+    anjal source package as the files COPYING.*.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+    Boston, MA 02110-1301, USA.
 
-    Copyright (C) 2009 Yan Li <yanli at infradead.org>
+Files with other licenses:
 
-and is licensed under the GPL version 2,
-see `/usr/share/common-licenses/GPL-2'.
+  ./src/gconf-bridge.h:
+    Copyright (C) 2005 OpenedHand Ltd.
 
-./po/Makefile.in.in:
+    This 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.
+
+  ./po/Makefile.in.in:
     Makefile for program source directory in GNU NLS utilities package.
     Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
     Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns at gmail.com>
@@ -44,5 +56,12 @@
 
     - Modified by Rodney Dawes <dobey.pwns at gmail.com> for use with intltool
 
-    We have the following line for use by intltoolize:
-    INTLTOOL_MAKEFILE
+
+The Debian packaging is:
+
+    Copyright (C) 2009 Yan Li <yanli at infradead.org>
+
+and is licensed under the GPL version 2, or (at your option) any later
+version, see `/usr/share/common-licenses/GPL-2', and
+`/usr/share/common-licenses/GPL-3'.
+