[Pkg-kde-commits] rev 622 - in branches/kde-3.4.0/packages/kdebase/debian: . patches
Christopher Martin
chrsmrtn-guest@costa.debian.org
Thu, 03 Mar 2005 19:31:40 +0100
Author: chrsmrtn-guest
Date: 2005-03-03 19:31:39 +0100 (Thu, 03 Mar 2005)
New Revision: 622
Added:
branches/kde-3.4.0/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
Removed:
branches/kde-3.4.0/packages/kdebase/debian/patches/10_default_sessionsdirs.diff
Modified:
branches/kde-3.4.0/packages/kdebase/debian/control
branches/kde-3.4.0/packages/kdebase/debian/rules
Log:
Switch kdebase to CDBS.
Modified: branches/kde-3.4.0/packages/kdebase/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/control 2005-03-03 18:30:13 UTC (rev 621)
+++ branches/kde-3.4.0/packages/kdebase/debian/control 2005-03-03 18:31:39 UTC (rev 622)
@@ -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>, Isaac Clerencia <isaac@debian.org>
-Build-Depends: debhelper (>= 4.2.0), gawk, gettext, kdelibs4-dev (>> 4:3.3.2), lesstif-dev, libbz2-dev, libcdparanoia0-dev, libdb4.2-dev, libfontconfig1-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libraw1394-dev, libsasl2-dev, libsensors-dev, libsmbclient-dev, libssl-dev, libtiff4-dev, libxtst-dev, sharutils, texinfo, xlibs-static-pic, xutils
+Build-Depends: cdbs (>= 0.4.26), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>> 4:3.3.99), dbus-qt-1-dev, libldap2-dev, libhal-dev, libhal-storage-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev, libsensors-dev, libsmbclient-dev, libusb-dev, libxtst-dev, xutils, xlibs-static-pic, sharutils, texinfo
Build-Depends-Indep: doxygen, qt3-doc
Standards-Version: 3.6.1
@@ -104,7 +104,7 @@
Package: kdebase-data
Section: kde
Architecture: all
-Replaces: kdebase (<< 4:3.0.0), kdelibs-data (<< 4:3.3.0), kdewallpapers (<< 4:3.0.0)
+Replaces: kdebase (<< 4:3.0.0), kdeedu-data (<< 4:3.3.99), kdelibs-data (<< 4:3.3.0), kdewallpapers (<< 4:3.0.0)
Description: KDE Base (shared data)
KDE is a powerful Open Source graphical desktop environment
for Unix workstations. It combines ease of use, contemporary
@@ -119,7 +119,7 @@
Package: kdebase-dev
Section: devel
Architecture: any
-Depends: kate (= ${Source-Version}), kdesktop (= ${Source-Version}), kicker (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), kdelibs4-dev (>> 4:3.3.2)
+Depends: kate (= ${Source-Version}), kdesktop (= ${Source-Version}), kicker (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), kdelibs4-dev (>> 4:3.3.99)
Replaces: kate (<< 4:3.0.0), kdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
Description: KDE Base (development files)
KDE is a powerful Open Source graphical desktop environment
@@ -150,6 +150,7 @@
Section: kde
Architecture: any
Depends: ${shlibs:Depends}
+Recommends: hal, pmount
Suggests: khelpcenter, mtools
Conflicts: kdebase-libs (<< 4:3.0.0)
Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0)
@@ -217,7 +218,7 @@
Architecture: any
Depends: ${shlibs:Depends}, debconf (>= 1.2.9), kdebase-bin, libpam-runtime (>= 0.76-14), xbase-clients
Recommends: logrotate
-Suggests: khelpcenter, menu
+Suggests: khelpcenter
Provides: x-display-manager
Description: KDE Display Manager
KDE is a powerful Open Source graphical desktop environment
@@ -512,7 +513,7 @@
Architecture: any
Depends: ${shlibs:Depends}
Suggests: kdebase-bin (= ${Source-Version}), kdebase-data (= ${Source-Version}), kdesktop (= ${Source-Version}), kicker (= ${Source-Version}), kpager (= ${Source-Version}), kpersonalizer (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version})
-Replaces: kdebase (<< 4:3.0.0)
+Replaces: kdeartwork-theme-window (<< 4:3.3.99), kdebase (<< 4:3.0.0)
Description: KDE Window Manager
KDE is a powerful Open Source graphical desktop environment
for Unix workstations. It combines ease of use, contemporary
@@ -542,7 +543,7 @@
Package: libkonq4-dev
Section: libdevel
Architecture: any
-Depends: libkonq4 (= ${Source-Version}), kdelibs4-dev (>> 4:3.3.2)
+Depends: libkonq4 (= ${Source-Version}), kdelibs4-dev (>> 4:3.3.99)
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: Core libraries for KDE's file manager (development files)
Deleted: branches/kde-3.4.0/packages/kdebase/debian/patches/10_default_sessionsdirs.diff
Added: branches/kde-3.4.0/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/10_kdmrc_defaults.diff 2005-03-03 18:30:13 UTC (rev 621)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/10_kdmrc_defaults.diff 2005-03-03 18:31:39 UTC (rev 622)
@@ -0,0 +1,20 @@
+--- kde.orig/kdm/config.def
++++ kde.patched/kdm/config.def
+@@ -1342,7 +1342,7 @@
+ Type: string
+ Default: DEF_SERVER_CMD
+ User: core
+-Instance: :*/DEF_SERVER_CMD
++Instance: :*/"/usr/X11R6/bin/X"
+ Comment: &
+ Description:
+ The command line to start the &X-Server;, without display number and VT spec.
+@@ -1877,7 +1877,7 @@
+ Default: KDMDATA "/sessions"
+ User: core
+ User: greeter-c
+-Instance: #*/"/etc/X11/sessions,/usr/share/xsessions"
++Instance: */"/etc/X11/sessions,/usr/share/xsessions"
+ Comment:
+ The directories containing session type definitions in .desktop format.
+ Description:
Modified: branches/kde-3.4.0/packages/kdebase/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/rules 2005-03-03 18:30:13 UTC (rev 621)
+++ branches/kde-3.4.0/packages/kdebase/debian/rules 2005-03-03 18:31:39 UTC (rev 622)
@@ -1,230 +1,45 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets by Bill Allombert 2001
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+DEB_KDE_ENABLE_FINAL := yes
+DEB_KDE_APIDOX := yes
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
-
--include debian/debiandirs
-
-debian/debiandirs: admin/debianrules
- perl -w admin/debianrules echodirs > debian/debiandirs
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
-
- # Apply Debian specific patches
- if test -d $(CURDIR)/debian/patches ;\
- then \
- for i in $(CURDIR)/debian/patches/*.diff.uu ;\
- do \
- cd $(CURDIR)/debian/patches ;\
- uudecode "$$i" ;\
- cd $(CURDIR) ;\
- done ;\
- patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort);\
- fi ;\
- if test ! -f patch-stamp; then \
- for patch in $$patches ;\
- do \
- echo APPLYING PATCH\: "$${patch##*/}" ;\
- patch -p1 < "$$patch" ;\
- done ;\
- touch patch-stamp ;\
- fi
-
- # KDE CVS does not have aclocal.m4 or configure
- if test ! -f configure; then \
- $(MAKE) -f admin/Makefile.common dist ;\
- fi
-
- # ensure configure is executable
- chmod +x configure
-
- # make build directory
- mkdir $(objdir)
-
- # run configure with build tree $(objdir)
- cd $(objdir) && \
- ../configure $(configkde) --enable-final \
- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --with-shadow --without-java \
- --with-pam=kde --with-kcp-pam=kcheckpass \
- --with-kdm-pam=kdm --with-kss-pam=kscreensaver \
+DEB_CONFIGURE_EXTRA_FLAGS := --with-shadow --without-java --with-pam=kde \
+ --with-kcp-pam=kcheckpass --with-kdm-pam=kdm --with-kss-pam=kscreensaver \
--with-extra-includes=/usr/include/sasl
- touch configure-stamp
+DEB_FIXPERMS_EXCLUDE := usr/bin/kdesud
-#Architecture
-build: build-arch build-indep
+DEB_INSTALL_DOCS_ALL :=
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
- dh_testdir
+shlibs_ver=4:3.3.92-1
+DEB_DH_MAKESHLIBS_ARGS_kate := -V'kate (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_kcontrol := -V'kcontrol (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_kicker := -V'kicker (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_konqueror := -V'konqueror (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_ksplash := -V'ksplash (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_ksysguard := -V'ksysguard (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_kwin := -V'kwin (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkonq4 := -V'libkonq4 (>= $(shlibs_ver))'
- cd $(objdir) && \
- $(MAKE)
+DEB_SHLIBDEPS_INCLUDE := debian/kate/usr/lib debian/kcontrol/usr/lib \
+ debian/kicker/usr/lib debian/konqueror/usr/lib \
+ debian/ksplash/usr/lib debian/ksysguard/usr/lib \
+ debian/kwin/usr/lib debian/libkonq4/usr/lib
- # generate manpages
- #for i in debian/man/*.sgml; do \
- docbook-to-man $$i > `dirname $$i`/`basename $$i .sgml`.1 ;\
- done
+binary-install/kdebase-bin::
+ install -p -D -m644 debian/kcheckpass.pam debian/kdebase-bin/etc/pam.d/kcheckpass
- touch build-arch-stamp
+binary-install/kdm::
+ install -p -D -m644 debian/kdm.pam debian/kdm/etc/pam.d/kdm
+ install -p -D -m644 debian/kdm-np.pam debian/kdm/etc/pam.d/kdm-np
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
- dh_testdir
+binary-install/kscreensaver::
+ install -p -D -m644 debian/kscreensaver.pam debian/kscreensaver/etc/pam.d/kscreensaver
- cd $(objdir) && \
- $(MAKE)
-
- cd $(objdir) && \
- $(MAKE) apidox
-
- touch build-indep-stamp
-
-debian-clean:
- dh_testdir
- dh_testroot
-
- dh_clean
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-arch-stamp build-indep-stamp configure-stamp \
- debian/debiandirs debian/system.kdeglobals
-
- # Remove Debian specific patches
- if test -d $(CURDIR)/debian/patches ;\
- then \
- patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort -r);\
- fi ;\
- if test -f patch-stamp; then \
- for patch in $$patches ;\
- do \
- echo REMOVING PATCH\: "$${patch##*/}" ;\
- patch -p1 -R < "$$patch" ;\
- done ;\
- for i in $(CURDIR)/debian/patches/*.diff.uu ;\
- do \
- rm -f "$${i%%.uu}" ;\
- done ;\
- rm -f patch-stamp ;\
- fi
-
- # Remove build tree
- rm -rf $(objdir)
-
- # if Makefile exists run distclean
- if test -f Makefile; then \
- $(MAKE) distclean; \
- fi
-
- if test -d CVS; then \
- $(MAKE) -f admin/Makefile.common cvs-clean ;\
- fi
-
- dh_clean
-
-install: install-arch install-indep
-
-install-arch:
- dh_testdir
- dh_testroot
- dh_clean -k -s
- dh_installdirs -s
-
- cd $(objdir) && \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
- install -D -m 644 $(CURDIR)/debian/kcheckpass.pam $(CURDIR)/debian/tmp/etc/pam.d/kcheckpass
- install -D -m 644 $(CURDIR)/debian/kdm-np.pam $(CURDIR)/debian/tmp/etc/pam.d/kdm-np
- install -D -m 644 $(CURDIR)/debian/kscreensaver.pam $(CURDIR)/debian/tmp/etc/pam.d/kscreensaver
-
- dh_install -s
-
-install-indep:
- dh_testdir
- dh_testroot
- dh_clean -k -i
- dh_installdirs -i
-
- cd $(objdir) && \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
- cd $(objdir) && \
- $(MAKE) install-apidox DESTDIR=$(CURDIR)/debian/tmp
-
- dh_install -i
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
- dh_testdir
- dh_testroot
- dh_installxfonts
- dh_installchangelogs
- dh_installdocs
-# dh_installexamples
- dh_installmenu
- dh_installdebconf
- dh_installlogrotate
-# dh_installemacsen
- dh_installpam
- dh_installmime
- dh_installinit --noscripts
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag
- dh_fixperms -Xusr/bin/fileshareset -Xusr/bin/kdesud
-# dh_perl
-# dh_python
- env DH_COMPAT=3 dh_makeshlibs -V
- dh_installdeb
- dh_shlibdeps -ldebian/kate/usr/lib:debian/kicker/usr/lib:debian/konqueror/usr/lib:debian/ksplash/usr/lib:debian/ksysguard/usr/lib:debian/kwin/usr/lib:debian/libkonq4/usr/lib
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+binary-install/xfonts-konsole::
+ dh_installxfonts -pxfonts-konsole