Author: domi-guest
Date: 2004-06-01 05:07:55 -0600 (Tue, 01 Jun 2004)
New Revision: 128
Modified:
trunk/packages/kdebindings/debian/changelog
trunk/packages/kdebindings/debian/rules
Log:
update to builddir!=srcdir and kde 3.2.3
Modified: trunk/packages/kdebindings/debian/changelog
===================================================================
--- trunk/packages/kdebindings/debian/changelog 2004-05-06 11:23:17 UTC (rev
127)
+++ trunk/packages/kdebindings/debian/changelog 2004-06-01 11:07:55 UTC (rev
128)
@@ -1,3 +1,16 @@
+kdebindings (4:3.2.3-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Dominique Devriese <[EMAIL PROTECTED]> Tue, 1 Jun 2004 13:05:50 +0200
+
+kdebindings (4:3.2.2-5) unstable; urgency=low
+
+ * qtjava/designer/juic/lib: remove the two xml parsers, so they don't bloat
the package and the diff.gz
+ * debian/rules: make it clean properly by using builddir!=srcdir
+
+ -- Dominique Devriese <[EMAIL PROTECTED]> Sat, 22 May 2004 20:39:58 +0200
+
kdebindings (4:3.2.2-4) unstable; urgency=low
* debian/control: Removed Build-Depends on autoconf and automake.
Modified: trunk/packages/kdebindings/debian/rules
===================================================================
--- trunk/packages/kdebindings/debian/rules 2004-05-06 11:23:17 UTC (rev
127)
+++ trunk/packages/kdebindings/debian/rules 2004-06-01 11:07:55 UTC (rev
128)
@@ -26,7 +26,7 @@
endif
# I'd like to move to builddir!=srcdir when I can get upstream to build with
it.
-#objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
+objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
upstream_version=`head -1 $(CURDIR)/debian/changelog | sed -e
"s,.*:\([^-]*\).*,\1,"`
ifndef PERL
@@ -76,18 +76,16 @@
chmod +x configure
# make build directory
- # mkdir $(objdir)
+ mkdir $(objdir)
# run configure with build tree $(objdir)
- # ( not yet in a different build tree)
- # cd $(objdir) && \
- # ../configure \
- # --enable-final
- ./configure \
+ cd $(objdir) && \
+ ../configure \
$(configkde) \
--with-java=/usr \
--with-pythondir=/usr/lib/python2.3/site-packages \
DO_NOT_COMPILE='dcopperl kalyptus kdeobjc korundum qtobjc qtruby
qtsharp xparts'
+ # --enable-final
touch configure-stamp
@@ -95,11 +93,11 @@
build-stamp: configure-stamp
dh_testdir
- # cd $(objdir) &&
+ cd $(objdir) && \
$(MAKE)
# build dcopjava even though it's disabled upstream.
- # cd $(objdir) &&
+ cd $(objdir) && \
$(MAKE) -C dcopjava
#dcopperl is disabled
@@ -138,7 +136,7 @@
fi
# Remove build tree
- #rm -rf $(objdir)
+ rm -rf $(objdir)
# if Makefile exists run distclean
if test -f Makefile; then \
@@ -157,7 +155,9 @@
dh_installdirs -s
# Main install.
+ cd $(objdir) && \
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ cd $(objdir) && \
$(MAKE) -C dcopjava install DESTDIR=$(CURDIR)/debian/tmp
#DCOPPerl is disabled.
# $(MAKE) -C dcopperl pure_install PREFIX=$(CURDIR)/debian/tmp/usr
