[SCM] graphlcd-base packaging repository branch, master, updated. debian/0.1.5-5-6-g5f6495b

[etobi]

The following commit has been merged in the master branch:
commit fd005cf21137138058a95328d4ed2fc9673d8b09
Author: etobi <git at e-tobi.net>
Date:   Wed May 9 19:50:33 2012 +0200

    Updated debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 0c58744..31f7056 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-graphlcd-base (0.1.9+git20120310-1) oneiric; urgency=low
+graphlcd-base (0.1.9+git20120310-1) unstable; urgency=low
 
   * Merging changes from the yaVDR team - thx guys!
   * Standards-Version: 3.9.3
   * Fixed lib*-dev dependencies
+  * Added missing misc:Depends
+  * Updated debian/copyright
 
  -- Tobias Grimm <etobi at debian.org>  Wed, 09 May 2012 19:32:40 +0200
 
diff --git a/debian/control b/debian/control
index 65ecf70..ec19b05 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,11 @@ Provides: libglcddrivers-dev
 Conflicts: libglcddrivers-dev, libglcddrivers1 (<< 0.1.9)
 Section: libdevel
 Architecture: any
+<<<<<<< HEAD
 Depends: ${misc:Depends}, libglcddrivers1 (= ${binary:Version})
+=======
+Depends: ${misc:Depends}, libglcddrivers1 (= ${Source-Version})
+>>>>>>> c7fd17d... Added missing misc:Depends
 Description: Development files for the GraphLCD drivers library
  The GraphLCD drivers library provides a common interface for programming
  different graphical LC displays. Special devices for frambuffer and
diff --git a/debian/copyright b/debian/copyright
index cc978df..7226655 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,40 @@
-This package was debianized by Tobias Grimm <tg at e-tobi.net> on
-Sat, 22 Oct 2005 11:09:36 +0200.
+Upstream Homepage:
+    http://graphlcd.berlios.de
+    http://projects.vdr-developer.org/projects/show/graphlcd
 
-It was downloaded from http://graphlcd.berlios.de
+Upstream Authors:
+    Andreas Regel (andreas.regel AT powarman.de)
 
-Copyright Holder: Andreas Regel (andreas.regel AT powarman.de)
+Debian Maintainers:
+    Tobias Grimm <etobi at debian.org>
+    Reiner Paulus <flex0r at gmx.net>
+    Holger Schvestka <hotzenplotz5 at gmx.de>
+    Gerald Dachs <gda at dachsweb.de>
+
+Copyright:
+    (C) 2004 - 2012 Andreas Regel <andreas.regel AT powarman.de>
+
+Copyright (Debian packaging):
+    (C) 2004 - 2012 Tobias Grimm, Reiner Paulus, Holger Schvestka, Gerald Dachs
 
 License:
+    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, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+    The complete text of the GNU General Public License can be found
+    in /usr/share/common-licenses/GPL-2 on most Debian systems.
 
-It may be redistributed under the terms of the GNU GPL, Version 2
-found on Debian systems in the file /usr/share/common-licenses/GPL .
+License (Debian packaging):
+    The Debian packaging is licensed under the GPL, version 2 or any
+    later version, see /usr/share/common-licenses/GPL-2.

-- 
graphlcd-base packaging repository