Re: pkg-kde: commit - rev 90 - in trunk/packages/kdelibs/debian: . dh-make
El Martes, 6 de Abril de 2004 01:20, Dominique Devriese escribió:
> > Shouldn't x11 and Apps/Net have quotes around them - meaning it
> > should be needs="x11" and section="Apps/Net" ? Recent lintians warn
> > if the quotes aren't present, IIRC.
>
> Ack, fixed as well.
Note that in menu.ex, there is still some extra values for "needs", isn't it?
It should be only X11.
I have attached a really really small patch for this (i know it doesn't have
many sense :), it's easier to edit by hand), and another for debian/rules
with some small fixes.
--
Alex (a.k.a. suy) - GPG ID 0x0B8B0BC2
http://darkshines.net/ - Jabber ID: suy@bulmalug.net
Index: packages/kdelibs/debian/dh-make/menu.ex
===================================================================
--- packages/kdelibs/debian/dh-make/menu.ex (revision 93)
+++ packages/kdelibs/debian/dh-make/menu.ex (working copy)
@@ -1,2 +1,2 @@
-?package(#PACKAGE#):needs="X11|text|vc|wm" section="Apps/see-menu-manual"\
+?package(#PACKAGE#):needs="X11" section="Apps/see-menu-manual"\
title="#PACKAGE#" hints="KDE" command="/usr/bin/#PACKAGE#"
Index: packages/kdelibs/debian/dh-make/rules
===================================================================
--- packages/kdelibs/debian/dh-make/rules (revision 93)
+++ packages/kdelibs/debian/dh-make/rules (working copy)
@@ -6,7 +6,7 @@
#export DH_VERBOSE=1
# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
+#export DH_COMPAT=3 #better define it in debian/compat
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -15,8 +15,12 @@
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
@@ -38,8 +42,8 @@
# 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:
@@ -106,7 +110,6 @@
dh_installcron
dh_installman
dh_installinfo
- dh_undocumented #PACKAGE#.1
dh_installchangelogs #CHANGELOGS#
dh_link
dh_strip
Reply to: