[Debian-live-changes] r1820 - in dists/trunk/live-sysvinit: debian manpages

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-28 07:39:32 +0000 (Mon, 28 May 2007)
New Revision: 1820

Modified:
   dists/trunk/live-sysvinit/debian/control
   dists/trunk/live-sysvinit/debian/rules
   dists/trunk/live-sysvinit/manpages/live-sysvinit.en.7
Log:


Modified: dists/trunk/live-sysvinit/debian/control
===================================================================
--- dists/trunk/live-sysvinit/debian/control	2007-05-28 07:37:52 UTC (rev 1819)
+++ dists/trunk/live-sysvinit/debian/control	2007-05-28 07:39:32 UTC (rev 1820)
@@ -3,15 +3,14 @@
 Priority: optional
 Maintainer: Debian Live <debian-live-devel at lists.alioth.debian.org>
 Uploaders: Daniel Baumann <daniel at debian.org>, Marco Amadori <marco.amadori at gmail.com>
-Build-Depends: debhelper (>= 5), lsb-release
+Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/debian-live/dists/trunk/live-sysvinit/
 XS-VCS-Browse: http://svn.debian.org/wsvn/debian-live/dists/trunk/live-sysvinit/
 
 Package: live-sysvinit
 Architecture: all
-Depends: ${misc:Depends}, live-sysvinit, eject, file, initramfs-tools, sudo, user-setup
-Description: Debian Live initramfs hook
+Description: Debian Live sysvinit scripts
  live-initramfs is a hook for the initramfs-tools, used to generate a initramfs
  capable to boot live systems, such as those created by live-helper. This
  includes the Debian Live isos, netboot tarballs, and usb stick images.

Modified: dists/trunk/live-sysvinit/debian/rules
===================================================================
--- dists/trunk/live-sysvinit/debian/rules	2007-05-28 07:37:52 UTC (rev 1819)
+++ dists/trunk/live-sysvinit/debian/rules	2007-05-28 07:39:32 UTC (rev 1820)
@@ -3,36 +3,17 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
 upstream:
 	# Needs: subversion
-	cd .. && svn co svn://svn.debian.org/debian-live/dists/trunk/live-initramfs || true
+	cd .. && svn co svn://svn.debian.org/debian-live/dists/trunk/live-sysvinit || true
 	find . -type d -name .svn | xargs rm -rf
 
-build: build-stamp
-build-stamp:
-	dh_testdir
+build:
 
-	# Building package
-	CFLAGS="$(CFLAGS)" $(MAKE)
-
-	touch build-stamp
-
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
 
-	# Cleaning package
-	$(MAKE) clean
-
 	dh_clean
 
 install: build
@@ -42,41 +23,27 @@
 	dh_installdirs
 
 	# Installing package
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/live-initramfs
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/live-sysvinit
 
 	# Removing double files
-	rm -f debian/live-initramfs/usr/share/doc/live-initramfs/COPYING
-	rm -f debian/live-initramfs/usr/share/doc/live-initramfs/ChangeLog
-	mv debian/live-initramfs/usr/share/doc/live-initramfs/ChangeLog.casper debian/live-initramfs/usr/share/doc/live-initramfs/changelog.casper
+	rm -f debian/live-sysvinit/usr/share/doc/live-sysvinit/COPYING
+	rm -f debian/live-sysvinit/usr/share/doc/live-sysvinit/ChangeLog
 
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i docs/ChangeLog
-	dh_installdocs -i
-	dh_install -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
 binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs -a docs/ChangeLog
-	dh_installdocs -a
-	dh_install -a
-	dh_installinit -a --no-restart-on-upgrade --no-start -- start 89 0 6 .
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
 
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs docs/ChangeLog
+	dh_installdocs
+	dh_install
+	dh_installinit --no-restart-on-upgrade --no-start -- start 89 0 6 .
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install

Modified: dists/trunk/live-sysvinit/manpages/live-sysvinit.en.7
===================================================================
--- dists/trunk/live-sysvinit/manpages/live-sysvinit.en.7	2007-05-28 07:37:52 UTC (rev 1819)
+++ dists/trunk/live-sysvinit/manpages/live-sysvinit.en.7	2007-05-28 07:39:32 UTC (rev 1820)
@@ -1,7 +1,7 @@
 .TH LIVE\-SYSVINIT 7 "2007\-06\-04" "1.87.6" "live\-sysvinit"
 
 .SH NAME
-live\-initramfs \- Debian Live sysv init scripts
+live\-initramfs \- Debian Live sysvinit scripts
 
 .SH DESCRIPTION
 live\-sysvinit contains init scripts for various Debian Live customizations.
@@ -9,7 +9,7 @@
 .SH BOOT OPTIONS
 Here is the complete list of recognized boot parameters by live\-sysvinit.
 .IP "\fBupgrade\fR" 4
-performes a apt-get update/apt-get upgrace cycle while booting (experimental).
+performes an apt-get update/apt-get upgrace cycle while booting (experimental).
 
 .SH SEE ALSO
 \fIlive\-helper\fR(7)