[Pkg-spca5xx-devel] r239 - in /gspca/trunk/debian: changelog compat control control.modules.in dirs rules

Fri May 30 05:24:16 UTC 2008

Author: kelmo-guest
Date: Fri May 30 05:24:16 2008
New Revision: 239

URL: http://svn.debian.org/wsvn/pkg-spca5xx/?sc=1&rev=239
Log:
* Remove dependency on cdbs, use dehhelper only in debian/rules.
* Bump debhelper compat level to 7, build depend on debhelper >= 7.
* Fix lintian warning about mispelt "Linux" in debian/control/*.

Removed:
    gspca/trunk/debian/dirs
Modified:
    gspca/trunk/debian/changelog
    gspca/trunk/debian/compat
    gspca/trunk/debian/control
    gspca/trunk/debian/control.modules.in
    gspca/trunk/debian/rules

Modified: gspca/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-spca5xx/gspca/trunk/debian/changelog?rev=239&op=diff
==============================================================================

--- gspca/trunk/debian/changelog (original)
+++ gspca/trunk/debian/changelog Fri May 30 05:24:16 2008
@@ -2,8 +2,11 @@
 
   * Drop hard dependency on linux-image package for the generated binary
     module package. Instead just Recommend it.
+  * Remove dependency on cdbs, use dehhelper only in debian/rules.
+  * Bump debhelper compat level to 7, build depend on debhelper >= 7.
+  * Fix lintian warning about mispelt "Linux" in debian/control/*.
 
- -- Kel Modderman <kel at otaku42.de>  Sun, 18 May 2008 22:44:39 +1000
+ -- Kel Modderman <kel at otaku42.de>  Fri, 30 May 2008 15:18:45 +1000
 
 gspca (01.00.20-1) unstable; urgency=low
 

Modified: gspca/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-spca5xx/gspca/trunk/debian/compat?rev=239&op=diff
==============================================================================
--- gspca/trunk/debian/compat (original)
+++ gspca/trunk/debian/compat Fri May 30 05:24:16 2008
@@ -1,1 +1,1 @@
-5
+7

Modified: gspca/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-spca5xx/gspca/trunk/debian/control?rev=239&op=diff
==============================================================================
--- gspca/trunk/debian/control (original)
+++ gspca/trunk/debian/control Fri May 30 05:24:16 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian spca5xx Maintainers <pkg-spca5xx-devel at lists.alioth.debian.org>
 Uploaders: Kel Modderman <kel at otaku42.de>, Stephen Birch <sgbirch at imsmail.org>, Otavio Salvador <otavio at debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.37), bzip2
+Build-Depends: debhelper (>= 7), bzip2
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-spca5xx/gspca/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-spca5xx/gspca/trunk/
@@ -11,10 +11,10 @@
 
 Package: gspca-source
 Architecture: all
-Depends: debhelper (>= 5.0.37), module-assistant, bzip2
+Depends: debhelper (>= 7), module-assistant, bzip2
 Suggests: kernel-package
 Description: source for the gspca v4l kernel module
- The gpsca video for linux (v4l) driver, provides support for
+ The gpsca video for Linux (v4l) driver, provides support for
  webcams and digital cameras based on the spca5xx range of chips
  manufactured by SunPlus, Sonix, Z-star, Vimicro, Conexant, Etoms,
  Mars-semi, Pixart and Transvision.

Modified: gspca/trunk/debian/control.modules.in
URL: http://svn.debian.org/wsvn/pkg-spca5xx/gspca/trunk/debian/control.modules.in?rev=239&op=diff
==============================================================================
--- gspca/trunk/debian/control.modules.in (original)
+++ gspca/trunk/debian/control.modules.in Fri May 30 05:24:16 2008
@@ -2,7 +2,7 @@
 Section: graphics
 Priority: optional
 Maintainer: Debian spca5xx Maintainers <pkg-spca5xx-devel at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.37), bzip2
+Build-Depends: debhelper (>= 7), bzip2
 Standards-Version: 3.7.3
 
 Package: gspca-modules-_KVERS_
@@ -12,7 +12,7 @@
 Conflicts: spca5xx-modules-_KVERS_
 Description: gspca modules for Linux (kernel _KVERS_)
  This package contains the set of loadable kernel modules for the
- gspca video for linux (v4l) driver.
+ gspca video for Linux (v4l) driver.
  .
  This package contains the compiled kernel modules for _KVERS_
  .

Modified: gspca/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-spca5xx/gspca/trunk/debian/rules?rev=239&op=diff
==============================================================================
--- gspca/trunk/debian/rules (original)
+++ gspca/trunk/debian/rules Fri May 30 05:24:16 2008
@@ -1,24 +1,55 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-install/gspca-source::
-	# Enforce executable bit on debian/rules, and create
-	# directory structure for modules source
+build: build-stamp
+build-stamp:
+	dh_testdir
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	dh_clean build-stamp
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	
 	install -D -m 0755 debian/rules.modules \
 		debian/tmp/modules/gspca/debian/rules
 	
-	# Prepare the other debian stuff
 	for f in *.modules.in control compat copyright changelog; do \
 		install -m 0644 debian/$$f \
 			debian/tmp/modules/gspca/debian/; \
 	done
 	
-	# Prepare upstream source
 	find . -path ./debian/\* -type d -prune -o -printf "%P\n" | \
-		egrep -v 'debian|*.err' | \
+		egrep -v 'debian|*.err|*-stamp' | \
 		cpio -admp debian/tmp/modules/gspca/
 		
-	# Prepare the debian source tarball
+	mkdir -p debian/gspca-source/usr/src/
 	tar jcf debian/gspca-source/usr/src/gspca.tar.bz2 \
 		-C debian/tmp modules
+
+binary-arch:
+# We have nothing to do by default.
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_install
+	dh_installdocs
+	dh_installchangelogs
+	dh_link
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build build-stamp clean install binary-indep binary-arch binary


