resynced debian/

git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/menuorg/trunk@5952 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f

12 files changed, 45 insertions, 136 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 3fa36a1..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,6 +0,0 @@
-vdr-plugin-menuorg for Debian
------------------------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- Tobias Grimm <tg@e-tobi.net>  Sun, 22 Jul 2007 00:25:20 +0200
diff --git a/debian/changelog b/debian/changelog
index e04763a..dc598d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,7 @@
-vdr-plugin-menuorg (0.0.1-1) unstable; urgency=low
+vdr-plugin-menuorg (0.1-1) UNRELEASED; urgency=low
 
-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
-  
-  Important:
-  
-  If you intend to make this plugin available to others, please create an
-  ITP-bug (see http://www.debian.org/devel/wnpp ) and contact the
-  Debian VDR packaging team: pkg-vdr-dvb-devel@lists.alioth.debian.org
+  * NOT RELEASED YET
+  * Initial release
 
  -- Tobias Grimm <tg@e-tobi.net>  Sun, 22 Jul 2007 00:25:20 +0200
 
diff --git a/debian/control b/debian/control
index b894fd5..6dc55ba 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,11 @@ Standards-Version: 3.7.2
 Package: vdr-plugin-menuorg
 Architecture: any
 Depends: ${shlibs:Depends}, ${vdr:Depends}
-Description: organize your Mainmenu
- With this plugin you can organize your Mainmenu.
- It use the menu definition file from the setup plugin.
+Conflicts: vdr-plugin-submenu (<< 0.0.2-35)
+Replaces: vdr-plugin-submenu (<< 0.0.2-35)
+Description: A VDR plug-in to reorganize the OSD main menu
+ This plug-in for the Linux Video Disc Recorder VDR, allows the main menu in
+ VDR's On Screen Display to be reorganized. The order of the displayed menu
+ items can be changed and sub menus can be created. Besides this, additional
+ "command" menu items can be added, that will execute any system commands.
 XB-VDR-Patchlevel: ${vdr:Patchlevel}
diff --git a/debian/copyright b/debian/copyright
index 3bbb511..f60b0dc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,21 +1,38 @@
-This package was debianized by Tobias Grimm <tg@e-tobi.net> on
-Sun, 22 Jul 2007 00:25:20 +0200.
+Upstream Homepage:
+    http://www.e-tobi.net/blog/pages/vdr-menuorg
 
-It was downloaded from <fill in http/ftp site>
+Upstream Authors:
+    Thomas Creutz <thomas.creutz@gmx.de>
+    Tobias Grimm <tg@e-tobi.net>
 
-Upstream Author: <put author(s) name and email here>
+Debian Maintainers:
+    Tobias Grimm <tg@e-tobi.net>
 
-Copyright: <put the year(s) of the copyright, and the names of the
-            copyright holder(s) here>
+Copyright:
+    (C) 2007 Thomas Creutz, Tobias Grimm 
 
-
-The Debian packaging is (C) 2007, Tobias Grimm <tg@e-tobi.net> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+Copyright (Debian packaging):
+    (C) 2007 Tobias Grimm
 
 License:
-
-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 .
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
+    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 St, 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 on most Debian systems.
+
+License (Debian packaging):
+    The Debian packaging is licensed under the GPL, version 2 or any
+    later version, see /usr/share/common-licenses/GPL.
diff --git a/debian/install b/debian/install
index 32518bc..5c38b81 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,4 @@
 libvdr-menuorg.so.*        usr/lib/vdr/plugins/
 menuorg.xml                usr/share/vdr-plugin-menuorg/
 menuorg.dtd                usr/share/vdr-plugin-menuorg/
+vdr-submenu2menuorg        usr/bin/
diff --git a/debian/links.ex b/debian/links.ex
deleted file mode 100644
index bd1de72..0000000
--- a/debian/links.ex
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/vdr-plugin-menuorg/menuorg    var/lib/vdr/plugins/menuorg
diff --git a/debian/postinst b/debian/postinst
index 7464457..8f8346d 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -40,5 +40,3 @@ esac
 #DEBHELPER#
 
 exit 0
-
-
diff --git a/debian/postrm b/debian/postrm
index b823ff0..965339e 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -38,5 +38,3 @@ esac
 #DEBHELPER#
 
 exit 0
-
-
diff --git a/debian/preinst.ex b/debian/preinst.ex
deleted file mode 100644
index c067c34..0000000
--- a/debian/preinst.ex
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# preinst script for vdr-plugin-menuorg
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    install|upgrade)
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/prerm.ex b/debian/prerm.ex
deleted file mode 100644
index 1f82830..0000000
--- a/debian/prerm.ex
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# prerm script for vdr-plugin-menuorg
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..7155818
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=2
+http://www.e-tobi.net/blog/pages/vdr-menuorg .*/files/vdr-menuorg-(.*)\.tar\.gz
diff --git a/debian/watch.ex b/debian/watch.ex
deleted file mode 100644
index 7d65cb6..0000000
--- a/debian/watch.ex
+++ /dev/null
@@ -1,22 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-# Uncomment to examine a Webpage 
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php vdr-plugin-menuorg-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/vdr-plugin-menuorg-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/vdr-plugin-menuorg-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge, for debscripts >= 2.9
-# http://sf.net/vdr-plugin-submenu/vdr-plugin-menuorg-(.*)\.tar\.gz
-
-