buildsys: cleanup & dbgsym package switch

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/Makefile b/Makefile
index 844b9c03227aab848ec937ee505f0d1e7cab2817..91515940c748f38e72379342575c719893b89efc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ GITVERSION:=$(shell cat .git/refs/heads/master)
 
 DEB1=${PACKAGE}_${LXCVER}-${DEBREL}_${ARCH}.deb
 DEB2=${PACKAGE}-dev_${LXCVER}-${DEBREL}_${ARCH}.deb \
-     ${PACKAGE}-dbg_${LXCVER}-${DEBREL}_${ARCH}.deb
+     ${PACKAGE}-dbgsym_${LXCVER}-${DEBREL}_${ARCH}.deb
 DEBS=$(DEB1) $(DEB2)
 
 all: ${DEBS}

diff --git a/debian/control b/debian/control
index 77a600a51a715d039f6af1e5ec8bb46e1594a00d..2505aa923091e1c04175799dfbcacb659c29216a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -46,15 +46,6 @@ Description: Linux containers usersapce tools
  object which provides full resource isolation and resource control for
  an applications or a system.
 
-Package: lxc-pve-dbg
-Section: debug
-Architecture: any
-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-pve-dev
 Section: libdevel
 Architecture: any

diff --git a/debian/rules b/debian/rules
index 3eb2d7d3e1a71183fff1499265da38243a43d572..6169797f2ee573c771c30ec576a05425a955212b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
 # output every command that modifies files on the build system.
 #DH_VERBOSE = 1
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 # see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
@@ -28,9 +26,6 @@ override_dh_auto_configure:
        --disable-examples \
        --enable-seccomp
 
-override_dh_strip:
-       dh_strip --dbg-package=lxc-pve-dbg
-
 override_dh_fixperms:
        dh_fixperms -Xusr/lib/$(DEB_HOST_MULTIARCH)/lxc/lxc-user-nic