Convert to 3.0 (quilt) format

diff --git a/debian/changelog b/debian/changelog
index 896a82bfb0a4ce0e90b26e09cc2ac570f1c01f7a..ae4486e1b34109a837c03accbed808a4b686a1b7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+omnibook (2:2.20070211+svn20090714b-3) unstable; urgency=low
+
+  * Converted source package to 3.0 (quilt) format
+  * Added watch file
+  * Fixed build dependencies
+  * Adjusted module standards version to 3.8.3
+
+ -- Julien Valroff <julien@kirya.net>  Fri, 01 Jan 2010 17:51:34 +0100
+
+omnibook (2:2.20070211+svn20090714b-2) unstable; urgency=low
+
+  * Bumped Standards Version to 3.8.3 (no changes needed)
+
+ -- Julien Valroff <julien@kirya.net>  Fri, 21 Aug 2009 14:01:34 +0200
+
 omnibook (2:2.20070211+svn20090714b-1) unstable; urgency=low
 
   * New SVN snapshot:

diff --git a/debian/control b/debian/control
index bbcd4e733c362ddffbab8a2711ee6ce9e5ae7bb5..28c35afe4a407e122f8280538fb97cdb688edb5f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,16 @@ Source: omnibook
 Section: misc
 Priority: optional
 Maintainer: Julien Valroff <julien@kirya.net>
-Build-Depends: debhelper (>> 7.0.0), dpatch, bzip2
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>> 7.0.0)
+Build-Depends-Indep: bzip2
+Standards-Version: 3.8.3
 Homepage: http://omnibook.sf.net
 Vcs-Svn: https://omnibook.svn.sourceforge.net/svnroot/omnibook/omnibook/trunk
 Vcs-Browser: http://omnibook.svn.sourceforge.net/viewvc/omnibook/
 
 Package: omnibook-source
 Architecture: all
-Depends: debhelper (>= 4.0.0), make, module-assistant, kernel-package, bzip2, dpatch
+Depends: debhelper (>= 7.0.0), make, module-assistant, kernel-package, bzip2
 Description: Source for the omnibook driver
  This package contains the loadable kernel modules for the HP OmniBooks,
  Pavilions, Toshiba Satellites and some other laptops manufactured by

diff --git a/debian/control.modules.in b/debian/control.modules.in
index a06acc2c3046b9aab5f984143762da84c37d5612..96311040a5c30d39fc8214fbd62953559d212724 100644 (file)
--- a/debian/control.modules.in
+++ b/debian/control.modules.in
@@ -3,7 +3,7 @@ Section: misc
 Priority: optional
 Maintainer: Julien Valroff <julien@kirya.net>
 Build-Depends: debhelper (>> 7.0.0)
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 
 Package: omnibook-module-_KVERS_
 Architecture: i386 amd64

diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644 (file)
index 08e0198..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_disable-debug

diff --git a/debian/patches/01_disable-debug.dpatch b/debian/patches/01_disable-debug.diff
similarity index 70%
rename from debian/patches/01_disable-debug.dpatch
rename to debian/patches/01_disable-debug.diff
index ae863da3cd7de05e700e91b59bfedb7ec84322e2..cc1480ee3ab999eb4242f249e5ad363d43a770bd 100755 (executable)
--- a/debian/patches/01_disable-debug.dpatch
+++ b/debian/patches/01_disable-debug.diff
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_disable-debug.dpatch by  <julien@kirya.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+Description: Disable debug flag
+Author: Julien Valroff <julien@kirya.net>
+Forwarded: not-needed
 
-@DPATCH@
 diff -urNad omnibook~/Makefile omnibook/Makefile
 --- omnibook~/Makefile 2007-04-01 11:37:03.000000000 +0200
 +++ omnibook/Makefile  2007-05-26 15:20:41.000000000 +0200

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..7e6d94e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_disable-debug.diff

diff --git a/debian/rules b/debian/rules
index 187600424be5cac7db7e338a48b934f517efa217..176f096bb4d12ca487789aba15551aeb83d1a84c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,6 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -36,22 +34,22 @@ build-arch-stamp:
        dh_testdir
        touch build-arch-stamp
 
-build-indep: patch configure-stamp build-indep-stamp
+build-indep: configure-stamp build-indep-stamp
 build-indep-stamp:
        dh_testdir
 
        touch build-indep-stamp
 
-build: patch build-arch build-indep
+build: build-arch build-indep
 
-clean: unpatch
+clean:
        dh_testdir
        rm -f build-arch-stamp build-indep-stamp configure-stamp
 
        dh_clean
 
 install: DH_OPTIONS=
-install: patch build
+install: build
        dh_testdir
        dh_testroot
        dh_prep

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..6a6761a
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://sf.net/omnibook/omnibook-(.*)\.tar\.gz
+