[Pkg-kde-commits] rev 1305 - in branches/kde-3.4.0/packages/kdebase/debian: . patches
Christopher Martin
chrsmrtn-guest@costa.debian.org
Thu, 14 Jul 2005 04:50:22 +0000
Author: chrsmrtn-guest
Date: 2005-07-14 04:50:21 +0000 (Thu, 14 Jul 2005)
New Revision: 1305
Modified:
branches/kde-3.4.0/packages/kdebase/debian/changelog
branches/kde-3.4.0/packages/kdebase/debian/control
branches/kde-3.4.0/packages/kdebase/debian/patches/07_xlibs-static-pic.diff
Log:
X.Org transition for kdebase. Here, the 07_xlibs-static-pic.diff stays,
albeir cut down, as well as the build-dep on xlibs-static-pic, since
libfontenc_pic.a is still shipped in xlibs-static-pic, and isn't mentioned
in the list of split out headers/libs that David sent to -devel. I think
this is right...
Modified: branches/kde-3.4.0/packages/kdebase/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/changelog 2005-07-14 04:47:54 UTC (rev 1304)
+++ branches/kde-3.4.0/packages/kdebase/debian/changelog 2005-07-14 04:50:21 UTC (rev 1305)
@@ -5,6 +5,10 @@
* [debian/po/vi.po] : add the Vietnamese debconf translation by Clytie
Siddall. (Closes: #312156)
+ * Add build-dependencies on libxss-dev, libxxf86misc-dev, libxau-dev,
+ libxdmcp-dev, and prune the 07_xlibs-static-pic.diff accordingly, for
+ the X.Org transition.
+
+++ Changes by Christopher Martin:
* Tighten all package relations between packages in kdebase, preventing many
Modified: branches/kde-3.4.0/packages/kdebase/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/control 2005-07-14 04:47:54 UTC (rev 1304)
+++ branches/kde-3.4.0/packages/kdebase/debian/control 2005-07-14 04:50:21 UTC (rev 1305)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Isaac Clerencia <isaac@debian.org>, Pierre Habouzit <madcoder@debian.org>, Christopher Martin <chrsmrtn@freeshell.org>, Adeodato Simó <asp16@alu.ua.es>, Riku Voipio <riku.voipio@iki.fi>
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.4.1), 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: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.4.1), 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, libxss-dev, libxxf86misc-dev, libxau-dev, libxdmcp-dev, sharutils, texinfo
Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11
Build-Conflicts: nvidia-glx
Standards-Version: 3.6.1
Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/07_xlibs-static-pic.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/07_xlibs-static-pic.diff 2005-07-14 04:47:54 UTC (rev 1304)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/07_xlibs-static-pic.diff 2005-07-14 04:50:21 UTC (rev 1305)
@@ -12,91 +12,3 @@
AC_DEFINE(HAVE_FONT_ENC, 1, [Defines if you have FontEnc])
fi
LDFLAGS="$ac_LDFLAGS_save"
---- kde.orig/kdesktop/configure.in.in
-+++ kde.patched/kdesktop/configure.in.in
-@@ -15,10 +15,10 @@
- xss_save_cxxflags="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $lt_prog_compiler_pic_CXX"
- KDE_CHECK_COMPILER_FLAG(shared, [ld_shared_flag="-shared"])
-- AC_CHECK_LIB(Xss,XScreenSaverQueryInfo,
-+ AC_CHECK_LIB(Xss_pic,XScreenSaverQueryInfo,
- [
- AC_DEFINE(HAVE_XSCREENSAVER, 1, [Define if you have the XScreenSaver extension])
-- LIB_XSS="-lXss"
-+ LIB_XSS="-lXss_pic"
- ],
- [],
- [ $ld_shared_flag $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ])
---- kde.orig/kdesktop/lock/configure.in.in
-+++ kde.patched/kdesktop/lock/configure.in.in
-@@ -5,10 +5,10 @@
-
- KDE_CHECK_HEADER(X11/extensions/xf86misc.h,
- [
-- AC_CHECK_LIB(Xxf86misc,XF86MiscQueryVersion,
-+ AC_CHECK_LIB(Xxf86misc_pic,XF86MiscQueryVersion,
- [
- AC_DEFINE(HAVE_XF86MISC, 1, [Define if you have the xf86misc extension])
-- LIB_XF86MISC="-lXxf86misc"
-+ LIB_XF86MISC="-lXxf86misc_pic"
- ],
- [], [ $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ])
- ],[],
-@@ -18,7 +18,7 @@
- AC_SUBST(LIB_XF86MISC)
-
- if test -n "$LIB_XF86MISC"; then
-- AC_CHECK_LIB(Xxf86misc,XF86MiscSetGrabKeysState,
-+ AC_CHECK_LIB(Xxf86misc_pic,XF86MiscSetGrabKeysState,
- [
- AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE, 1, [Define if you have XF86MiscSetGrabKeysState()])
- ],
---- kde.orig/kdm/backend/Makefile.am
-+++ kde.patched/kdm/backend/Makefile.am
-@@ -4,7 +4,7 @@
- $(XDM_DEFINES) -I..
- CFLAGS = $(XDM_CFLAGS)
- LDFLAGS = $(USER_LDFLAGS) $(X_LDFLAGS) $(X_RPATH) $(KRB4_RPATH) $(KRB5_RPATH)
--LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) \
-+LDADD = $(LIB_X11) -lXau_pic $(LIBXDMCP) $(PASSWDLIBS) \
- $(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(LIBSOCKET) $(LIBRESOLV) \
- $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
-
---- kde.orig/kdm/configure.in.in
-+++ kde.patched/kdm/configure.in.in
-@@ -112,7 +112,7 @@
- AC_MSG_RESULT([done])
- eval "$kde_cv_defines_imake"
-
--AC_CHECK_LIB(Xau, main, [:],
-+AC_CHECK_LIB(Xau_pic, main, [:],
- [
- AC_MSG_WARN([Cannot build KDM! Make sure that libXau.a is installed!])
- DO_NOT_COMPILE="$DO_NOT_COMPILE kdm"
-@@ -123,7 +123,7 @@
- AC_HELP_STRING([--without-xdmcp],[build kdm without xdmcp support [default=with xdmcp]]), ,
- [with_xdmcp=yes])
- if test "x$with_xdmcp" = xyes; then
-- AC_CHECK_LIB(Xdmcp, main, [LIBXDMCP="-lXdmcp"], , $X_LDFLAGS -lX11 $LIBSOCKET)
-+ AC_CHECK_LIB(Xdmcp_pic, main, [LIBXDMCP="-lXdmcp_pic"], , $X_LDFLAGS -lX11 $LIBSOCKET)
- if test -n "$LIBXDMCP"; then
- cppflags_safe=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $X_INCLUDES"
---- kde.orig/kxkb/Makefile.am
-+++ kde.patched/kxkb/Makefile.am
-@@ -12,13 +12,13 @@
-
- kcm_keyboard_la_SOURCES = extension.cpp rules.cpp kcmlayout.cpp pixmap.cpp kcmlayoutwidget.ui kcmmisc.cpp kcmmiscwidget.ui
- kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
--kcm_keyboard_la_LIBADD = -lxkbfile $(XTESTLIB) $(LIB_KIO)
-+kcm_keyboard_la_LIBADD = -lxkbfile_pic $(XTESTLIB) $(LIB_KIO)
-
- #kxkb_la_includedir = .
- #kxkb_la_include_HEADERS = kxkb.h
- kxkb_la_SOURCES = kxkb.cpp rules.cpp extension.cpp pixmap.cpp kxkb.skel
- kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kxkb_la_LIBADD = -lxkbfile -lX11 -lXext $(LIB_KDEUI)
-+kxkb_la_LIBADD = -lxkbfile_pic -lX11 -lXext $(LIB_KDEUI)
-
- xdg_apps_DATA = keyboard.desktop keyboard_layout.desktop
-