- Using gettext / vdr 1.5.18 now

- remember cursor position when entering submenu
- updated copyright header


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

4 files changed, 12 insertions, 84 deletions

diff --git a/debian/control b/debian/control
index 94c8f0a..74b7d2a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: vdr-plugin-menuorg
 Section: misc
 Priority: extra
 Maintainer: Tobias Grimm <tg@e-tobi.net>
-Build-Depends: debhelper (>= 5), vdr-dev (>= 1.4.7-2ctvdr1), libxml++2.6-dev, libglibmm-2.4-dev
+Build-Depends: debhelper (>= 5), cdbs, vdr-dev (>= 1.4.7-2ctvdr1), libxml++2.6-dev, libglibmm-2.4-dev
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-menuorg
diff --git a/debian/copyright b/debian/copyright
index f60b0dc..b12634b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream Homepage:
 
 Upstream Authors:
     Thomas Creutz <thomas.creutz@gmx.de>
-    Tobias Grimm <tg@e-tobi.net>
+    Tobias Grimm <vdr@e-tobi.net>
 
 Debian Maintainers:
     Tobias Grimm <tg@e-tobi.net>
diff --git a/debian/install b/debian/install
index ec489ee..0d5079c 100644
--- a/debian/install
+++ b/debian/install
@@ -3,3 +3,4 @@ menuorg.xml                usr/share/vdr-plugin-menuorg/
 menuorg.dtd                usr/share/vdr-plugin-menuorg/
 debian/menuorg.xml.minimum usr/share/vdr-plugin-menuorg/
 vdr-submenu2menuorg        usr/bin/
+debian/tmp/usr/share/locale
diff --git a/debian/rules b/debian/rules
index ca4b1db..bef6d5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,93 +1,20 @@
 #! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+#include /usr/share/cdbs/1/rules/dpatch.mk
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+DEB_INSTALL_CHANGELOGS_ALL = HISTORY
 
-# To use dpatch uncomment the following line and set Build-Depends to dpatch
-# DPATCH=yes
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
+               LOCALEDIR=debian/tmp/usr/share/locale
 
-ifdef DPATCH
-include /usr/share/dpatch/dpatch.make
-else
-patch:
-patch-stamp:
-unpatch:
-endif
-
-MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
-
-configure: configure-stamp
-configure-stamp: patch-stamp
-	dh_testdir
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
+common-build-arch::
 	$(MAKE) all $(MAKE_OPTIONS)
-	touch build-stamp
 
-clean: clean-patched unpatch
-clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	-$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+cleanbuilddir::
+	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 	rm -f libvdr-*.so.*
-	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	dh_install
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-#	dh_installdebconf
-	dh_installdocs
-	dh_installexamples
-#	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installman
-#	dh_installinfo
-#	dh_undocumented
-	dh_installchangelogs HISTORY
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_makeshlibs
-	dh_installdeb
-#	dh_perl
-	dh_shlibdeps
+common-binary-predeb-arch::
 	sh /usr/share/vdr-dev/patchlevel.sh subst
 	sh /usr/share/vdr-dev/dependencies.sh
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure \
-        clean-patched patch unpatch