Rename lsb-core into lsb-compat

diff --git a/debian/control b/debian/control
index 38317e9b96cd1425df3e1295d9826c478596a3d1..622df82c0f13e96a732a0867e21e55fe09182cac 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -53,7 +53,7 @@ Description: Linux Standard Base version reporting utility
  be useful for programmatically distinguishing between a pure Debian
  installation and derived distributions.
 
-Package: lsb-core
+Package: lsb-compat
 Architecture: any
 Depends: lsb-release (>= ${source:Version}),
  ${glibc},
@@ -93,7 +93,10 @@ Depends: lsb-release (>= ${source:Version}),
  lsb-base (>= ${source:Version}),
  lsb-security (>= ${source:Version}),
  time
-Provides: lsb-core-noarch, ${provides}
+Provides: lsb-compat-noarch, ${provides},
+ lsb-core
+Conflicts: lsb-core
+Replaces: lsb-core
 Description: Linux Standard Base 4.1 core support package
  The Linux Standard Base (http://www.linuxbase.org/) is a standard
  core system that third-party applications written for Linux can

diff --git a/debian/lsb-compat.dirs b/debian/lsb-compat.dirs
new file mode 100644 (file)
index 0000000..d3d8c10
--- /dev/null
+++ b/debian/lsb-compat.dirs
@@ -0,0 +1,3 @@
+usr/lib/lsb
+var/lib/lsb
+etc/profile.d

diff --git a/debian/lsb-compat.install b/debian/lsb-compat.install
new file mode 100644 (file)
index 0000000..eaee1e9
--- /dev/null
+++ b/debian/lsb-compat.install
@@ -0,0 +1,4 @@
+initdutils.py /usr/lib/lsb
+install_initd /usr/lib/lsb
+remove_initd /usr/lib/lsb
+lsbinstall /usr/lib/lsb

diff --git a/debian/lsb-compat.lintian-overrides b/debian/lsb-compat.lintian-overrides
new file mode 100644 (file)
index 0000000..64b2b9f
--- /dev/null
+++ b/debian/lsb-compat.lintian-overrides
@@ -0,0 +1,2 @@
+# The purpose of LSB is to ensure that those packages are present. Being explicit cannot hurt.
+depends-on-essential-package-without-using-version depends: bsdutils

diff --git a/debian/lsb-compat.manpages b/debian/lsb-compat.manpages
new file mode 100644 (file)
index 0000000..44c423d
--- /dev/null
+++ b/debian/lsb-compat.manpages
@@ -0,0 +1 @@
+lsb.8

diff --git a/debian/lsb-compat.postinst b/debian/lsb-compat.postinst
new file mode 100755 (executable)
index 0000000..ce155f5
--- /dev/null
+++ b/debian/lsb-compat.postinst
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+set -e
+
+setup_ldso_symlink () {
+    ARCH=$DPKG_MAINTSCRIPT_ARCH
+    if [ -z "$ARCH" ]; then
+        ARCH=$(dpkg --print-architecture)
+    fi
+    case "$ARCH" in
+        s390|ppc64|sparc|sparc64|alpha|hppa|m68k|mipsel)
+            ln -sf ld.so.1 /lib/ld-lsb-$ARCH.so.1
+            ln -sf ld.so.1 /lib/ld-lsb-$ARCH.so.2
+            ln -sf ld.so.1 /lib/ld-lsb-$ARCH.so.3
+            ;;
+        powerpc)
+            ln -sf ld.so.1 /lib/ld-lsb-ppc32.so.1
+            ln -sf ld.so.1 /lib/ld-lsb-ppc32.so.2
+            ln -sf ld.so.1 /lib/ld-lsb-ppc32.so.3
+            ;;
+        i386)
+            ln -sf ld-linux.so.2 /lib/ld-lsb.so.1
+            ln -sf ld-linux.so.2 /lib/ld-lsb.so.2
+            ln -sf ld-linux.so.2 /lib/ld-lsb.so.3
+            ;;
+        amd64)
+            ln -sf ld-linux.so.2 /lib/ld-lsb.so.1
+            ln -sf ld-linux.so.2 /lib/ld-lsb.so.2
+            ln -sf ld-linux.so.2 /lib/ld-lsb.so.3
+            ln -sf ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.2
+            ln -sf ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.3
+            ;;
+        ia64)
+            ln -sf ld-linux-ia64.so.2 /lib/ld-lsb-ia64.so.1
+            ln -sf ld-linux-ia64.so.2 /lib/ld-lsb-ia64.so.2
+            ln -sf ld-linux-ia64.so.2 /lib/ld-lsb-ia64.so.3
+            ;;
+        *)
+            echo "ld-lsb-*.so.1 symlink for $ARCH is unknown!"
+            ;;
+    esac
+}
+
+PATH=/sbin:/usr/sbin:$PATH
+export PATH
+
+. /usr/share/debconf/confmodule
+
+case "$1" in
+    configure)
+        if dpkg --compare-versions "$2" lt "3.2+Debian30" ; then
+          [ -L /lib/ld-lsb-x86-64.so.2 ] && rm /lib/ld-lsb-x86-64.so.2 || true
+          [ -L /lib/ld-lsb-x86-64.so.3 ] && rm /lib/ld-lsb-x86-64.so.3 || true
+        fi
+        setup_ldso_symlink
+        ;;
+    abort-upgrade|abort-remove|abort-deconfigure)
+        ;;
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#

diff --git a/debian/lsb-compat.prerm b/debian/lsb-compat.prerm
new file mode 100644 (file)
index 0000000..8b1f535
--- /dev/null
+++ b/debian/lsb-compat.prerm
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+set -e
+
+remove_ldso_symlink () {
+    ARCH=$DPKG_MAINTSCRIPT_ARCH
+    if [ -z "$ARCH" ]; then
+        ARCH=$(dpkg --print-architecture)
+    fi
+    case "$ARCH" in
+        s390|ia64|ppc64|sparc|sparc64|alpha|hppa|m68k|mipsel)
+            rm -f /lib/ld-lsb-$ARCH.so.[123]
+            ;;
+        powerpc)
+            rm -f /lib/ld-lsb-ppc32.so.[123]
+            ;;
+        i386)
+            rm -f /lib/ld-lsb.so.[123]
+            ;;
+        amd64)
+            rm -f /lib/ld-lsb.so.[123] /lib64/ld-lsb-x86-64.so.[23]
+            ;;
+        *)
+            echo "ld-lsb-*.so.1 symlink for $ARCH is unknown; not removed."
+            ;;
+    esac
+}
+
+PATH=/sbin:/usr/sbin:$PATH
+export PATH
+
+case "$1" in
+    remove)
+        remove_ldso_symlink
+        rm -f /var/lib/lsb/facilities
+        rm -f /var/lib/lsb/depends
+        ;;
+    failed-upgrade|upgrade|deconfigure)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+
+#DEBHELPER#

diff --git a/debian/lsb-core.dirs b/debian/lsb-core.dirs
deleted file mode 100644 (file)
index d3d8c10..0000000
--- a/debian/lsb-core.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/lsb
-var/lib/lsb
-etc/profile.d

diff --git a/debian/lsb-core.install b/debian/lsb-core.install
deleted file mode 100644 (file)
index eaee1e9..0000000
--- a/debian/lsb-core.install
+++ /dev/null
@@ -1,4 +0,0 @@
-initdutils.py /usr/lib/lsb
-install_initd /usr/lib/lsb
-remove_initd /usr/lib/lsb
-lsbinstall /usr/lib/lsb

diff --git a/debian/lsb-core.lintian-overrides b/debian/lsb-core.lintian-overrides
deleted file mode 100644 (file)
index 64b2b9f..0000000
--- a/debian/lsb-core.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# The purpose of LSB is to ensure that those packages are present. Being explicit cannot hurt.
-depends-on-essential-package-without-using-version depends: bsdutils

diff --git a/debian/lsb-core.manpages b/debian/lsb-core.manpages
deleted file mode 100644 (file)
index 44c423d..0000000
--- a/debian/lsb-core.manpages
+++ /dev/null
@@ -1 +0,0 @@
-lsb.8

diff --git a/debian/lsb-core.postinst b/debian/lsb-core.postinst
deleted file mode 100755 (executable)
index ce155f5..0000000
--- a/debian/lsb-core.postinst
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-set -e
-
-setup_ldso_symlink () {
-    ARCH=$DPKG_MAINTSCRIPT_ARCH
-    if [ -z "$ARCH" ]; then
-        ARCH=$(dpkg --print-architecture)
-    fi
-    case "$ARCH" in
-        s390|ppc64|sparc|sparc64|alpha|hppa|m68k|mipsel)
-            ln -sf ld.so.1 /lib/ld-lsb-$ARCH.so.1
-            ln -sf ld.so.1 /lib/ld-lsb-$ARCH.so.2
-            ln -sf ld.so.1 /lib/ld-lsb-$ARCH.so.3
-            ;;
-        powerpc)
-            ln -sf ld.so.1 /lib/ld-lsb-ppc32.so.1
-            ln -sf ld.so.1 /lib/ld-lsb-ppc32.so.2
-            ln -sf ld.so.1 /lib/ld-lsb-ppc32.so.3
-            ;;
-        i386)
-            ln -sf ld-linux.so.2 /lib/ld-lsb.so.1
-            ln -sf ld-linux.so.2 /lib/ld-lsb.so.2
-            ln -sf ld-linux.so.2 /lib/ld-lsb.so.3
-            ;;
-        amd64)
-            ln -sf ld-linux.so.2 /lib/ld-lsb.so.1
-            ln -sf ld-linux.so.2 /lib/ld-lsb.so.2
-            ln -sf ld-linux.so.2 /lib/ld-lsb.so.3
-            ln -sf ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.2
-            ln -sf ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.3
-            ;;
-        ia64)
-            ln -sf ld-linux-ia64.so.2 /lib/ld-lsb-ia64.so.1
-            ln -sf ld-linux-ia64.so.2 /lib/ld-lsb-ia64.so.2
-            ln -sf ld-linux-ia64.so.2 /lib/ld-lsb-ia64.so.3
-            ;;
-        *)
-            echo "ld-lsb-*.so.1 symlink for $ARCH is unknown!"
-            ;;
-    esac
-}
-
-PATH=/sbin:/usr/sbin:$PATH
-export PATH
-
-. /usr/share/debconf/confmodule
-
-case "$1" in
-    configure)
-        if dpkg --compare-versions "$2" lt "3.2+Debian30" ; then
-          [ -L /lib/ld-lsb-x86-64.so.2 ] && rm /lib/ld-lsb-x86-64.so.2 || true
-          [ -L /lib/ld-lsb-x86-64.so.3 ] && rm /lib/ld-lsb-x86-64.so.3 || true
-        fi
-        setup_ldso_symlink
-        ;;
-    abort-upgrade|abort-remove|abort-deconfigure)
-        ;;
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#

diff --git a/debian/lsb-core.prerm b/debian/lsb-core.prerm
deleted file mode 100644 (file)
index 8b1f535..0000000
--- a/debian/lsb-core.prerm
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-set -e
-
-remove_ldso_symlink () {
-    ARCH=$DPKG_MAINTSCRIPT_ARCH
-    if [ -z "$ARCH" ]; then
-        ARCH=$(dpkg --print-architecture)
-    fi
-    case "$ARCH" in
-        s390|ia64|ppc64|sparc|sparc64|alpha|hppa|m68k|mipsel)
-            rm -f /lib/ld-lsb-$ARCH.so.[123]
-            ;;
-        powerpc)
-            rm -f /lib/ld-lsb-ppc32.so.[123]
-            ;;
-        i386)
-            rm -f /lib/ld-lsb.so.[123]
-            ;;
-        amd64)
-            rm -f /lib/ld-lsb.so.[123] /lib64/ld-lsb-x86-64.so.[23]
-            ;;
-        *)
-            echo "ld-lsb-*.so.1 symlink for $ARCH is unknown; not removed."
-            ;;
-    esac
-}
-
-PATH=/sbin:/usr/sbin:$PATH
-export PATH
-
-case "$1" in
-    remove)
-        remove_ldso_symlink
-        rm -f /var/lib/lsb/facilities
-        rm -f /var/lib/lsb/depends
-        ;;
-    failed-upgrade|upgrade|deconfigure)
-        ;;
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-
-#DEBHELPER#

diff --git a/debian/rules b/debian/rules
index 8f7d87db1178c4a54bda534e5f3179ce6c7baedd..cb736f7d5a90a599e8df4923e02d5db307ddf676 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -75,9 +75,8 @@ override_dh_installdeb:
 endif
 
 override_dh_gencontrol:
-       @echo >> debian/lsb-core.substvars "glibc=${LIBC}"
+       @echo >> debian/lsb-compat.substvars "glibc=${LIBC}"
 #      @[ ${DEB_HOST_GNU_TYPE} != 'arm-linux-gnueabi' ] && echo >> debian/lsb-cxx.substvars "depends=libstdc++5" || true
-       @echo >> debian/lsb-core.substvars "provides=lsb-core-${lsbarch}"
        @echo >> debian/lsb-cxx.substvars "provides=lsb-cxx-${lsbarch}"
        @echo >> debian/lsb-graphics.substvars "provides=lsb-graphics-${lsbarch}"
        @echo >> debian/lsb-desktop.substvars "provides=lsb-qt4-${lsbarch}, lsb-desktop-${lsbarch}"
@@ -85,6 +84,6 @@ override_dh_gencontrol:
        @echo >> debian/lsb-languages.substvars "provides=lsb-languages-${lsbarch}"
        @echo >> debian/lsb-printing.substvars "provides=lsb-printing-${lsbarch}"
        @echo >> debian/lsb-security.substvars "provides=lsb-security-${lsbarch}"
-       @[ ${DEB_HOST_ARCH} = 'amd64' ] && echo >> debian/lsb-core.substvars "depends=libc6:i386 | libc6-i386, zlib1g:i386 | lib32z1" || true
-       @[ ${DEB_HOST_ARCH} = 'kfreebsd-amd64' ] && echo >> debian/lsb-core.substvars "depends=libc0.1:kfreebsd-i386 | libc0.1-i386, zlib1g:kfreebsd-i386 | lib32z1" || true
+       @[ ${DEB_HOST_ARCH} = 'amd64' ] && echo >> debian/lsb-compat.substvars "depends=libc6:i386 | libc6-i386, zlib1g:i386 | lib32z1" || true
+       @[ ${DEB_HOST_ARCH} = 'kfreebsd-amd64' ] && echo >> debian/lsb-compat.substvars "depends=libc0.1:kfreebsd-i386 | libc0.1-i386, zlib1g:kfreebsd-i386 | lib32z1" || true
        dh_gencontrol