rev 5492 - kde-extras/basket/trunk/debian

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-01-31 08:26:25 +0100 (Wed, 31 Jan 2007)
New Revision: 5492

Modified:
   kde-extras/basket/trunk/debian/changelog
   kde-extras/basket/trunk/debian/rules
Log:
more changes, and we're still have work to do.


Modified: kde-extras/basket/trunk/debian/changelog
===================================================================
--- kde-extras/basket/trunk/debian/changelog	2007-01-31 06:42:08 UTC (rev 5491)
+++ kde-extras/basket/trunk/debian/changelog	2007-01-31 07:26:25 UTC (rev 5492)
@@ -12,7 +12,13 @@
     - Change short description.
     - Add basket's homepage.
   * Not install empty file NEWS.
+  * Rewrite debian/rules file.
 
+  * TODO:
+    - new manpage, current sucks, not only because the wrong section.
+    - surely, some more changes in the debian/rules
+    - re lib to li za tion!
+
  -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Wed, 31 Jan 2007 07:08:36 +0100
 
 basket (0.5.0-6) unstable; urgency=low

Modified: kde-extras/basket/trunk/debian/rules
===================================================================
--- kde-extras/basket/trunk/debian/rules	2007-01-31 06:42:08 UTC (rev 5491)
+++ kde-extras/basket/trunk/debian/rules	2007-01-31 07:26:25 UTC (rev 5492)
@@ -1,9 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # These are used for cross-compiling and for saving the configure script
@@ -11,8 +8,6 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-PACKAGE = $(shell grep "^Package: " debian/control | sed -e 's at Package: @@')
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -24,6 +19,11 @@
 	INSTALL_PROGRAM += -s
 endif
 
+-include debian/debiandirs
+
+debian/debiandirs: admin/debianrules
+	perl -w admin/debianrules echodirs > debian/debiandirs
+
 config.status: configure
 	dh_testdir
 	test -e config.sub -a -L config.sub || \
@@ -31,24 +31,14 @@
 	test -e config.guess -a -L config.guess || \
 		ln -sf /usr/share/misc/config.guess config.guess
 
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,--as-needed" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-		--prefix=/usr --with-qt-dir=/usr/share/qt3 \
-		--with-qt-includes=/usr/include/qt3 \
-		--with-qt-libraries=/usr/share/qt3/lib \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
-		--disable-rpath --enable-final \
-		kde_htmldir=/usr/share/doc/kde/HTML	
+	./configure $(configkde)
 
 build: build-stamp
 
 build-stamp:  config.status
 	dh_testdir
 
-	# Add here commands to compile the package.
 	$(MAKE)
-	#/usr/bin/docbook-to-man debian/basket.sgml > basket.1
 
 	touch build-stamp
 
@@ -56,7 +46,6 @@
 	dh_testdir
 	dh_testroot
 
-	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
 
 	$(RM) config.cache config.sub config.guess config.log
@@ -71,14 +60,11 @@
 	dh_installdirs
 
 	# Install into package-build-dir
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/${PACKAGE}
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/basket
 
 
-# Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot