[pkg-kde-commits] rev 2686 - branches/kde-3.4.0/packages/kdegraphics/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2005-12-20 16:14:44 +0000 (Tue, 20 Dec 2005)
New Revision: 2686

Modified:
   branches/kde-3.4.0/packages/kdegraphics/debian/changelog
   branches/kde-3.4.0/packages/kdegraphics/debian/control
   branches/kde-3.4.0/packages/kdegraphics/debian/rules
Log:
This waiting is becoming silly, so we'll just upload all
available fixes.


Modified: branches/kde-3.4.0/packages/kdegraphics/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/changelog	2005-12-20 16:13:51 UTC (rev 2685)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/changelog	2005-12-20 16:14:44 UTC (rev 2686)
@@ -1,3 +1,18 @@
+kdegraphics (4:3.4.3-4) unstable; urgency=high
+
+  +++ Changes by Christopher Martin:
+
+  * KDE_3_4_BRANCH update (up to r490047). This includes fixes for the fixes
+    included in 4:3.4.3-3, as well as fixes for vulnerabilities that were
+    missed entirely. This upload should properly and completely resolve
+    CAN-2005-3191, CAN-2005-3192, and CAN-2005-3193, until further problems
+    are found.
+
+  * No longer build with gcc-3.4 on arm/hppa/m68k, as a fixed gcc-4.0 should
+    be available everywhere.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 20 Dec 2005 11:10:28 -0500
+
 kdegraphics (4:3.4.3-3) unstable; urgency=medium
 
   +++ Changes by Christopher Martin:

Modified: branches/kde-3.4.0/packages/kdegraphics/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/control	2005-12-20 16:13:51 UTC (rev 2685)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/control	2005-12-20 16:14:44 UTC (rev 2686)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
-Build-Depends: g++-3.4 [arm m68k], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 4:3.4.3), libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut3-dev, libgphoto2-2-dev, libpaper-dev, libopenexr-dev (>= 1.2.1), libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, tetex-bin, texinfo, libxxf86vm-dev
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 4:3.4.3), libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut3-dev, libgphoto2-2-dev, libpaper-dev, libopenexr-dev (>= 1.2.1), libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, tetex-bin, texinfo, libxxf86vm-dev
 Standards-Version: 3.6.2
 
 Package: kdegraphics

Modified: branches/kde-3.4.0/packages/kdegraphics/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/rules	2005-12-20 16:13:51 UTC (rev 2685)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/rules	2005-12-20 16:14:44 UTC (rev 2686)
@@ -17,18 +17,5 @@
 DEB_DH_MAKESHLIBS_ARGS_kviewshell	:= -V'kviewshell (>= 4:3.4.3-1)'
 DEB_DH_MAKESHLIBS_ARGS_libkscan1	:= -V'libkscan1 (>= 4:3.4.3-1)'
 
-###
-
-GCC4_ICES_HERE := arm m68k
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-ifneq (,$(findstring $(DEB_BUILD_ARCH),$(GCC4_ICES_HERE)))
-    export CC=gcc-3.4
-    export CPP=cpp-3.4
-    export CXX=g++-3.4
-endif
-
-###
-
 #shlibs_ver = 4:3.4.3-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))