[Pkg-ocaml-maint-commits] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr407-17-g66a0b69

2013-02-19 Thread Lucas Nussbaum
The following commit has been merged in the master branch:
commit eb391562072beea048249017dcd69cc5b992ceb9
Author: Lucas Nussbaum lu...@debian.org
Date:   Mon Feb 18 21:02:08 2013 +0100

Remove .bzr dir from future snapshots

diff --git a/debian/rules b/debian/rules
index 9ef4915..f091f25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ get-orig-source:
rm -rf get-orig-source $(TARBALL)
mkdir get-orig-source
bzr branch -r $(BZR_REVISION) lp:$(PACKAGE)/trunk 
get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig
+   rm -rf get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig/.bzr
GZIP=--best tar czf $(TARBALL) -C get-orig-source 
$(PACKAGE)-$(SRC_VERSION).orig
rm -rf get-orig-source
echo   $(TARBALL) created; move it to the right destination to build 
the package

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


[Pkg-ocaml-maint-commits] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr407-17-g66a0b69

2013-02-19 Thread Lucas Nussbaum
The following commit has been merged in the master branch:
commit 66a0b69cf81769e2559b889532244560f6caee42
Author: Lucas Nussbaum lu...@debian.org
Date:   Tue Feb 19 22:32:04 2013 +0100

Update changelog, drop TODO file

diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index b3de613..000
--- a/debian/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-- /etc/init.d
-- clean up .native vs .byte mess
-- script to download kernels + filesystems
diff --git a/debian/changelog b/debian/changelog
index 6d3392e..044fe29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-marionnet (0.90.6+bzr407-1) UNRELEASED; urgency=low
+marionnet (0.90.6+bzr407-1) unstable; urgency=low
 
   * Initial release (Closes: #489392)
+  * This is a preliminary package for marionnet. Missing at the moment:
+- script to help download kernels/filesystems
+- init script to start the daemon
 
- -- Lucas Nussbaum lu...@debian.org  Wed, 13 Feb 2013 09:05:14 +0100
+ -- Lucas Nussbaum lu...@debian.org  Tue, 19 Feb 2013 22:31:50 +0100

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


[Pkg-ocaml-maint-commits] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr407-17-g66a0b69

2013-02-19 Thread Lucas Nussbaum
The following commit has been merged in the master branch:
commit a7aa652ba37cacfd56a9022fbe96824a9332c00e
Author: Lucas Nussbaum lu...@debian.org
Date:   Tue Feb 19 22:13:17 2013 +0100

remove duplicate copyright file and rename binaries

diff --git a/debian/rules b/debian/rules
index f091f25..b7affcd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,19 @@
 %:
dh $@ --with ocaml
 
+override_dh_auto_install:
+   dh_auto_install
+   rm debian/marionnet/usr/share/marionnet/COPYING # remove duplicate 
copyright file
+   if [ -e debian/marionnet/usr/sbin/marionnet-daemon.native ]; then \
+   mv debian/marionnet/usr/sbin/marionnet-daemon.native 
debian/marionnet/usr/sbin/marionnet-daemon ; \
+   mv debian/marionnet/usr/bin/marionnet.native 
debian/marionnet/usr/bin/marionnet ; \
+   rm debian/marionnet/usr/sbin/marionnet-daemon.byte ; \
+   rm debian/marionnet/usr/bin/marionnet.byte ; \
+   else \
+   mv debian/marionnet/usr/sbin/marionnet-daemon.byte 
debian/marionnet/usr/sbin/marionnet-daemon ;\
+   mv debian/marionnet/usr/bin/marionnet.byte 
debian/marionnet/usr/bin/marionnet ; \
+   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