Author: domi-guest
Date: 2004-04-07 16:46:25 -0600 (Wed, 07 Apr 2004)
New Revision: 96
Modified:
trunk/packages/kdelibs/debian/Packaging.txt
trunk/packages/kdelibs/debian/dh-make/menu.ex
trunk/packages/kdelibs/debian/dh-make/rules
trunk/packages/kdelibs/debian/kdelibs4-dev.install
Log:
Commit the doc and dh-make adaptations as discussed on debian-qt-kde and
#debian-kde
Modified: trunk/packages/kdelibs/debian/Packaging.txt
===================================================================
--- trunk/packages/kdelibs/debian/Packaging.txt 2004-04-06 02:16:13 UTC (rev 95)
+++ trunk/packages/kdelibs/debian/Packaging.txt 2004-04-07 22:46:25 UTC (rev 96)
@@ -37,6 +37,7 @@
?package(konqueror):\
needs="x11"\
section="Apps/Net"\
+ icon="/usr/share/pixmaps/ksmiletris.xpm"\
hints="KDE,Web browsers"\
title="Konqueror"\
command="kfmclient openProfile webbrowsing"
@@ -53,21 +54,21 @@
be successful things like Build-Depends have to be accurate. A typical
Build-Depends line for a KDE based application will look something like this:
- Build-Depends: debhelper (>> 3.0.0), automake, autoconf, libtool,
kdelibs4-dev (>= 3.0-0.alpha1-0)
+ Build-Depends: debhelper (>> 4.0.0), automake1.7, autoconf, libtool,
kdelibs4-dev (>= 3.2.0)
Your app may need alot more than that to actually build however first take a
-look at the Dependencies for kdelibs-dev:
+look at the Dependencies for kdelibs4-dev:
- Depends: kdelibs3 (= 4:2.1.1-5), libarts-dev (= 4:2.1.1-5), libkmid-dev (=
4:2.1.1-5), libqt-dev (>= 2:2.3.0), libaudiofile-dev, gettext, libtiff3g-dev,
jade, sgml-base, docbook, docbook-stylesheets, libpcre3-dev
+ Depends: kdelibs4 (= 4:3.2.1-1), kdelibs-bin (= 4:3.2.1-1),
libart-2.0-dev, libarts1-dev (>> 1.2.1), libcupsys2-dev, libfam-dev,
libpcre3-dev, libssl-dev, libxml2-utils, libxrender-dev
-and the Dependencies for libqt-dev:
+and the Dependencies for libqt3-mt-dev:
- Depends: libc6 (>= 2.2.2-2), libqt2 (>= 2:2.3.0-final-1) | libqt2-gl (>=
2:2.3.0-final-1), libstdc++2.10-glibc2.2, xlibs (>= 4.0.1-11), perl, libqutil1
(= 2:2.3.0-final-2), uic, xlibs-dev, libmng-dev, libpng2-dev, libjpeg62-dev,
libz-dev, libfreetype6-dev, libc6-dev
+ Depends: xlibs-dev (>= 4.2.1), libmng-dev (>= 1.0.3), libpng12-0-dev,
libjpeg62-dev, zlib1g-dev, libfreetype6-dev, libc6-dev, libqt3c102-mt (=
3:3.2.3-2), libqt3-headers (= 3:3.2.3-2), qt3-dev-tools (= 3:3.2.3-2),
xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu1-mesa-dev | libglu-dev,
libxft-dev, libxrender-dev, libxcursor-dev, libaudio-dev, xlibs-pic
so between the 2 of them you have Build-Depends that equate to:
- kdelibs-dev, libarts-dev, libkmid-dev, libqt-dev, libaudiofile-dev, gettext,
libtiff3g-dev | libtiff-dev, jade, sgml-base, docbook, docbook-stylesheets,
libpcre3-dev, xlibs-dev, libmng-dev, libpng2-dev, libjpeg62-dev, libz-dev,
libfreetype6-dev
+ kdelibs-dev, libart-2.0-dev, libarts1-dev, libcupsys2-dev, libfam-dev,
libpcre3-dev, libssl-dev, libxml2-utils, libxrender-dev, xlibs-dev, libmng-dev,
libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype5-dev, libc6-dev,
libqt3-headers, qt3-dev-tools, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev |
libglu1-mesa-dev | libglu-dev, libxft-dev, libxcursor-dev, libaudio-dev
99% of the time that will more than cover a KDE app. There will of course
be specific stuff you'll need to add....for example knetfilter requires
iptables
@@ -79,42 +80,29 @@
debianrules
===========
- If your KDE based app uses the kde-common stuff you'll have a admin/
-subdir which if it's recent will contain a debianrules perl script. The
-current version of it (sitting in /usr/share/doc/kdelibs-dev/dh-make) does very
-little. The biggest job it has is to make sure that all the KDE variables are
-set properly for build...this includes a configure line.
+ If your KDE based app uses the kde-common stuff you'll have a admin/
+subdir which if it's recent will contain a debianrules perl script.
+The current version of it does very little. The biggest job it has is
+to make sure that all the KDE variables are set properly for
+build...this includes a configure line.
- If you place the debianrules script into your debian/ directory (if it
-doesn't already exist in admin/ or that one is a older version) you can modify
-your debian/rules script to make use of it like so:
+With the code in the rules file of the kde dh-make template, you can
+see we create a file called debian/debiandirs which contains all the
+variables like kde_htmldir set to the proper Debian settings. It also
+sets up the configkde variable which currently looks like this:
+ configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix)
--sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir)
--mandir=$(mandir) --with-qt-dir=$(qtdir)
-
- configure: configure-stamp
-
- -include debian/debiandirs
-
- debian/debiandirs: debian/debianrules
- perl -w debian/debianrules echodirs > debian/debiandirs
-
- configure-stamp:
- dh_testdir
-
- ./configure $(configkde)
-
-
-With this you can see we create a file called debian/debiandirs which contains
-all the variables like kde_htmldir set to the proper Debian settings. It
-also sets up the configkde variable which currently looks like this:
-
- configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix)
--libexecdir=$(kde_bindir) --with-qt-includes=/usr/include/qt
--mandir=$(mandir) --infodir=$(infodir)
-
-
You can add your custom configure bits after the $(configkde). However 9 times
out of 10 you won't have to do a thing.
+====
+CDBS
+====
+
+TODO: a paragraph about CDBS and kde.mk.
+
==================
Missing something?
==================
Modified: trunk/packages/kdelibs/debian/dh-make/menu.ex
===================================================================
--- trunk/packages/kdelibs/debian/dh-make/menu.ex 2004-04-06 02:16:13 UTC
(rev 95)
+++ trunk/packages/kdelibs/debian/dh-make/menu.ex 2004-04-07 22:46:25 UTC
(rev 96)
@@ -1,2 +1,4 @@
-?package(#PACKAGE#):needs="X11|text|vc|wm" section="Apps/see-menu-manual"\
- title="#PACKAGE#" hints="KDE" command="/usr/bin/#PACKAGE#"
+?package(#PACKAGE#):needs="X11" section="Apps/see-menu-manual"\
+ title="#PACKAGE#" \
+ icon="/usr/share/pixmaps/ksmiletris.xpm" \
+ hints="KDE" command="/usr/bin/#PACKAGE#"
Modified: trunk/packages/kdelibs/debian/dh-make/rules
===================================================================
--- trunk/packages/kdelibs/debian/dh-make/rules 2004-04-06 02:16:13 UTC (rev 95)
+++ trunk/packages/kdelibs/debian/dh-make/rules 2004-04-07 22:46:25 UTC (rev 96)
@@ -5,9 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-
# 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)
@@ -15,11 +12,15 @@
objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
+ INSTALL_PROGRAM += -s
endif
ifeq ($(DEB_BUILD_GNU_TYPE),i386-linux)
@@ -38,15 +39,15 @@
# To be used with kde-style admin subdirectories if desired. debian/debiandirs
is included in
# this template.
-#debian/debiandirs: admin/debianrules
-# perl -w admin/debianrules echodirs > debian/debiandirs
+debian/debiandirs: admin/debianrules
+ perl -w admin/debianrules echodirs > debian/debiandirs
configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
- # run configure with build tree $(objdir)
+ # run configure with build tree $(objdir)
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
$(configkde)
touch configure-stamp
@@ -106,7 +107,6 @@
dh_installcron
dh_installman
dh_installinfo
- dh_undocumented #PACKAGE#.1
dh_installchangelogs #CHANGELOGS#
dh_link
dh_strip
Modified: trunk/packages/kdelibs/debian/kdelibs4-dev.install
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs4-dev.install 2004-04-06 02:16:13 UTC
(rev 95)
+++ trunk/packages/kdelibs/debian/kdelibs4-dev.install 2004-04-07 22:46:25 UTC
(rev 96)
@@ -1,4 +1,3 @@
-debian/debiandirs usr/share/doc/kdelibs4-dev/dh-make/
debian/dh-make/* usr/share/doc/kdelibs4-dev/dh-make/
debian/tmp/usr/bin/checkXML
debian/tmp/usr/bin/dcopidl
