r7526 - in /general/nvram-wakeup/branches/lenny/debian: README.Debian changelog compat config control copyright examples patches/10_nvram-wakeup-mb.c.dpatch po/ postinst rules templates

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Sat Jan 3 04:51:16 UTC 2009


Author: tiber-guest
Date: Sat Jan  3 04:51:14 2009
New Revision: 7526

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7526
Log:
* Moved debconf installation instructions to README.Debian (Closes: #419444)
* Updated debian/copyright
* Added description to 10_nvram-wakeup-mb.c.dpatch
* Do not create /dev/rtc and /dev/nvram in postinst anymore - these devices
  should be automatically created on every installation (closes: #428694)
* Using COMPAT=5 now
* Bumped Standards-Version to 3.8.0
* Switched Build-System to cdbs, Build-Depend on cdbs

Added:
    general/nvram-wakeup/branches/lenny/debian/compat
Removed:
    general/nvram-wakeup/branches/lenny/debian/config
    general/nvram-wakeup/branches/lenny/debian/po/
    general/nvram-wakeup/branches/lenny/debian/postinst
    general/nvram-wakeup/branches/lenny/debian/templates
Modified:
    general/nvram-wakeup/branches/lenny/debian/README.Debian
    general/nvram-wakeup/branches/lenny/debian/changelog
    general/nvram-wakeup/branches/lenny/debian/control
    general/nvram-wakeup/branches/lenny/debian/copyright
    general/nvram-wakeup/branches/lenny/debian/examples
    general/nvram-wakeup/branches/lenny/debian/patches/10_nvram-wakeup-mb.c.dpatch
    general/nvram-wakeup/branches/lenny/debian/rules

Modified: general/nvram-wakeup/branches/lenny/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/general/nvram-wakeup/branches/lenny/debian/README.Debian?rev=7526&op=diff
==============================================================================
--- general/nvram-wakeup/branches/lenny/debian/README.Debian (original)
+++ general/nvram-wakeup/branches/lenny/debian/README.Debian Sat Jan  3 04:51:14 2009
@@ -1,5 +1,21 @@
 nvram-wakeup for Debian
------------------------
+=======================
+
+nvram access methods
+--------------------
+
+There are two ways the NVRAM can be accessed. To use direct I/O access you
+will have to specify the --directisa option. Alternatively you can use the
+nvram kernel module. If this kernel module is available, but not loaded,
+you may need to perform these steps:
+
+    - modprobe nvram
+    - add nvram to /etc/modules
+    - alternatively you can use modconf to reach the same result
+
+
+VDR integration
+---------------
 
 The original nvram-wakeup package has been created for the c't VDR project,
 where an additional package vdr-addon-nvram-wakeup installed the necessary
@@ -16,4 +32,5 @@
 
 SPECIALSHUTDOWN="lilo -R PowerOff ; shutdown -r now"
 
- -- Tobias Grimm <tg at e-tobi.net>,  Sun, 04 Jul 2004 12:54:00 +0200
+ -- Tobias Grimm <etobi at debian.org>  Sun, 23 Nov 2008 13:40:08 +0100
+

Modified: general/nvram-wakeup/branches/lenny/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/general/nvram-wakeup/branches/lenny/debian/changelog?rev=7526&op=diff
==============================================================================
--- general/nvram-wakeup/branches/lenny/debian/changelog (original)
+++ general/nvram-wakeup/branches/lenny/debian/changelog Sat Jan  3 04:51:14 2009
@@ -1,14 +1,24 @@
-nvram-wakeup (0.97-15) UNRELEASED; urgency=medium
-
+nvram-wakeup (0.97-15) unstable; urgency=medium
+
+  [ Tobias Grimm ]
   * Don't install /usr/sbin/time anymore. The functionallity of this tool can
     be replaced by `date` (e.g. `date -d "1970-01-01 1089365289 sec UTC` and
     `date -u -d "1970-01-01 1089365289 sec UTC`) (Closes: #425120)
   * Removed installation of set_timer (which used /usr/sbin/time) and install
     it as example only (release notes added to NEWS)
   * Removed 03_set_timer.dpatch
-  * Changed my maintainer email address
-
- -- Tobias Grimm <etobi at debian.org>  Fri, 02 Jan 2009 22:29:58 +0100
+  * Moved debconf installation instructions to README.Debian (Closes: #419444)
+  * Updated debian/copyright
+  * Added description to 10_nvram-wakeup-mb.c.dpatch
+
+  [ Thomas Schmidt ]
+  * Do not create /dev/rtc and /dev/nvram in postinst anymore - these devices
+    should be automatically created on every installation (closes: #428694)
+  * Using COMPAT=5 now
+  * Bumped Standards-Version to 3.8.0
+  * Switched Build-System to cdbs, Build-Depend on cdbs
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 03 Jan 2009 05:10:45 +0100
 
 nvram-wakeup (0.97-14) unstable; urgency=low
 

Added: general/nvram-wakeup/branches/lenny/debian/compat
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/general/nvram-wakeup/branches/lenny/debian/compat?rev=7526&op=file
==============================================================================
--- general/nvram-wakeup/branches/lenny/debian/compat (added)
+++ general/nvram-wakeup/branches/lenny/debian/compat Sat Jan  3 04:51:14 2009
@@ -1,0 +1,1 @@
+5

Modified: general/nvram-wakeup/branches/lenny/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/general/nvram-wakeup/branches/lenny/debian/control?rev=7526&op=diff
==============================================================================
--- general/nvram-wakeup/branches/lenny/debian/control (original)
+++ general/nvram-wakeup/branches/lenny/debian/control Sat Jan  3 04:51:14 2009
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <etobi at debian.org>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), dpatch, po-debconf
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>> 4.1.16), cdbs, dpatch
+Standards-Version: 3.8.0
 XS-Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/general/nvram-wakeup/trunk/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/general/nvram-wakeup/trunk/
 
 Package: nvram-wakeup
 Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, makedev
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: A tool to read/write the WakeUp time from/to the BIOS
  nvram-wakeup can read and write the wake up time in the BIOS 
  (via /dev/nvram on recent 2.4.x kernels or direct I/O port access). 

Modified: general/nvram-wakeup/branches/lenny/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/general/nvram-wakeup/branches/lenny/debian/copyright?rev=7526&op=diff
==============================================================================
--- general/nvram-wakeup/branches/lenny/debian/copyright (original)
+++ general/nvram-wakeup/branches/lenny/debian/copyright Sat Jan  3 04:51:14 2009
@@ -1,30 +1,36 @@
-This package was debianized by Tobias Grimm <tg at e-tobi.net> on
-Sat,  6 Dec 2003 16:29:23 +0200.
+Upstream Homepage:
+    http://sourceforge.net/projects/nvram-wakeup
 
-It was downloaded from http://sourceforge.net/projects/nvram-wakeup
-
-Upstream Author: Sergei Haller <Sergei.Haller at math.uni-giessen.de>
+Upstream Author:
+    Sergei Haller <Sergei.Haller at math.uni-giessen.de>
 
 Debian Maintainers:
-
-  Tobias Grimm <etobi at debian.org>
-  Thomas Schmidt <tschmidt at debian.org>
+    Tobias Grimm <tg at e-tobi.net>
+    Thomas Schmidt <tschmidt at debian.org>
 
 Copyright:
+    (C) 2001 - 2006 Sergei Haller
+    (C) 2002        Bernhard "Bero" Rosenkraenzer <bero at arklinux.org>
+    (C) 1996        Paul Gortmaker
+    (C) 2004 - 2008 Tobias Grimm
 
-  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.
+Copyright (Debian packaging):
+    (C) 2003 - 2008 Tobias Grimm, Thomas Schmidt
 
-  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.
+License:
+    This program is free software; you can redistribute it and/or modify
+    t 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.
 
-  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.
-  
-  see /usr/share/common-licenses/GPL
+    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.
+
+    see /usr/share/common-licenses/GPL

Modified: general/nvram-wakeup/branches/lenny/debian/examples
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/general/nvram-wakeup/branches/lenny/debian/examples?rev=7526&op=diff
==============================================================================
--- general/nvram-wakeup/branches/lenny/debian/examples (original)
+++ general/nvram-wakeup/branches/lenny/debian/examples Sat Jan  3 04:51:14 2009
@@ -1,2 +1,4 @@
 set_timer
 set_timer.8
+VDR/vdrshutdown
+nvram-wakeup.conf

Modified: general/nvram-wakeup/branches/lenny/debian/patches/10_nvram-wakeup-mb.c.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/general/nvram-wakeup/branches/lenny/debian/patches/10_nvram-wakeup-mb.c.dpatch?rev=7526&op=diff
==============================================================================
--- general/nvram-wakeup/branches/lenny/debian/patches/10_nvram-wakeup-mb.c.dpatch (original)
+++ general/nvram-wakeup/branches/lenny/debian/patches/10_nvram-wakeup-mb.c.dpatch Sat Jan  3 04:51:14 2009
@@ -1,8 +1,8 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_nvram-wakeup-mb.c.dpatch by Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>
+## 10_nvram-wakeup-mb.c.dpatch by Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Adds additional BIOS information for autodetecting more mainboards.
 
 @DPATCH@
 diff -urNad nvram-wakeup-0.97/nvram-wakeup-mb.c /tmp/dpep.V8670c/nvram-wakeup-0.97/nvram-wakeup-mb.c

Modified: general/nvram-wakeup/branches/lenny/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/general/nvram-wakeup/branches/lenny/debian/rules?rev=7526&op=diff
==============================================================================
--- general/nvram-wakeup/branches/lenny/debian/rules (original)
+++ general/nvram-wakeup/branches/lenny/debian/rules Sat Jan  3 04:51:14 2009
@@ -1,90 +1,15 @@
 #!/usr/bin/make -f
-# 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/class/makefile.mk
+# include /usr/share/cdbs/1/rules/dpatch.mk
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
+DEB_INSTALL_CHANGELOGS_ALL = HISTORY
 
-# include dpatch stuff
-include /usr/share/dpatch/dpatch.make
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
-
-
-build: patch-stamp build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	touch build-stamp
-
-clean: clean-patched unpatch
-
-clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Update debconf-templates:
-	debconf-updatepo
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
-	rm -f debian/guess-helper.mo
-	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 nvram-wakeup.conf VDR/vdrshutdown
-	dh_installmenu
-	dh_installcron
-	dh_installman
-	dh_installinfo
-	dh_installchangelogs HISTORY
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch \
-        configure
+#
+# TODO: This breaks DEB_BUILD_OPTIONS,
+# Better hardcode the essential compiler switches in the upstream source
+# instead of making them overrideable in user overridable variables like
+# CFLAGS!
+#
+DEB_MAKE_INVOKE := $(DEB_MAKE_ENVVARS) make -C $(DEB_BUILDDIR)




More information about the pkg-vdr-dvb-changes mailing list