diff --git a/debian/control b/debian/control index 34a0494fef2..1a3e6567b16 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: openerp-server Section: net Priority: optional Maintainer: Daniel Baumann -Build-Depends: debhelper (>= 7), dpatch, python-dev +Build-Depends: debhelper (>= 7), quilt, python-dev Build-Depends-Indep: python-lxml, python-xml, python-libxslt1, python-psycopg2 Standards-Version: 3.8.0 Homepage: http://www.openerp.com/ diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index ca43e8f060f..00000000000 --- a/debian/patches/00list +++ /dev/null @@ -1,3 +0,0 @@ -01-autobuild.dpatch -03-migrate.dpatch -04-shebang.dpatch diff --git a/debian/patches/01-autobuild.dpatch b/debian/patches/01-autobuild.patch similarity index 68% rename from debian/patches/01-autobuild.dpatch rename to debian/patches/01-autobuild.patch index 25b00dd8c63..eb1fb1e2d79 100644 --- a/debian/patches/01-autobuild.dpatch +++ b/debian/patches/01-autobuild.patch @@ -1,9 +1,5 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 01-autobuild.dpatch by Daniel Baumann -## -## DP: Disable modules check to make it buildable without X11. - -@DPATCH@ +Author: Daniel Baumann +Description: Disable modules check to make it buildable without X11. diff -Naurp openerp-server.orig/setup.py openerp-server/setup.py --- openerp-server.orig/setup.py 2008-11-03 21:33:56.000000000 +0000 diff --git a/debian/patches/03-migrate.dpatch b/debian/patches/02-migrate.patch similarity index 82% rename from debian/patches/03-migrate.dpatch rename to debian/patches/02-migrate.patch index 3bde7b143eb..3004042cb5b 100644 --- a/debian/patches/03-migrate.dpatch +++ b/debian/patches/02-migrate.patch @@ -1,9 +1,5 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 03-migrate.dpatch by Brian DeRocher -## -## DP: Correct SQL syntax in migrate script (Closes: #467517). - -@DPATCH@ +Author: Brian DeRocher +Description: Correct SQL syntax in migrate script (Closes: #467517). diff -Naurp openerp-server.orig/doc/migrate/3.4.0-4.0.0/pre.py openerp-server/doc/migrate/3.4.0-4.0.0/pre.py --- openerp-server.orig/doc/migrate/3.4.0-4.0.0/pre.py 2008-11-03 21:33:56.000000000 +0000 diff --git a/debian/patches/04-shebang.dpatch b/debian/patches/03-shebang.patch similarity index 77% rename from debian/patches/04-shebang.dpatch rename to debian/patches/03-shebang.patch index 12cda65a8cc..7add479b084 100644 --- a/debian/patches/04-shebang.dpatch +++ b/debian/patches/03-shebang.patch @@ -1,9 +1,5 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 04-shebang.dpatch by Daniel Baumann -## -## DP: Correcting shebang. - -@DPATCH@ +Author: Daniel Baumann +Description: Correcting shebang. diff -Naurp openerp-server.orig/bin/addons/document/ftpserver/ftpserver.py openerp-server/bin/addons/document/ftpserver/ftpserver.py --- openerp-server.orig/bin/addons/document/ftpserver/ftpserver.py 2008-12-16 11:06:22.000000000 +0000 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000000..6d5ba4c38b4 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +01-autobuild.patch +02-migrate.patch +03-shebang.patch diff --git a/debian/rules b/debian/rules index 9c75747afc4..83d9bfa54fe 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,9 @@ #!/usr/bin/make -f -include /usr/share/dpatch/dpatch.make +include /usr/share/quilt/quilt.make clean: clean-patched unpatch -clean-patched: patch-stamp +clean-patched: patch dh_testdir dh_testroot rm -f build-stamp @@ -15,9 +15,9 @@ clean-patched: patch-stamp dh_clean -build: patch-stamp +build: -install: build +install: patch dh_testdir dh_testroot dh_prep @@ -40,7 +40,7 @@ binary: binary-indep binary-arch: -binary-indep: build install +binary-indep: install dh_testdir dh_testroot dh_installchangelogs doc/Changelog