Using quilt rather than dpatch.

bzr revid: p_christ@hol.gr-20090421090641-0nhtv4ks4ahkpu23
This commit is contained in:
Daniel Baumann 2009-04-21 12:06:41 +03:00 committed by P. Christeas
parent 43b8d506e8
commit 1a825578e1
7 changed files with 15 additions and 27 deletions

2
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: openerp-server
Section: net
Priority: optional
Maintainer: Daniel Baumann <daniel@debian.org>
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/

View File

@ -1,3 +0,0 @@
01-autobuild.dpatch
03-migrate.dpatch
04-shebang.dpatch

View File

@ -1,9 +1,5 @@
#!/bin/sh /usr/share/dpatch/dpatch-run
## 01-autobuild.dpatch by Daniel Baumann <daniel@debian.org>
##
## DP: Disable modules check to make it buildable without X11.
@DPATCH@
Author: Daniel Baumann <daniel@debian.org>
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

View File

@ -1,9 +1,5 @@
#!/bin/sh /usr/share/dpatch/dpatch-run
## 03-migrate.dpatch by Brian DeRocher <brian@derocher.org>
##
## DP: Correct SQL syntax in migrate script (Closes: #467517).
@DPATCH@
Author: Brian DeRocher <brian@derocher.org>
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

View File

@ -1,9 +1,5 @@
#!/bin/sh /usr/share/dpatch/dpatch-run
## 04-shebang.dpatch by Daniel Baumann <daniel@debian.org>
##
## DP: Correcting shebang.
@DPATCH@
Author: Daniel Baumann <daniel@debian.org>
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

3
debian/patches/series vendored Normal file
View File

@ -0,0 +1,3 @@
01-autobuild.patch
02-migrate.patch
03-shebang.patch

10
debian/rules vendored
View File

@ -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