lsb 3.2-7 Debian release.

diff --git a/debian/changelog b/debian/changelog
index 45f75c841c04588f8a254ee24e9ba8d966a5c5f9..c9697f6d29beec54b56a7eb4f43f2d02f6a074b1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lsb (3.2-7) unstable; urgency=low
+
+  * Remove libstdc++5 dependency on all architectures, since it's only
+    needed before LSB 3.0.
+  * Revoke provision of lsb-cxx < 3.0 according to lsb_release.
+
+ -- Chris Lawrence <lawrencc@debian.org>  Sat, 05 Apr 2008 16:32:13 -0500
+
 lsb (3.2-6) unstable; urgency=low
 
   * Kill old versions of /etc/lsb-release deader.  (Closes: #467219)

diff --git a/debian/control b/debian/control
index 2dea7d544e0d29a33836bf2c0ae02ff1b6fef402..d142249090f4065b345462581c0e3fcc584b3d11 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,7 @@ Description: Linux Standard Base 3.2 graphics support package
 
 Package: lsb-cxx
 Architecture: any
-Depends: lsb-core, libstdc++6, ${misc:Depends}, ${depends}
+Depends: lsb-core, libstdc++6, ${misc:Depends}
 Provides: lsb-cxx-noarch, ${provides}
 Description: Linux Standard Base 3.2 C++ support package
  The Linux Standard Base (http://www.linuxbase.org/) is a standard

diff --git a/debian/rules b/debian/rules
index 7f4c01eee44d7fbbb67bf3875982793698197aa1..0f4c3a55e0dddbc46e2efb460dd199c66a3c26a2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -134,7 +134,7 @@ binary-arch: build install
 #      dh_undocumented
        dh_installchangelogs -a
        @echo >> debian/lsb-core.substvars "glibc=${LIBC}"
-       @[ ${DEB_HOST_GNU_TYPE} != 'arm-linux-gnueabi' ] && echo >> debian/lsb-cxx.substvars "depends=libstdc++5" || true
+#      @[ ${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}"

diff --git a/lsb_release b/lsb_release
index 9900b2e5925632877f90ed70249aa0564eb9b8dc..9dddcedff0c45f800a3e0874c49a492d8fd13994 100755 (executable)
--- a/lsb_release
+++ b/lsb_release
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 # lsb_release command for Debian
-# (C) 2005-07 Chris Lawrence <lawrencc@debian.org>
+# (C) 2005-08 Chris Lawrence <lawrencc@debian.org>
 
 #    This package is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -70,6 +70,8 @@ def valid_lsb_versions(version, module):
             return ['3.1']
         elif module in ('printing', 'languages', 'multimedia'):
             return ['3.2']
+        elif module == 'cxx':
+            return ['3.0', '3.1', '3.2']
         else:
             return ['2.0', '3.0', '3.1', '3.2']