[Pkg-kde-commits] rev 567 - branches/kde-3.4.0/packages/kdelibs/debian

Christopher Martin chrsmrtn-guest@costa.debian.org
Wed, 02 Mar 2005 22:41:16 +0100 

Author: chrsmrtn-guest
Date: 2005-03-02 22:41:15 +0100 (Wed, 02 Mar 2005)
New Revision: 567

Added:
   branches/kde-3.4.0/packages/kdelibs/debian/kdelibs.docs
Modified:
   branches/kde-3.4.0/packages/kdelibs/debian/changelog
   branches/kde-3.4.0/packages/kdelibs/debian/control
   branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-bin.manpages
   branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-bin.preinst
   branches/kde-3.4.0/packages/kdelibs/debian/kdelibs4-dev.docs
   branches/kde-3.4.0/packages/kdelibs/debian/kdelibs4-dev.manpages
   branches/kde-3.4.0/packages/kdelibs/debian/kdelibs4.preinst
   branches/kde-3.4.0/packages/kdelibs/debian/rules
Log:
Removed xlibmesa-glu-dev from build-deps.

Changed "replaces x.3.91" to x.3.99 so all pre 3.4.0 stuff is covered.

kdelibs4-dev (more closely) depends on what the whole package build-depends on.

Preinst script cleanups.

Sync changelog with 3.3 branch uploads.

DEB_SHLIBDEPS_INCLUDE := debian/kdelibs-bin/usr/lib shouldn't be needed since nothing shared there.

Fiddled with the distribution of READMEs and other docs throughout the packages.



Modified: branches/kde-3.4.0/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-03-02 21:16:18 UTC (rev 566)
+++ branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-03-02 21:41:15 UTC (rev 567)
@@ -6,6 +6,14 @@
     the like instead of absolute paths, so that /usr/bin/kde-config doesn't
     output them expanded even when --expandvars is not used. (Closes: #287822)
 
+  +++ Changes by Christopher Martin
+
+  * Clean out useless manpages. New or better ones welcome...
+    (Closes: #292084)
+
+  * The GFDL is no longer needed, as the manpages have been relicensed.
+    (Closes: #292085)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Date
 
 kdelibs (4:3.4.0~rc1-1) experimental; urgency=low
@@ -17,6 +25,24 @@
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 27 Feb 2005 22:52:54 +0100
 
+kdelibs (4:3.3.2-3) unstable; urgency=high
+
+  * Urgency high as it closes a security RC bug
+
+  +++ Changes by Isaac Clerencia:
+
+  * Fix syntax error in dcopidlng, closes: #297095 (was causing kdepim an
+    others to FTBFS).
+
+  * Apply patch from KDE 3.4 to fix CAN-2005-0237 (spoofing using IDN),
+    closes: #294271, #294204. IDN is now disabled in all KDE apps unless
+    the environment variable KDE_USE_IDN is set.
+
+  * Christopher Cheney has kindly relicensed man pages written by him from
+    GDFL to GPL, update the license statement accordingly. Closes: #292085.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Mon, 28 Feb 2005 14:05:30 +0100
+
 kdelibs (4:3.3.2-2) unstable; urgency=high
 
   +++ Changes by Adeodato Simó:

Modified: branches/kde-3.4.0/packages/kdelibs/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/control	2005-03-02 21:16:18 UTC (rev 566)
+++ branches/kde-3.4.0/packages/kdelibs/debian/control	2005-03-02 21:41:15 UTC (rev 567)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Christopher L Cheney <ccheney@debian.org>, Adeodato Simó <asp16@alu.ua.es>, Christopher Martin <chrsmrtn@freeshell.org>, Riku Voipio <riku.voipio@iki.fi>
-Build-Depends: cdbs (>= 0.4.26), debhelper (>= 4.2.30), autotools-dev, docbook-to-man, gawk, gettext, libart-2.0-dev, libarts1-dev (>> 1.3.91), libasound2-dev, libaspell-dev, libbz2-dev, libcupsys2-dev, libdb4.2-dev, libfam-dev, libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libldap2-dev, libopenexr-dev (>= 1.2.1), libpam0g-dev, libpcre3-dev, libqt3-mt-dev (>= 3.3.3), libsasl2-dev, libssl-dev, libtiff4-dev, libxml2-dev, libxml2-utils, libxrender-dev, libxslt1-dev, sharutils, texinfo, xlibmesa-glu-dev
+Build-Depends: cdbs (>= 0.4.26), debhelper (>= 4.2.30), autotools-dev, docbook-to-man, gawk, gettext, libart-2.0-dev, libarts1-dev (>> 1.3.99), libasound2-dev, libaspell-dev, libbz2-dev, libcupsys2-dev, libdb4.2-dev, libfam-dev, libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libldap2-dev, libopenexr-dev (>= 1.2.1), libpam0g-dev, libpcre3-dev, libqt3-mt-dev (>= 3.3.3), libsasl2-dev, libssl-dev, libtiff4-dev, libxml2-dev, libxml2-utils, libxrender-dev, libxslt1-dev, sharutils, texinfo
 Build-Depends-Indep: doxygen, qt3-doc
 Standards-Version: 3.6.1
 
@@ -26,7 +26,7 @@
 Depends: ${shlibs:Depends}, menu-xdg, netpbm, perl, python
 Recommends: perl-suid
 Conflicts: kdelibs-dev (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdelibs3-cups (<< 4:3.0.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0)
-Replaces: kcontrol (<< 4:3.3.91), kdelibs-dev (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdelibs3-cups (<< 4:3.0.0), konqueror (<< 4:3.2.0), korganizer (<< 4:3.3.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0)
+Replaces: kcontrol (<< 4:3.3.99), kdelibs-dev (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdelibs3-cups (<< 4:3.0.0), konqueror (<< 4:3.2.0), korganizer (<< 4:3.3.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0)
 Description: KDE core binaries
  KDE is a powerful Open Source graphical desktop environment
  for Unix workstations. It combines ease of use, contemporary
@@ -43,7 +43,7 @@
 Architecture: all
 Depends: hicolor-icon-theme
 Conflicts: kdelibs3 (<< 4:3.0.0), kdelibs3-cups (<< 4:3.0.0), kdetrayproxy (>= 0.2-1), kontour (<< 1:1.3.0)
-Replaces: kbabel (<< 4:3.2.0), kchart (<< 1:1.3.0), kcontrol (<< 4:3.3.0), kdeartwork-style (<< 4:3.3.91), kdelibs3 (<< 4:3.0.0), kdelibs3-cups (<< 4:3.0.0), kdetrayproxy (>= 0.2-1),  kformula (<< 1:1.3.0), kivio (<< 1:1.3.0), koffice-data (<< 1:1.3.0-2), koffice-libs (<< 1:1.3.0), kontour (<< 1:1.3.0), korganizer (<< 4:3.3.0), kpresenter (<< 1:1.3.0), krusader (<< 1.30-2), kspread (<< 1:1.3.0), kugar (<< 1:1.3.0), kword (<< 1:1.3.0), kjscmd (<< 4:3.3.0), konq-plugins (<< 4:3.3.91), ksvg (<< 4:3.3.91), openoffice.org (<< 1.0.3-3), openoffice.org-mimelnk (<< 1.1.3)
+Replaces: kbabel (<< 4:3.2.0), kchart (<< 1:1.3.0), kcontrol (<< 4:3.3.0), kdeartwork-style (<< 4:3.3.99), kdelibs3 (<< 4:3.0.0), kdelibs3-cups (<< 4:3.0.0), kdetrayproxy (>= 0.2-1),  kformula (<< 1:1.3.0), kivio (<< 1:1.3.0), koffice-data (<< 1:1.3.0-2), koffice-libs (<< 1:1.3.0), kontour (<< 1:1.3.0), korganizer (<< 4:3.3.0), kpresenter (<< 1:1.3.0), krusader (<< 1.30-2), kspread (<< 1:1.3.0), kugar (<< 1:1.3.0), kword (<< 1:1.3.0), kjscmd (<< 4:3.3.0), konq-plugins (<< 4:3.3.99), ksvg (<< 4:3.3.99), openoffice.org (<< 1.0.3-3), openoffice.org-mimelnk (<< 1.1.3)
 Description: KDE core shared data
  KDE is a powerful Open Source graphical desktop environment
  for Unix workstations. It combines ease of use, contemporary
@@ -59,7 +59,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, kdelibs-bin (= ${Source-Version}), kdelibs-data (>= 4:3.3.0), xbase-clients
 Conflicts: kdelibs3 (<< 4:3.0.0), kdepim-libs (<< 4:3.0.0), kdetrayproxy (>= 0.2-1), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), kdeaccessibility (<< 3.3.0), kdeaddons (<< 4:3.3.0), kdeadmin (<< 4:3.3.0), kdeartwork (<< 4:3.3.0), kdebase (<< 4:3.3.0), kdebindings (<< 4:3.3.0), kdeedu (<< 4:3.3.0), kdegames (<< 4:3.3.0), kdegraphics (<< 4:3.3.0), kde-i18n (<< 4:3.3.0), kdemultimedia (<< 4:3.3.0), kdenetwork (<< 4:3.3.0), kdepim (<< 4:3.3.0), kdesdk (<< 4:3.3.0), kdetoys (<< 4:3.3.0), kdeutils (<< 4:3.3.0), kdewebdev (<< 1:3.3.0)
-Replaces: kdelibs3 (<< 4:3.0.0), kdepim-libs (<< 4:3.0.0), kdetrayproxy (>= 0.2-1), korganizer (<< 4:3.3.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), kdeartwork-style (<< 4:3.3.91)
+Replaces: kdelibs3 (<< 4:3.0.0), kdepim-libs (<< 4:3.0.0), kdetrayproxy (>= 0.2-1), korganizer (<< 4:3.3.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), kdeartwork-style (<< 4:3.3.99)
 Description: KDE core libraries
  KDE is a powerful Open Source graphical desktop environment
  for Unix workstations. It combines ease of use, contemporary
@@ -74,10 +74,10 @@
 Package: kdelibs4-dev
 Section: libdevel
 Architecture: any
-Depends: kdelibs4 (= ${Source-Version}), kdelibs-bin (= ${Source-Version}), libart-2.0-dev, libarts1-dev (>> 1.3.91), libcupsys2-dev, libfam-dev, libidn11-dev, libpcre3-dev, libssl-dev, libxml2-utils, libxrender-dev
+Depends: kdelibs4 (= ${Source-Version}), kdelibs-bin (= ${Source-Version}), libart-2.0-dev, libarts1-dev (>= 1.4.0), libasound2-dev, libaspell-dev, libbz2-dev, libcupsys2-dev, libfam-dev, libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libopenexr-dev (>= 1.2.1), libpcre3-dev, libqt3-mt-dev (>= 3.3.3), libsasl2-dev, libssl-dev, libtiff4-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libxrender-dev
 Provides: kdelibs-dev
 Conflicts: kdelibs-dev (<< 4:3.0.0), kdelibs3 (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdepim-libs (<< 4:3.0.0), libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), libarts-dev (<< 4:3.0.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), libkmid-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0)
-Replaces: kate (<< 4:3.0.0), kdebase-dev (<< 4:3.3.91), kdelibs-dev (<< 4:3.0.0), kdelibs3 (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdelibs4 (<< 4:3.2.0), kdepim-dev (<< 4:3.3.0), kdepim-libs (<< 4:3.0.0), libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), libarts-dev (<< 4:3.0.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), libkmid-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0), libkonq4-dev (<< 4:3.2.0)
+Replaces: kate (<< 4:3.0.0), kdebase-dev (<< 4:3.3.99), kdelibs-dev (<< 4:3.0.0), kdelibs3 (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdelibs4 (<< 4:3.2.0), kdepim-dev (<< 4:3.3.0), kdepim-libs (<< 4:3.0.0), libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), libarts-dev (<< 4:3.0.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), libkmid-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0), libkonq4-dev (<< 4:3.2.0)
 Description: KDE core libraries (development files)
  KDE is a powerful Open Source graphical desktop environment
  for Unix workstations. It combines ease of use, contemporary

Modified: branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-bin.manpages
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-bin.manpages	2005-03-02 21:16:18 UTC (rev 566)
+++ branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-bin.manpages	2005-03-02 21:41:15 UTC (rev 567)
@@ -1,43 +1,19 @@
 debian/man/artsmessage.1
 debian/man/cupsdconf.1
-debian/man/cupsdoprint.1
 debian/man/dcop.1
-debian/man/dcopclient.1
-debian/man/dcopfind.1
-debian/man/dcopobject.1
-debian/man/dcopref.1
 debian/man/dcopserver.1
-debian/man/dcopserver_shutdown.1
-debian/man/dcopstart.1
-debian/man/imagetops.1
-debian/man/kab2kabc.1
 debian/man/kaddprinterwizard.1
 debian/man/kbuildsycoca.1
 debian/man/kconf_update.1
 debian/man/kcookiejar.1
-debian/man/kde-config.1
 debian/man/kded.1
-debian/man/kdeinit.1
-debian/man/kdeinit_shutdown.1
-debian/man/kdeinit_wrapper.1
-debian/man/kdesu_stub.1
 debian/man/kdontchangethehostname.1
 debian/man/kfile.1
-debian/man/kimage_concat.1
 debian/man/kinstalltheme.1
 debian/man/kio_http_cache_cleaner.1
 debian/man/kio_uiserver.1
-debian/man/kioslave.1
-debian/man/klauncher.1
 debian/man/kmailservice.1
-debian/man/kpac_dhcp_helper.1
 debian/man/ksendbugmail.1
-debian/man/kshell.1
-debian/man/ksvgtopng.1
 debian/man/ktelnetservice.1
-debian/man/kwrapper.1
 debian/man/lnusertemp.1
-debian/man/make_driver_db_cups.1
-debian/man/make_driver_db_lpr.1
 debian/man/meinproc.1
-debian/man/preparetips.1

Modified: branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-bin.preinst
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-bin.preinst	2005-03-02 21:16:18 UTC (rev 566)
+++ branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-bin.preinst	2005-03-02 21:41:15 UTC (rev 567)
@@ -1,29 +1,14 @@
-#! /bin/sh
-# preinst script for kdelibs-bin
-#
-# see: dh_installdeb(1)
+#! /bin/sh -e
 
-set -e
+case "$1" in
 
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
+    upgrade)
+	rm -f /etc/menu-methods/freedesktop-desktop-entry-spec-apps
+	rm -f /etc/menu-methods/freedesktop-desktop-entry-spec-dirs
+	rm -f /etc/menu-methods/kdelibs-bin
+    ;;
 
-
-case "$1" in
-    install|upgrade)
-        if [ "$1" = "upgrade" ]
-        then
-	    # Debian unstable (Sid) files
-	    rm -f /etc/menu-methods/freedesktop-desktop-entry-spec-apps
-	    rm -f /etc/menu-methods/freedesktop-desktop-entry-spec-dirs
-	    rm -f /etc/menu-methods/kdelibs-bin
-        fi
+    install)
     ;;
 
     abort-upgrade)
@@ -33,13 +18,9 @@
         echo "preinst called with unknown argument \`$1'" >&2
         exit 1
     ;;
+
 esac
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
 #DEBHELPER#
 
 exit 0
-
-

Added: branches/kde-3.4.0/packages/kdelibs/debian/kdelibs.docs
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/kdelibs.docs	2005-03-02 21:16:18 UTC (rev 566)
+++ branches/kde-3.4.0/packages/kdelibs/debian/kdelibs.docs	2005-03-02 21:41:15 UTC (rev 567)
@@ -0,0 +1 @@
+debian/README.Debian

Modified: branches/kde-3.4.0/packages/kdelibs/debian/kdelibs4-dev.docs
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/kdelibs4-dev.docs	2005-03-02 21:16:18 UTC (rev 566)
+++ branches/kde-3.4.0/packages/kdelibs/debian/kdelibs4-dev.docs	2005-03-02 21:41:15 UTC (rev 567)
@@ -1,4 +1,6 @@
 DEBUG
 KDE3PORTING.html
 NAMING
+README
 debian/Packaging.txt
+debian/README.Debian

Modified: branches/kde-3.4.0/packages/kdelibs/debian/kdelibs4-dev.manpages
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/kdelibs4-dev.manpages	2005-03-02 21:16:18 UTC (rev 566)
+++ branches/kde-3.4.0/packages/kdelibs/debian/kdelibs4-dev.manpages	2005-03-02 21:41:15 UTC (rev 567)
@@ -1,3 +1 @@
-debian/man/checkXML.1
-debian/man/dcopidl.1
-debian/man/dcopidl2cpp.1
+debian/man/kde-config.1

Modified: branches/kde-3.4.0/packages/kdelibs/debian/kdelibs4.preinst
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/kdelibs4.preinst	2005-03-02 21:16:18 UTC (rev 566)
+++ branches/kde-3.4.0/packages/kdelibs/debian/kdelibs4.preinst	2005-03-02 21:41:15 UTC (rev 567)
@@ -1,31 +1,13 @@
-#! /bin/sh
-# preinst script for kdelibs4
-#
-# see: dh_installdeb(1)
+#! /bin/sh -e
 
-set -e
+case "$1" in
 
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
+    upgrade)
+	rm -f /etc/kderc
+	rm -f /etc/pam.d/kde
+    ;;
 
-
-case "$1" in
-    install|upgrade)
-        if [ "$1" = "upgrade" ]
-        then
-	    # Debian 3.0 (Woody) files
-	    rm -f /etc/kderc
-	    rm -f /etc/pam.d/kde
-	    # Debian testing (Sarge) files
-	    #rm -f /etc/kde3/system.kdeglobals
-	    rm -f /etc/kderc
-        fi
+    install)
     ;;
 
     abort-upgrade)
@@ -35,13 +17,9 @@
         echo "preinst called with unknown argument \`$1'" >&2
         exit 1
     ;;
+
 esac
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
 #DEBHELPER#
 
 exit 0
-
-

Modified: branches/kde-3.4.0/packages/kdelibs/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/rules	2005-03-02 21:16:18 UTC (rev 566)
+++ branches/kde-3.4.0/packages/kdelibs/debian/rules	2005-03-02 21:41:15 UTC (rev 567)
@@ -33,17 +33,12 @@
 
 DEB_INSTALL_DOCS_ALL :=
 
-shlibs_ver=4:3.3.91
+shlibs_ver=4:3.3.99
 DEB_DH_MAKESHLIBS_ARGS_kdelibs4 := -V'kdelibs4 (>= $(shlibs_ver))'
 
 DEB_SHLIBDEPS_INCLUDE := \
 	debian/kdelibs4/usr/lib
-	# XXX this one not? debian/kdelibs-bin/usr/lib
 
 binary-install/kdelibs-bin::
 	install -p -D -m644 debian/kdelibs-bin.lintian \
 	debian/kdelibs-bin/usr/share/lintian/overrides/kdelibs-bin
-
-#binary-install/kdelibs-data::
-#	rm -f debian/kdelibs-data/usr/share/doc/kde/HTML/en/common/*-license*
-#	rm -f debian/kdelibs-data/usr/share/icons/hicolor/index.theme