Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

debian/lenny/libraries/libksquirrel/debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
 Build-Depends: debhelper (>= 5), cdbs, pkg-config, libmng-dev,librsvg2-bin,
- medcon, libjasper-dev, libungif4-dev, libwmf-dev, libopenexr-dev,
+ medcon, libjasper-dev, libgif-dev, libwmf-dev, libopenexr-dev,
  djvulibre-bin, transfig, x11proto-core-dev, netpbm, libtiff-dev,
  libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, build-essential,
  automake, autoconf, libtool, libltdl-dev

debian/squeeze/libraries/libksquirrel/debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
 Build-Depends: debhelper (>= 5), cdbs, pkg-config, libmng-dev,librsvg2-bin,
- medcon, libjasper-dev, libungif4-dev, libwmf-dev, libopenexr-dev,
+ medcon, libjasper-dev, libgif-dev, libwmf-dev, libopenexr-dev,
  djvulibre-bin, transfig, x11proto-core-dev, netpbm, libtiff-dev,
  libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, quilt, build-essential,
  automake, autoconf, libtool, libltdl-dev

debian/wheezy/libraries/libksquirrel/debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
 Build-Depends: debhelper (>= 5), cdbs, pkg-config, libmng-dev,librsvg2-bin,
- medcon, libjasper-dev, libungif4-dev, libwmf-dev, libopenexr-dev,
+ medcon, libjasper-dev, libgif-dev, libwmf-dev, libopenexr-dev,
  djvulibre-bin, transfig, x11proto-core-dev, netpbm, libtiff-dev,
  libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, quilt, build-essential,
  automake, autoconf, libtool, libltdl-dev

ubuntu/maverick/libraries/libksquirrel/debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
 Build-Depends: debhelper (>= 5), cdbs, pkg-config, libmng-dev,librsvg2-bin,
- medcon, libjasper-dev, libungif4-dev, libwmf-dev, libopenexr-dev,
+ medcon, libjasper-dev, libgif-dev, libwmf-dev, libopenexr-dev,
  djvulibre-bin, transfig, x11proto-core-dev, netpbm, libtiff-dev,
  libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, quilt, build-essential,
  automake, autoconf, libtool, libltdl-dev

ubuntu/precise/libraries/libksquirrel/debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
 Build-Depends: debhelper (>= 5), cdbs, pkg-config, libmng-dev,librsvg2-bin,
- medcon, libjasper-dev, libungif4-dev, libwmf-dev, libopenexr-dev,
+ medcon, libjasper-dev, libgif-dev, libwmf-dev, libopenexr-dev,
  djvulibre-bin, transfig, x11proto-core-dev, netpbm, libtiff-dev,
  libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, quilt, build-essential,
  automake, autoconf, libtool, libltdl-dev

ubuntu/raring/libraries/libksquirrel/debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
 Build-Depends: debhelper (>= 5), cdbs, pkg-config, libmng-dev,librsvg2-bin,
- medcon, libjasper-dev, libungif4-dev, libwmf-dev, libopenexr-dev,
+ medcon, libjasper-dev, libgif-dev, libwmf-dev, libopenexr-dev,
  djvulibre-bin, transfig, x11proto-core-dev, netpbm, libtiff-dev,
  libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, quilt, build-essential,
  automake, autoconf, libtool, libltdl-dev