rev 4576 - in trunk/packages/kdebase/debian: . patches
Pierre Habouzit
madcoder at costa.debian.org
Sun Oct 1 20:57:54 UTC 2006
Author: madcoder
Date: 2006-10-01 20:57:54 +0000 (Sun, 01 Oct 2006)
New Revision: 4576
Added:
trunk/packages/kdebase/debian/patches/27_kfreebsd_sysguard.diff
Modified:
trunk/packages/kdebase/debian/changelog
trunk/packages/kdebase/debian/kdebase-data.install
trunk/packages/kdebase/debian/rules
Log:
#339937
Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog 2006-10-01 20:38:20 UTC (rev 4575)
+++ trunk/packages/kdebase/debian/changelog 2006-10-01 20:57:54 UTC (rev 4576)
@@ -1,5 +1,6 @@
kdebase (4:3.5.5-1) UNRELEASED; urgency=low
+ [ Debian Qt/KDE Maintainers ]
* New upstream release.
+ Reorders the paths which kxkb searches. This should prevent it from
mistakenly thinking that it has found its data; this was breaking
@@ -57,8 +58,13 @@
tree, since we must remove the icons from the tarball as well.]
(Closes: #284699)
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 28 Sep 2006 21:10:58 -0400
+ +++ Changes by Pierre Habouzit:
+ * Add kfreebsd-specific patches to the configure system, and forbit the
+ installation of linux-specific files. (Closes: #339937).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 1 Oct 2006 22:56:09 +0200
+
kdebase (4:3.5.4-2) unstable; urgency=low
* KDE_3_5_BRANCH update (up to r567687).
Modified: trunk/packages/kdebase/debian/kdebase-data.install
===================================================================
--- trunk/packages/kdebase/debian/kdebase-data.install 2006-10-01 20:38:20 UTC (rev 4575)
+++ trunk/packages/kdebase/debian/kdebase-data.install 2006-10-01 20:57:54 UTC (rev 4576)
@@ -31,7 +31,6 @@
debian/tmp/usr/share/apps/kcmkeys/win4.kksrc
debian/tmp/usr/share/apps/kcmkeys/wm3.kksrc
debian/tmp/usr/share/apps/kcmlocale/pics/background.png
-debian/tmp/usr/share/apps/kcmview1394/oui.db
debian/tmp/usr/share/apps/kconf_update/convertShortcuts.pl
debian/tmp/usr/share/apps/kconf_update/kaccel.upd
debian/tmp/usr/share/apps/kconf_update/kcmdisplayrc.upd
Added: trunk/packages/kdebase/debian/patches/27_kfreebsd_sysguard.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/27_kfreebsd_sysguard.diff (rev 0)
+++ trunk/packages/kdebase/debian/patches/27_kfreebsd_sysguard.diff 2006-10-01 20:57:54 UTC (rev 4576)
@@ -0,0 +1,30 @@
+--- kde/configure.in 2005-08-29 01:43:19.000000000 +0200
++++ kde.patched/configure.in 2005-08-29 01:43:55.000000000 +0200
+@@ -1816,6 +1816,7 @@
+ case "$host" in
+ *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
+ *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
++ *-*-kfreebsd*-gnu) ksysguardd_compile=yes; UNAME='Linux' ;;
+ *-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;;
+ *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
+ *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
+--- kde/configure 2005-08-29 01:42:54.000000000 +0200
++++ kde.patched/configure 2005-08-29 01:44:36.000000000 +0200
+@@ -52915,6 +52915,7 @@
+ case "$host" in
+ *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
+ *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
++ *-*-kfreebsd*-gnu) ksysguardd_compile=yes; UNAME='Linux' ;;
+ *-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;;
+ *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
+ *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
+--- kde/ksysguard/configure.in.in 2005-08-29 09:59:21.000000000 +0200
++++ kde.patched/ksysguard/configure.in.in 2005-08-29 10:00:05.000000000 +0200
+@@ -3,6 +3,7 @@
+ case "$host" in
+ *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
+ *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
++ *-*-kfreebsd*-gnu) ksysguardd_compile=yes; UNAME='Linux' ;;
+ *-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;;
+ *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
+ *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
Modified: trunk/packages/kdebase/debian/rules
===================================================================
--- trunk/packages/kdebase/debian/rules 2006-10-01 20:38:20 UTC (rev 4575)
+++ trunk/packages/kdebase/debian/rules 2006-10-01 20:57:54 UTC (rev 4576)
@@ -33,11 +33,23 @@
#shlibs_ver = 4:3.5.0-1
#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
+
+common-install-prehook-arch::
+ grep -v -e joystick -e view1394 debian/kcontrol.install > debian/kcontrol.install.kfreebsd-i386
+ grep -v -e joystick -e view1394 debian/kcontrol.install > debian/kcontrol.install.kfreebsd-amd64
+ grep -v -e media_propsdlgplugin debian/kdebase-kio-plugins.install > debian/kdebase-kio-plugins.install.kfreebsd-i386
+ grep -v -e media_propsdlgplugin debian/kdebase-kio-plugins.install > debian/kdebase-kio-plugins.install.kfreebsd-amd64
+
+clean::
+ rm -f debian/kcontrol.install.kfreebsd* debian/kdebase-kio-plugins.install.kfreebs*
+
binary-install/kdebase-bin::
install -p -D -m644 debian/kcheckpass.pam debian/kdebase-bin/etc/pam.d/kcheckpass
install -p -D -m644 debian/kscreensaver.pam debian/kdebase-bin/etc/pam.d/kscreensaver
binary-install/kdebase-data::
+# oui.db is not really arch independent, it is linux specific
+ install -p -D -m644 kcontrol/view1394/oui.db debian/kdebase-data/usr/share/apps/kcmview1394/oui.db
install -p -D -m644 debian/debian-kde_default.png debian/kdebase-data/usr/share/wallpapers/debian-kde_default.png
install -p -D -m644 debian/debian-kde_default.png.desktop debian/kdebase-data/usr/share/wallpapers/debian-kde_default.png.desktop
More information about the pkg-kde-commits
mailing list