Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
	pth/pth.nm

diff --cc beecrypt/beecrypt.nm
Simple merge

diff --cc db4/db4.nm
Simple merge

diff --cc gcc/gcc.nm
index f8129076df9b443444edd5d5d5696da6b4dc2c3e,8fd265ac806760e76a123c8d85a68dfe65e431f9..575cd893d9dc420f62a77f55520467de93696baf
--- 1/gcc/gcc.nm
--- 2/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@@ -445,23 -289,13 +445,27 @@@ package
                end
        end
  
 -      package libquadmath-devel
 +      package gcc-plugin-devel
 +              summary = Support for compiling GCC plugins.
 +              description
 +                      This package contains header files and other support files
 +                      for compiling GCC plugins.  The GCC plugin ABI is currently
 +                      not stable, so plugins must be rebuilt any time GCC is updated.
 +              end
 +
 +              requires
 +                      gcc=%{thisver}
 +                      gmp-devel>=4.1.2-8
 +                      mpfr-devel>=2.2.1
 +                      libmpc-devel>=0.8.1
 +              end
 +
                files
 -                      /usr/lib/libquadmath*.so
 +                      /usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/plugin
                end
        end
+ 
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
  end

diff --cc mpfr/mpfr.nm
Simple merge

diff --cc pth/pth.nm
Simple merge