rev 4573 - in trunk/packages/kdebase/debian: . patches
Christopher Martin
chrsmrtn at costa.debian.org
Sat Sep 30 16:50:31 UTC 2006
Author: chrsmrtn
Date: 2006-09-30 16:50:31 +0000 (Sat, 30 Sep 2006)
New Revision: 4573
Added:
trunk/packages/kdebase/debian/prune-nonfree
Removed:
trunk/packages/kdebase/debian/patches/01_kdebase_branch_r567687.diff
trunk/packages/kdebase/debian/patches/01_kdebase_branch_r576145.diff
Modified:
trunk/packages/kdebase/debian/changelog
trunk/packages/kdebase/debian/control
trunk/packages/kdebase/debian/konsole.install
trunk/packages/kdebase/debian/rules
Log:
Oh dear, Mozilla vs. the DFSG strikes here.
Add a prune-nonfree script that will have to be
run before creating the orig.tar.gz to drop the
non-free Firefox icons.
The firefox package ships its own (sucky) icons
which KDE will fall back to (I use Firefox, and
the change was seamless).
Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog 2006-09-30 16:48:25 UTC (rev 4572)
+++ trunk/packages/kdebase/debian/changelog 2006-09-30 16:50:31 UTC (rev 4573)
@@ -1,16 +1,15 @@
-kdebase (4:3.5.4-3) UNRELEASED; urgency=low
+kdebase (4:3.5.5-1) UNRELEASED; urgency=low
- * KDE_3_5_BRANCH update (up to r576145)
+ * New upstream release.
+ Reorders the paths which kxkb searches. This should prevent it from
- mistakenly thinking that it's found it's data; this was breaking
+ mistakenly thinking that it has found its data; this was breaking
keyboard layouts for many users. (Closes: #382988)
- + Fix kxkb with multiple users - create properly named files in /tmp.
+ + Fixes kxkb with multiple users - create properly named files in /tmp.
(Closes: #383893)
- + Fix kdesktop crash when copying things to the kde clipboard under special
- configuration(Closes: #386336)
+ + Fixes kdesktop crash when copying things to the kde clipboard under
+ special configuration. (Closes: #386336)
+ + Fixes kicker external taskbar sizing. (Closes: #373919)
- * TODO: check bugs fixed since last branch pull !!!
-
+++ Changes by Christopher Martin:
* Join the club by adding full depends on hal and pmount to the kdebase
@@ -40,20 +39,26 @@
and accepted the then-default 'medium' hinting level. (Closes: #381232)
* Clarify in the kdebase and kdebase-kio-plugins README.Debian files that
- plugdev membership through /etc/security/group.conf doesn't work.
+ plugdev membership through /etc/security/group.conf doesn't cut it.
* Add Romanian debconf translation, thanks to Stan Ioan-Eugen.
(Closes: #387586)
+++ Changes by Fathi Boudra:
- * Fix typos in libkonq4 description (Closes: #385148)
- * Re-write kpersonalizer description (Closes: #385309)
- * Fix typos in kdebase-kio-plugins (Closes: #385734)
- * (1st part of the fix) Remove non-free firefox icon (Closes: #284699)
+ * Fix typos in libkonq4 description. (Closes: #385148)
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 26 Aug 2006 11:02:31 -0400
+ * Re-write kpersonalizer description. (Closes: #385309)
+ * Fix typos in kdebase-kio-plugins description. (Closes: #385734)
+
+ * Remove non-free firefox icon. [CM: Add a prune-nonfree script to the
+ debian packaging that makes it easy to drop the icons from a source
+ 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
+
kdebase (4:3.5.4-2) unstable; urgency=low
* KDE_3_5_BRANCH update (up to r567687).
Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control 2006-09-30 16:48:25 UTC (rev 4572)
+++ trunk/packages/kdebase/debian/control 2006-09-30 16:50:31 UTC (rev 4573)
@@ -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: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.4), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4)
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.5), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4)
Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
Build-Conflicts: nvidia-glx
Standards-Version: 3.7.2
@@ -120,7 +120,7 @@
Package: kdebase-dev
Section: devel
Architecture: any
-Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), kdebase-bin (= ${Source-Version}), kdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.4)
+Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), kdebase-bin (= ${Source-Version}), kdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.5)
Replaces: kate (<< 4:3.0.0), kdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
Description: development files for the KDE base module
This package contains headers and other development files needed to
@@ -516,7 +516,7 @@
Package: libkonq4-dev
Section: libdevel
Architecture: any
-Depends: libkonq4 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.4)
+Depends: libkonq4 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.5)
Conflicts: libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
Replaces: kdebase-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
Description: development files for Konqueror's core libraries
Modified: trunk/packages/kdebase/debian/konsole.install
===================================================================
--- trunk/packages/kdebase/debian/konsole.install 2006-09-30 16:48:25 UTC (rev 4572)
+++ trunk/packages/kdebase/debian/konsole.install 2006-09-30 16:50:31 UTC (rev 4573)
@@ -66,6 +66,7 @@
debian/tmp/usr/share/apps/konsole/vt420pc.keytab
debian/tmp/usr/share/apps/konsole/wallpapers/Blkmarble.jpg
debian/tmp/usr/share/apps/konsole/wallpapers/gray02.jpg
+debian/tmp/usr/share/apps/konsole/wallpapers/Metric-Monospace-14.png
debian/tmp/usr/share/apps/konsole/wallpapers/Paper01.jpg
debian/tmp/usr/share/apps/konsole/WhiteOnBlack.schema
debian/tmp/usr/share/apps/konsole/x11r5.keytab
Deleted: trunk/packages/kdebase/debian/patches/01_kdebase_branch_r567687.diff
Deleted: trunk/packages/kdebase/debian/patches/01_kdebase_branch_r576145.diff
Added: trunk/packages/kdebase/debian/prune-nonfree
===================================================================
--- trunk/packages/kdebase/debian/prune-nonfree (rev 0)
+++ trunk/packages/kdebase/debian/prune-nonfree 2006-09-30 16:50:31 UTC (rev 4573)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Removes non-free files from the source tree. Must be done before
+# creating the orig.tar.gz.
+
+TOPLEVEL="$1"
+
+if [ "$TOPLEVEL" = "" ]; then
+ echo "Please provide the toplevel directory as the argument."
+ exit 1
+else
+ rm -f $TOPLEVEL/pics/crystalsvg/cr16-app-firefox.png
+ rm -f $TOPLEVEL/pics/crystalsvg/cr32-app-firefox.png
+ rm -f $TOPLEVEL/pics/crystalsvg/cr48-app-firefox.png
+ exit 0
+fi
Property changes on: trunk/packages/kdebase/debian/prune-nonfree
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/kdebase/debian/rules
===================================================================
--- trunk/packages/kdebase/debian/rules 2006-09-30 16:48:25 UTC (rev 4572)
+++ trunk/packages/kdebase/debian/rules 2006-09-30 16:50:31 UTC (rev 4573)
@@ -20,15 +20,15 @@
PACKAGES_WITH_LIBS := kate kcontrol kdebase-bin kicker konqueror ksplash \
ksysguard kwin libkonq4
-DEB_DH_MAKESHLIBS_ARGS_kate := -V'kate (>= 4:3.5.4-1)'
-DEB_DH_MAKESHLIBS_ARGS_kcontrol := -V'kcontrol (>= 4:3.5.4-1)'
-DEB_DH_MAKESHLIBS_ARGS_kdebase-bin := -V'kdebase-bin (>= 4:3.5.4-1)'
-DEB_DH_MAKESHLIBS_ARGS_kicker := -V'kicker (>= 4:3.5.4-1)'
-DEB_DH_MAKESHLIBS_ARGS_konqueror := -V'konqueror (>= 4:3.5.4-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksplash := -V'ksplash (>= 4:3.5.4-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksysguard := -V'ksysguard (>= 4:3.5.4-1)'
-DEB_DH_MAKESHLIBS_ARGS_kwin := -V'kwin (>= 4:3.5.4-1)'
-DEB_DH_MAKESHLIBS_ARGS_libkonq4 := -V'libkonq4 (>= 4:3.5.4-1)'
+DEB_DH_MAKESHLIBS_ARGS_kate := -V'kate (>= 4:3.5.5-1)'
+DEB_DH_MAKESHLIBS_ARGS_kcontrol := -V'kcontrol (>= 4:3.5.5-1)'
+DEB_DH_MAKESHLIBS_ARGS_kdebase-bin := -V'kdebase-bin (>= 4:3.5.5-1)'
+DEB_DH_MAKESHLIBS_ARGS_kicker := -V'kicker (>= 4:3.5.5-1)'
+DEB_DH_MAKESHLIBS_ARGS_konqueror := -V'konqueror (>= 4:3.5.5-1)'
+DEB_DH_MAKESHLIBS_ARGS_ksplash := -V'ksplash (>= 4:3.5.5-1)'
+DEB_DH_MAKESHLIBS_ARGS_ksysguard := -V'ksysguard (>= 4:3.5.5-1)'
+DEB_DH_MAKESHLIBS_ARGS_kwin := -V'kwin (>= 4:3.5.5-1)'
+DEB_DH_MAKESHLIBS_ARGS_libkonq4 := -V'libkonq4 (>= 4:3.5.5-1)'
#shlibs_ver = 4:3.5.0-1
#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
More information about the pkg-kde-commits
mailing list