[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.5.3-36-g6f0a661

Modestas Vainius modax at alioth.debian.org
Sun Jan 17 23:22:48 UTC 2010


The following commit has been merged in the master branch:
commit 6f0a6613b1df2968d9ae4ef803a2da11630328d8
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Jan 18 01:22:24 2010 +0200

    Update my address in the code copyright notices, update debian/copyright.
---
 debhelper/dh_sameversiondep |    2 +-
 debian/changelog            |    2 ++
 debian/copyright            |   25 ++++++++++++++++++++++---
 vcs/pkgkde-vcs              |    2 +-
 vcs/pkgkde-vcs.1            |    2 +-
 vcs/vcslib/git.sh           |    2 +-
 6 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/debhelper/dh_sameversiondep b/debhelper/dh_sameversiondep
index 4f7fe85..8265815 100755
--- a/debhelper/dh_sameversiondep
+++ b/debhelper/dh_sameversiondep
@@ -131,7 +131,7 @@ L<debhelper(7)>
 
 =head1 AUTHOR
 
-Modestas Vainius <modestas at vainius.eu>
+Modestas Vainius <modax at debian.org>
 
 =cut
 
diff --git a/debian/changelog b/debian/changelog
index e44c09e..9126a83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ pkg-kde-tools (0.6.0~pre6) UNRELEASED; urgency=low
     (dpkg-gensymbols wrapper). This renders `pkgkde-symbolshelper symbolfile`
     obsolete.
   * Switch to 3.0 (native) format: ignores VCS directories by default.
+  * Update my address in the code copyright notices.
+  * Update debian/copyright.
 
  -- Modestas Vainius <modestas at vainius.eu>  Sun, 06 Dec 2009 22:06:01 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 2083a6c..97bd01f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Thu, 18 Sep 2008 21:39:35 +0200.
 Upstream Authors:
 
     Sune Vuorela <debian at pusling.com>
-    Modestas Vainius <modestas at vainius.eu>
+    Modestas Vainius <modax at debian.org>
     Fathi Boudra <fabo at debian.org>
     Ana Beatriz Guerrero Lopez <ana at debian.org>
     Armin Berres <trigger+debian at space-based.de>
@@ -12,7 +12,7 @@ Upstream Authors:
 Copyright:
 
     Copyright © 2007-2008 Sune Vuorela <debian at pusling.com>
-    Copyright © 2007-2008 Modestas Vainius <modestat at vainius.eu>
+    Copyright © 2007-2010 Modestas Vainius <modax at debian.org>
     Copyright © 2007-2008 Fathi Boudra <fabo at debian.org>
     Copyright © 2007-2008 Ana Beatriz Guerrero Lopez <ana at debian.org>
     Copyright © 2007-2008 Armin Berres <trigger+debian at space-based.de>
@@ -42,7 +42,7 @@ The follwing license and copyright applies to the contents of:
   - "vcs" directory;
   - dh_sameversiondep script.
 
-  |  Copyright © 2008-2009 Modestas Vainius <modestas at vainius.eu>
+  |  Copyright © 2008-2010 Modestas Vainius <modax at debian.org>
   |
   |  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
@@ -57,6 +57,25 @@ The follwing license and copyright applies to the contents of:
   |  You should have received a copy of the GNU General Public License
   |  along with this program.  If not, see <http://www.gnu.org/licenses/>
 
+  - symbolshelper/Dpkg/Shlibs/*
+
+  | Copyright © 2007 Raphaël Hertzog <hertzog at debian.org>
+  | Copyright © 2009-2010 Modestas Vainius <modax at debian.org>
+  |
+  | 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; 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 for more details.
+  |
+  | You should have received a copy of the GNU General Public License
+  | along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-3'.
 
diff --git a/vcs/pkgkde-vcs b/vcs/pkgkde-vcs
index 88cea36..7bea832 100755
--- a/vcs/pkgkde-vcs
+++ b/vcs/pkgkde-vcs
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2009 Modestas Vainius <modestas at vainius.eu>
+# Copyright (C) 2009 Modestas Vainius <modax at debian.org>
 #
 # 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
diff --git a/vcs/pkgkde-vcs.1 b/vcs/pkgkde-vcs.1
index e071e39..1591b5f 100644
--- a/vcs/pkgkde-vcs.1
+++ b/vcs/pkgkde-vcs.1
@@ -103,4 +103,4 @@ it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 .SH AUTHORS
-Modestas Vainius <modestas at vainius.eu>
+Modestas Vainius <modax at debian.org>
diff --git a/vcs/vcslib/git.sh b/vcs/vcslib/git.sh
index 6320fb3..74c6bd6 100644
--- a/vcs/vcslib/git.sh
+++ b/vcs/vcslib/git.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Modestas Vainius <modestas at vainius.eu>
+# Copyright (C) 2009 Modestas Vainius <modax at debian.org>
 #
 # 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

-- 
Debian Qt/KDE packaging tools



More information about the pkg-kde-commits mailing list