[Pkg-kde-commits] rev 1062 - in branches/kde-3.4.0/packages/kdelibs/debian: . patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-05-13 23:04:05 +0000 (Fri, 13 May 2005)
New Revision: 1062

Added:
   branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-data.preinst
   branches/kde-3.4.0/packages/kdelibs/debian/patches/19_debianize_useragent.diff
Modified:
   branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-data.install
   branches/kde-3.4.0/packages/kdelibs/debian/rules
Log:
Several changes:

Change how the new kde-applications.menu is put into place.
Clean up the old file.
Debianize the Konqueror web browser user agent, as is done
by most other Debian browsers (append the package version).


Modified: branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-data.install
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-data.install	2005-05-13 23:01:59 UTC (rev 1061)
+++ branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-data.install	2005-05-13 23:04:05 UTC (rev 1062)
@@ -4173,3 +4173,4 @@
 debian/tmp/usr/share/servicetypes/kurifilterplugin.desktop
 debian/tmp/usr/share/servicetypes/renamedlgplugin.desktop
 debian/tmp/usr/share/servicetypes/scriptinterface.desktop
+debian/tmp/etc/xdg/menus/applications.menu	debian/tmp/xdg/menus/kde-applications.menu

Added: branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-data.preinst
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-data.preinst	2005-05-13 23:01:59 UTC (rev 1061)
+++ branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-data.preinst	2005-05-13 23:04:05 UTC (rev 1062)
@@ -0,0 +1,31 @@
+#!/bin/sh -e
+
+FILE="/etc/xdg/menus/applications.menu"
+MD5SUM332="3750f06e08cfd048952f4cd82b97652c"
+MD5SUM340="ea26be9e934fb23c04b0b1409706bace"
+
+case "$1" in
+
+	upgrade)
+	[ -f "$FILE" ] || exit 0
+	MD5SUMOLD=`md5sum $FILE | awk '{print $1}'`
+	if dpkg --compare-versions "$2" lt "4:3.4.0-0pre5"; then
+		if [ "$MD5SUM332" = "$MD5SUMOLD" ] || [ "$MD5SUM340" = "$MD5SUMOLD" ]; then
+			rm -f "$FILE"
+		fi
+	fi
+	;;
+
+	install|abort-upgrade)
+	;;
+
+	*)
+	echo "preinst called with unknown argument \`$1'" >&2
+	exit 1
+	;;
+
+esac
+
+#DEBHELPER#
+
+exit 0

Added: branches/kde-3.4.0/packages/kdelibs/debian/patches/19_debianize_useragent.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/19_debianize_useragent.diff	2005-05-13 23:01:59 UTC (rev 1061)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/19_debianize_useragent.diff	2005-05-13 23:04:05 UTC (rev 1062)
@@ -0,0 +1,14 @@
+--- kde.orig/kio/kio/kprotocolmanager.cpp
++++ kde.patched/kio/kio/kprotocolmanager.cpp
+@@ -464,6 +464,11 @@
+   }
+   d->modifiers = modifiers;
+   d->useragent = CFG_DEFAULT_UAGENT(supp);
++
++#define STRINGIFY(macro_or_string) STRINGIFY_ARG(macro_or_string)
++#define STRINGIFY_ARG(contents) #contents
++  d->useragent.append(" (Debian package " STRINGIFY(DEBIAN_VERSION) ")");
++
+   return d->useragent;
+ }
+ 

Modified: branches/kde-3.4.0/packages/kdelibs/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/rules	2005-05-13 23:01:59 UTC (rev 1061)
+++ branches/kde-3.4.0/packages/kdelibs/debian/rules	2005-05-13 23:04:05 UTC (rev 1062)
@@ -8,6 +8,7 @@
 DEB_KDE_APIDOX := yes
 
 version=Debian Package $(DEB_VERSION)
+DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
 
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--enable-mitshm --with-alsa --enable-dnotify \
@@ -23,6 +24,3 @@
 
 #shlibs_ver = 4:3.4.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
-
-binary-install/kdelibs-data::
-	install -p -D -m644 kded/applications.menu debian/kdelibs-data/etc/xdg/menus/kde-applications.menu