Hi Attached the patch for the version I intend to upload. Please respond if you don't want this NMU to happen, if you are working yourself on a patch or if you think that the attached patch won't work.
Cheers Luk -- Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u kompose-0.5.3/debian/control kompose-0.5.3/debian/control
--- kompose-0.5.3/debian/control
+++ kompose-0.5.3/debian/control
@@ -2,7 +2,7 @@
Section: kde
Priority: optional
Maintainer: Luis Mayoral <[EMAIL PROTECTED]>
-Build-Depends: g++-3.4 [arm hppa m68k], debhelper (>= 4.0.0), autotools-dev,
kdelibs4-dev, libimlib2-dev, libltdl3-dev, xlibs-dev
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, kdelibs4-dev,
libimlib2-dev, libltdl3-dev, libx11-dev, libxext-dev, libxpm-dev, x-dev
Standards-Version: 3.6.2
Package: kompose
diff -u kompose-0.5.3/debian/rules kompose-0.5.3/debian/rules
--- kompose-0.5.3/debian/rules
+++ kompose-0.5.3/debian/rules
@@ -13,19 +13,6 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-###
-
-GCC4_ICES_HERE := arm m68k hppa
-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
-
-###
-
export QTDIR=/usr/share/qt3
CFLAGS = -Wall -g
@@ -62,7 +49,7 @@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp
+ rm -f build-stamp po/*.gmo
# Add here commands to clean up after the build process.
-$(MAKE) distclean
diff -u kompose-0.5.3/debian/changelog kompose-0.5.3/debian/changelog
--- kompose-0.5.3/debian/changelog
+++ kompose-0.5.3/debian/changelog
@@ -1,3 +1,11 @@
+kompose (0.5.3-1.3) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Split xlibs-dev build-dep (Closes: #347079).
+ * Remove explicit build-dep on g++-3.4 (Closes: #342994).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Wed, 11 Jan 2006 16:24:15 +0100
+
kompose (0.5.3-1.2) unstable; urgency=low
* Non-maintainer upload to complete the previous one.
diff -u kompose-0.5.3/debian/kompose.1 kompose-0.5.3/debian/kompose.1
--- kompose-0.5.3/debian/kompose.1
+++ kompose-0.5.3/debian/kompose.1
@@ -29,7 +29,7 @@
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
-\fBkomposé\fP is a fullscreen task manager for KDE, similar to MacOS X's
Exposé.
+\fBkompos\['e]\fP is a fullscreen task manager for KDE, similar to MacOS X's
Expos\['e].
.SH OPTIONS
.IP "\fB--nosystray\fP " 10
Don't show the systray icon.
@@ -37,7 +37,7 @@
Display the default view and exit (non daemon mode).
.SH AUTHOR
-Author of komposé: Hans Oischinger <[EMAIL PROTECTED]>
+Author of kompos\['e]: Hans Oischinger <[EMAIL PROTECTED]>
This manual page was written by Luis Mayoral <[EMAIL PROTECTED]>,
for the Debian GNU/Linux system (but may be used by others).
signature.asc
Description: OpenPGP digital signature
