rename package from lxc to lxc-pve

Debian standard lxc package is old, put use epoch 1 to
force installation. I do not want to deal with epoch versions,
so we use our own package name instead.

diff --git a/Makefile b/Makefile
index 72644a2919eb2318edcdb29c58bc10ac7186127d..c5f9b0a202795bcea5912f7ed571d69ceb22a1ea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 RELEASE=4.0
 
-PACKAGE=lxc
+PACKAGE=lxc-pve
 LXCVER=1.1.1
-DEBREL=pve1
+DEBREL=1
 
-SRCDIR=${PACKAGE}
+SRCDIR=lxc
 SRCTAR=${SRCDIR}.tgz
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)

diff --git a/debian/changelog b/debian/changelog
index 85ff11b3ea3a07647cec3ef99c6d8bf47b8f7b70..d981821133e4e009268368e945d4e336052ebb80 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lxc (1.1.1-pve1) unstable; urgency=low
+lxc (1.1.1-1) unstable; urgency=low
 
   * Initial release for Proxmox VE
 

diff --git a/debian/control b/debian/control
index 44785a820662ff7925033e5cebad016d5341ff1d..60d89c07071ffbd92378b032dd515702ca3e37ba 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,12 @@ Build-Depends: debhelper (>= 9), autotools-dev, libapparmor-dev, docbook2x, libc
 Standards-Version: 3.9.5
 Homepage: https://linuxcontainers.org
 
-Package: lxc
+Package: lxc-pve
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libcap2, apparmor, python3, bridge-utils, uidmap, libgnutlsxx28
+Conflicts: lxc
+Replaces: lxc
+Provides: lxc
 Description: Linux containers usersapce tools
  Containers provides resource management through control groups and
  resource isolation through namespaces. The linux containers, lxc, aims
@@ -16,17 +19,17 @@ Description: Linux containers usersapce tools
  object which provides full resource isolation and resource control for
  an applications or a system. 
 
-Package: lxc-dbg
+Package: lxc-pve-dbg
 Section: debug
 Architecture: any
-Depends: lxc (= ${binary:Version}), lxc-dev (= ${binary:Version}), ${misc:Depends}
+Depends: lxc-pve (= ${binary:Version}), lxc-pve-dev (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for LXC
  This package contains the debug symbols for LXC. 
 
-Package: lxc-dev
+Package: lxc-pve-dev
 Section: libdevel
 Architecture: any
-Depends: lxc (= ${binary:Version}), ${misc:Depends}
+Depends: lxc-pve (= ${binary:Version}), ${misc:Depends}
 Description: Linux Containers userspace tools (development)
  Containers provides resource management through control groups and
  resource isolation through namespaces. The linux containers, lxc, aims

diff --git a/debian/lxc-dev.install b/debian/lxc-dev.install
deleted file mode 100644 (file)
index f435b2e..0000000
--- a/debian/lxc-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include
-usr/lib/*/pkgconfig
-usr/lib/*/*.so

diff --git a/debian/lxc-pve-dev.install b/debian/lxc-pve-dev.install
new file mode 100644 (file)
index 0000000..f435b2e
--- /dev/null
+++ b/debian/lxc-pve-dev.install
@@ -0,0 +1,3 @@
+usr/include
+usr/lib/*/pkgconfig
+usr/lib/*/*.so

diff --git a/debian/lxc-pve.dirs b/debian/lxc-pve.dirs
new file mode 100644 (file)
index 0000000..ddc4cf7
--- /dev/null
+++ b/debian/lxc-pve.dirs
@@ -0,0 +1,3 @@
+var/cache/lxc
+var/lib/lxc
+var/log/lxc

diff --git a/debian/lxc-pve.install b/debian/lxc-pve.install
new file mode 100644 (file)
index 0000000..fb84335
--- /dev/null
+++ b/debian/lxc-pve.install
@@ -0,0 +1,9 @@
+usr/bin
+usr/sbin
+usr/share/man
+usr/share/lxc
+usr/lib/*/*.so.*
+usr/lib/*/lxc/lxc-*
+usr/lib/*/lxc/rootfs/README
+lib/systemd
+etc
\ No newline at end of file

diff --git a/debian/lxc-pve.postinst b/debian/lxc-pve.postinst
new file mode 100644 (file)
index 0000000..b46e96d
--- /dev/null
+++ b/debian/lxc-pve.postinst
@@ -0,0 +1,33 @@
+#!/bin/sh
+# postinst script for lxc
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    configure)
+
+       # create subuid/subgui map for root
+       # (to run unprivileged containers as root)
+       usermod -v 100000-165535 -w 100000-165535 root
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

diff --git a/debian/lxc.dirs b/debian/lxc.dirs
deleted file mode 100644 (file)
index ddc4cf7..0000000
--- a/debian/lxc.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-var/cache/lxc
-var/lib/lxc
-var/log/lxc

diff --git a/debian/lxc.install b/debian/lxc.install
deleted file mode 100644 (file)
index fb84335..0000000
--- a/debian/lxc.install
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/bin
-usr/sbin
-usr/share/man
-usr/share/lxc
-usr/lib/*/*.so.*
-usr/lib/*/lxc/lxc-*
-usr/lib/*/lxc/rootfs/README
-lib/systemd
-etc
\ No newline at end of file

diff --git a/debian/lxc.postinst b/debian/lxc.postinst
deleted file mode 100644 (file)
index b46e96d..0000000
--- a/debian/lxc.postinst
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# postinst script for lxc
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-case "$1" in
-    configure)
-
-       # create subuid/subgui map for root
-       # (to run unprivileged containers as root)
-       usermod -v 100000-165535 -w 100000-165535 root
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

diff --git a/debian/rules b/debian/rules
index 997ce91bf624d85e9ff832dc0b354f7b42daf847..1515ccbe0cf7b7b0eeb6a19041a4c15f974b3879 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -27,12 +27,12 @@ override_dh_auto_configure:
        --disable-examples
 
 override_dh_strip:
-       dh_strip --dbg-package=lxc-dbg
+       dh_strip --dbg-package=lxc-pve-dbg
 
 
 
 override_dh_install:
-       dh_apparmor -p lxc --profile-name=usr.bin.lxc-start
+       dh_apparmor -p lxc-pve --profile-name=usr.bin.lxc-start
 
        # do not include dirs on /etc/pve
 #      rmdir $(CURDIR)/debian/tmp/etc/pve/lxc