Make debian-develop identical to develop branch

diff --git a/make_install_file.sh b/make_install_file.sh
deleted file mode 100755 (executable)
index 96b50cf..0000000
--- a/make_install_file.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-VERSION=$(head -n 1 debian/changelog | sed -r 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/g')
-INSTALL_PATH="usr/src/archipelago-kernel-dkms-$VERSION"
-
-echo "debian/archipelago-kernel-dkms-files/Makefile $INSTALL_PATH"
-git ls-files --directory xseg | sed 's/.*git.*//' | sed 's,\(.*\)\/\(.*\),\1\/\2 '"$INSTALL_PATH"'\/\1,'
-#find xseg -path "*git*" -prune -o -type f -a -print | sed 's,\(.*\)\/\(.*\),\1\/\2 '"$INSTALL_PATH"'\/\1,'
-

diff --git a/make_pkg.sh b/make_pkg.sh
deleted file mode 100755 (executable)
index 1d3414a..0000000
--- a/make_pkg.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash 
-
-
-#./make_install_file.sh > debian/archipelago-kernel-dkms.install 
-#git add debian/archipelago-kernel-dkms.install
-export LD_LIBRARY_PATH=$PWD/xseg/lib:$LD_LIBRARY_PATH
-git-buildpackage --git-upstream-branch=$1 \
-                --git-debian-branch=$2 \
-                --git-export=INDEX \
-                --git-ignore-new

diff --git a/xseg/envsetup b/xseg/envsetup
index a0528a3..b4e011b 100755 (executable)
--- a/xseg/envsetup
+++ b/xseg/envsetup
@@ -77,7 +77,7 @@ if [ "$1" = "show" ]; then
        echo "export XSEG_DIRS="${XSEG_DIRS}
        echo "export XSEG_DOMAIN_DIRS="${XSEG_DOMAIN_DIRS}
        echo "export PATH="${PATH}
-       echo "export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"
+       echo "export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}
 else
        if [ -z "${NONINTERACTIVE}" ]; then
                [ -z "$SHELL" ] && SHELL=/bin/bash

diff --git a/xseg/peers/user/Makefile b/xseg/peers/user/Makefile
index 39627b7..abee9f5 100644 (file)
--- a/xseg/peers/user/Makefile
+++ b/xseg/peers/user/Makefile
@@ -97,7 +97,7 @@ vlmc-xseg: vlmc-tool.c $(BASE)/xseg/xseg.h
 install:
        install -d $(DESTDIR)$(bindir)
        @for p in $(PEERS); do\
-               install -o root -g root -m 755 -t $(DESTDIR)$(bindir) $$p ; \
+               install -o 0 -g 0 -m 755 -t $(DESTDIR)$(bindir) $$p ; \
        done
 
 install-src:

diff --git a/xseg/peers/user/pfiled.c b/xseg/peers/user/pfiled.c
index 1d42149..ef6d22e 100644 (file)
--- a/xseg/peers/user/pfiled.c
+++ b/xseg/peers/user/pfiled.c
@@ -1123,6 +1123,7 @@ int main(int argc, char **argv)
                        return -1;
                }
        }
+
        if (cmdline_daemon){
                if (daemon(0, 1) < 0){
                        perr(PFE, 0, "Cannot daemonize");
@@ -1133,7 +1134,8 @@ int main(int argc, char **argv)
        setup_signals();
        if (pid_fd > 0)
                pidfile_write(pid_fd);
-       
+
+
        if (pfiled_init(&pfiled) < 0){
                r = -1;
                goto out;
@@ -1144,4 +1146,5 @@ out:
        if (pid_fd > 0)
                pidfile_remove(cmdline_pidfile, pid_fd);
        return r;
+
 }