Update of /cvs/debian-openoffice/oooqs-kde-deb/debian
In directory gluck:/tmp/cvs-serv4917
Modified Files:
changelog control rules
Log Message:
revert back to use dpatch since cdbs seems fucked with KDE atm...
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oooqs-kde-deb/debian/changelog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- changelog 17 Oct 2003 10:26:10 -0000 1.5
+++ changelog 23 Oct 2003 22:53:06 -0000 1.6
@@ -1,13 +1,13 @@
oooqs (1.0rc3-4) unstable; urgency=low
- * build using cdbs; remove the shlibdeps mungling.. [RE]
+ * remove the shlibdeps mungling.. [RE]
* add es.po and oooqs.desktop line for spanish,
thanks Sergio Gonzalez (closes: #206550) [RE]
* Standards-Version: 3.6.1 [RE]
* add sparc to Architecture: [RE]
* move to main [RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 17 Oct 2003 12:23:54 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 24 Oct 2003 00:46:26 +0200
oooqs (1.0rc3-3) unstable; urgency=low
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oooqs-kde-deb/debian/rules,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rules 17 Oct 2003 10:26:10 -0000 1.6
+++ rules 23 Oct 2003 22:53:06 -0000 1.7
@@ -1,18 +1,110 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/kde.mk
+#export DH_VERBOSE=1
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath --disable-final
+# 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)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-binary-post-install/oooqs-kde::
+include /usr/share/dpatch/dpatch.make
+
+CXX=g++
+CXXFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CXXFLAGS += -O0
+else
+ CXXFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+autotools-stamp:
+ -mv config.sub config.sub.bak
+ -mv config.guess config.guess.bak
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+ touch autotools-stamp
+
+config.status: patch-stamp autotools-stamp configure
+ dh_testdir
+
+ QTDIR=/usr/share/qt3 CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" ./configure \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --prefix=/usr --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info --disable-rpath
+
+build: build-stamp
+
+build-stamp: config.status
+ dh_testdir
+
+ $(MAKE)
+
+ touch build-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp autotools-stamp
+ rm -f debian/*.tmp
+
+ -$(MAKE) distclean
+ rm -f po/*.gmo config.log
+
+ -mv config.sub.bak config.sub
+ -mv config.guess.bak config.guess
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/oooqs-kde
+
+ # move the HTML docs into the right place
+ mkdir $(CURDIR)/debian/oooqs-kde/usr/share/doc/kde
+ mv $(CURDIR)/debian/oooqs-kde/usr/share/doc/HTML \
+ $(CURDIR)/debian/oooqs-kde/usr/share/doc/kde
+
+ # move the KDE menu entry from Office to OpenOffice.org
+ # to be together with the familiy :-)
+ cd $(CURDIR)/debian/oooqs-kde/usr/share/applnk && \
+ mv Office "OpenOffice.org1.1"
+
# don't install the shipped icons which conflict with openoffice.org
cd $(CURDIR)/debian/oooqs-kde/usr/share/icons; \
for icon in `find . -type f -name "*.xpm" | grep -v oooqs`; do \
rm $$icon; \
done
-clean::
- find . -type f -name "*.gmo" | xargs rm -f
+binary-indep: build install
+
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_installman debian/oooqs.1
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_link
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oooqs-kde-deb/debian/control,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- control 17 Oct 2003 10:26:10 -0000 1.6
+++ control 23 Oct 2003 22:53:06 -0000 1.7
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <[EMAIL PROTECTED]>, Chris Halls <[EMAIL PROTECTED]>
-Build-Depends: cdbs, debhelper (>> 4.0.0), autotools-dev, kdelibs4-dev,
libqt3-mt-dev, libqt3-compat-headers
+Build-Depends: dpatch, debhelper (>> 4.0.0), autotools-dev, kdelibs4-dev,
libqt3-mt-dev, libqt3-compat-headers
Standards-Version: 3.6.1
Package: oooqs-kde
