Using quilt rather than dpatch.
bzr revid: p_christ@hol.gr-20090421090641-hav4l9vkdmvu8qdj
This commit is contained in:
parent
f97bf976ff
commit
ac492ca7bb
|
@ -2,7 +2,7 @@ Source: openerp-server
|
||||||
Section: net
|
Section: net
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: Daniel Baumann <daniel@debian.org>
|
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
|
Build-Depends-Indep: python-lxml, python-xml, python-libxslt1, python-psycopg2
|
||||||
Standards-Version: 3.8.0
|
Standards-Version: 3.8.0
|
||||||
Homepage: http://www.openerp.com/
|
Homepage: http://www.openerp.com/
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
01-autobuild.dpatch
|
|
||||||
03-migrate.dpatch
|
|
||||||
04-shebang.dpatch
|
|
|
@ -1,9 +1,5 @@
|
||||||
#!/bin/sh /usr/share/dpatch/dpatch-run
|
Author: Daniel Baumann <daniel@debian.org>
|
||||||
## 01-autobuild.dpatch by Daniel Baumann <daniel@debian.org>
|
Description: Disable modules check to make it buildable without X11.
|
||||||
##
|
|
||||||
## DP: Disable modules check to make it buildable without X11.
|
|
||||||
|
|
||||||
@DPATCH@
|
|
||||||
|
|
||||||
diff -Naurp openerp-server.orig/setup.py openerp-server/setup.py
|
diff -Naurp openerp-server.orig/setup.py openerp-server/setup.py
|
||||||
--- openerp-server.orig/setup.py 2008-11-03 21:33:56.000000000 +0000
|
--- openerp-server.orig/setup.py 2008-11-03 21:33:56.000000000 +0000
|
|
@ -1,9 +1,5 @@
|
||||||
#!/bin/sh /usr/share/dpatch/dpatch-run
|
Author: Brian DeRocher <brian@derocher.org>
|
||||||
## 03-migrate.dpatch by Brian DeRocher <brian@derocher.org>
|
Description: Correct SQL syntax in migrate script (Closes: #467517).
|
||||||
##
|
|
||||||
## DP: Correct SQL syntax in migrate script (Closes: #467517).
|
|
||||||
|
|
||||||
@DPATCH@
|
|
||||||
|
|
||||||
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
|
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
|
--- openerp-server.orig/doc/migrate/3.4.0-4.0.0/pre.py 2008-11-03 21:33:56.000000000 +0000
|
|
@ -1,9 +1,5 @@
|
||||||
#!/bin/sh /usr/share/dpatch/dpatch-run
|
Author: Daniel Baumann <daniel@debian.org>
|
||||||
## 04-shebang.dpatch by Daniel Baumann <daniel@debian.org>
|
Description: Correcting shebang.
|
||||||
##
|
|
||||||
## DP: Correcting shebang.
|
|
||||||
|
|
||||||
@DPATCH@
|
|
||||||
|
|
||||||
diff -Naurp openerp-server.orig/bin/addons/document/ftpserver/ftpserver.py openerp-server/bin/addons/document/ftpserver/ftpserver.py
|
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
|
--- openerp-server.orig/bin/addons/document/ftpserver/ftpserver.py 2008-12-16 11:06:22.000000000 +0000
|
|
@ -0,0 +1,3 @@
|
||||||
|
01-autobuild.patch
|
||||||
|
02-migrate.patch
|
||||||
|
03-shebang.patch
|
|
@ -1,9 +1,9 @@
|
||||||
#!/usr/bin/make -f
|
#!/usr/bin/make -f
|
||||||
|
|
||||||
include /usr/share/dpatch/dpatch.make
|
include /usr/share/quilt/quilt.make
|
||||||
|
|
||||||
clean: clean-patched unpatch
|
clean: clean-patched unpatch
|
||||||
clean-patched: patch-stamp
|
clean-patched: patch
|
||||||
dh_testdir
|
dh_testdir
|
||||||
dh_testroot
|
dh_testroot
|
||||||
rm -f build-stamp
|
rm -f build-stamp
|
||||||
|
@ -15,9 +15,9 @@ clean-patched: patch-stamp
|
||||||
|
|
||||||
dh_clean
|
dh_clean
|
||||||
|
|
||||||
build: patch-stamp
|
build:
|
||||||
|
|
||||||
install: build
|
install: patch
|
||||||
dh_testdir
|
dh_testdir
|
||||||
dh_testroot
|
dh_testroot
|
||||||
dh_prep
|
dh_prep
|
||||||
|
@ -40,7 +40,7 @@ binary: binary-indep
|
||||||
|
|
||||||
binary-arch:
|
binary-arch:
|
||||||
|
|
||||||
binary-indep: build install
|
binary-indep: install
|
||||||
dh_testdir
|
dh_testdir
|
||||||
dh_testroot
|
dh_testroot
|
||||||
dh_installchangelogs doc/Changelog
|
dh_installchangelogs doc/Changelog
|
||||||
|
|
Loading…
Reference in New Issue