The following commit has been merged in the master branch:
commit ba944ac5ae5b996cd6c089ef3938197a85b84db3
Author: Nicolas Dandrimont <nicolas.dandrim...@crans.org>
Date:   Wed Feb 20 00:50:30 2013 +0100

    Update rules and d/clean to allow building twice from the same sourcedir

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..6f25d06
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+share/marionnet.conf
diff --git a/debian/rules b/debian/rules
index b7affcd..ba17bee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,11 @@
 %:
        dh $@ --with ocaml
 
+override_dh_auto_build:
+       cp -f po/messages.pot po/messages.pot.orig
+       cp -f .bzr/checkout/dirstate .bzr/checkout/dirstate.orig
+       dh_auto_build
+
 override_dh_auto_install:
        dh_auto_install
        rm debian/marionnet/usr/share/marionnet/COPYING # remove duplicate 
copyright file
@@ -18,6 +23,11 @@ override_dh_auto_install:
                mv debian/marionnet/usr/bin/marionnet.byte 
debian/marionnet/usr/bin/marionnet ; \
        fi
 
+override_dh_auto_clean:
+       dh_auto_clean
+       if [ -f po/messages.pot.orig ]; then mv po/messages.pot.orig 
po/messages.pot; fi
+       if [ -f .bzr/checkout/dirstate.orig ]; then mv 
.bzr/checkout/dirstate.orig .bzr/checkout/dirstate; fi
+
 # see https://launchpad.net/marionnet/trunk
 PACKAGE = marionnet
 SRC_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: 
\(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')

-- 
marionnet packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to