[Pkg-kde-commits] rev 591 - branches/kde-3.4.0/packages/kdegraphics/debian
Adeodato Simó
dato-guest@costa.debian.org
Thu, 03 Mar 2005 05:51:40 +0100
Author: dato-guest
Date: 2005-03-03 05:51:36 +0100 (Thu, 03 Mar 2005)
New Revision: 591
Modified:
branches/kde-3.4.0/packages/kdegraphics/debian/changelog
branches/kde-3.4.0/packages/kdegraphics/debian/control
branches/kde-3.4.0/packages/kdegraphics/debian/rules
Log:
- rules to cdbs, update control accordingly
- close a bug in changelog
Modified: branches/kde-3.4.0/packages/kdegraphics/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/changelog 2005-03-03 04:41:25 UTC (rev 590)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/changelog 2005-03-03 04:51:36 UTC (rev 591)
@@ -1,6 +1,8 @@
kdegraphics (4:3.4.0-1~rc1) experimental; urgency=low
- * First release candidate for the upcoming KDE 3.4 release.
+ * First release candidate for the upcoming KDE 3.4 release. Bugs reported in
+ the Debian BTS fixed by this release:
+ - no longer FTBFS on amd64/gcc-4.0. (Closes: #287007)
+++ Changes by Adeodato Simó:
Modified: branches/kde-3.4.0/packages/kdegraphics/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/control 2005-03-03 04:41:25 UTC (rev 590)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/control 2005-03-03 04:51:36 UTC (rev 591)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Christopher L Cheney <ccheney@debian.org>, Christopher Martin <chrsmrtn@freeshell.org>, Adeodato Simó <asp16@alu.ua.es>, Isaac Clerencia <isaac@debian.org>
-Build-Depends: debhelper (>> 4.2.0), gawk, gettext, imlib11-dev, kdelibs4-dev (>> 4:3.3.2), libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, tetex-bin, texinfo, xlibs-static-pic, xpdf-utils
+Build-Depends: cdbs (>= 0.4.26), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>> 4:3.3.91), libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, tetex-bin, texinfo, xlibs-static-pic, xpdf-utils
Standards-Version: 3.6.1
Package: kdegraphics
@@ -388,7 +388,7 @@
Package: libkscan-dev
Section: libdevel
Architecture: any
-Depends: libkscan1 (= ${Source-Version}), kdelibs4-dev (>> 4:3.3.2), libc6-dev
+Depends: libkscan1 (= ${Source-Version}), kdelibs4-dev (>> 4:3.3.91), libc6-dev
Description: Scanner library for KDE (development files)
KDE is a powerful Open Source graphical desktop environment
for Unix workstations. It combines ease of use, contemporary
Modified: branches/kde-3.4.0/packages/kdegraphics/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/rules 2005-03-03 04:41:25 UTC (rev 590)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/rules 2005-03-03 04:51:36 UTC (rev 591)
@@ -1,221 +1,21 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets by Bill Allombert 2001
+#! /usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
-# 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)
+# shlibs_ver=4:3.3.99
+# DEB_DH_MAKESHLIBS_ARGS_kdelibs4 := -V'kdelibs4 (>= $(shlibs_ver))'
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
-
--include debian/debiandirs
-
-debian/debiandirs: admin/debianrules
- perl -w admin/debianrules echodirs > debian/debiandirs
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
-
- # Apply Debian specific patches
- if test -d $(CURDIR)/debian/patches ;\
- then \
- for i in $(CURDIR)/debian/patches/*.diff.uu ;\
- do \
- cd $(CURDIR)/debian/patches ;\
- uudecode "$$i" ;\
- cd $(CURDIR) ;\
- done ;\
- patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort);\
- fi ;\
- if test ! -f patch-stamp; then \
- for patch in $$patches ;\
- do \
- echo APPLYING PATCH\: "$${patch##*/}" ;\
- patch -p1 < "$$patch" ;\
- done ;\
- touch patch-stamp ;\
- fi
-
- # KDE CVS does not have aclocal.m4 or configure
- if test ! -f configure; then \
- $(MAKE) -f admin/Makefile.common dist ;\
- fi
-
- # ensure configure is executable
- chmod +x configure
-
- # make build directory
- mkdir $(objdir)
-
- # run configure with build tree $(objdir)
- cd $(objdir) && \
- ../configure $(configkde) --enable-final \
- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
-
- touch configure-stamp
-
-#Architecture
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
- dh_testdir
-
- cd $(objdir) && \
- $(MAKE)
-
- # generate manpages
- #for i in debian/man/*.sgml; do \
- docbook-to-man $$i > `dirname $$i`/`basename $$i .sgml`.1 ;\
- done
-
- touch build-arch-stamp
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
- dh_testdir
-
- cd $(objdir) && \
- $(MAKE)
-
- #cd $(objdir) && \
- $(MAKE) apidox
-
- touch build-indep-stamp
-
-debian-clean:
- dh_testdir
- dh_testroot
-
- dh_clean
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-arch-stamp build-indep-stamp configure-stamp \
- debian/debiandirs
-
- # Remove Debian specific patches
- if test -d $(CURDIR)/debian/patches ;\
- then \
- patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort -r);\
- fi ;\
- if test -f patch-stamp; then \
- for patch in $$patches ;\
- do \
- echo REMOVING PATCH\: "$${patch##*/}" ;\
- patch -p1 -R < "$$patch" ;\
- done ;\
- for i in $(CURDIR)/debian/patches/*.diff.uu ;\
- do \
- rm -f "$${i%%.uu}" ;\
- done ;\
- rm -f patch-stamp ;\
- fi
-
- # Remove build tree
- rm -rf $(objdir)
-
- # if Makefile exists run distclean
- if test -f Makefile; then \
- $(MAKE) distclean; \
- fi
-
- if test -d CVS; then \
- $(MAKE) -f admin/Makefile.common cvs-clean ;\
- fi
-
- dh_clean
-
-install: install-arch install-indep
-
-install-arch:
- dh_testdir
- dh_testroot
- dh_clean -k -s
- dh_installdirs -s
-
- cd $(objdir) && \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
- dh_install -s
-
-install-indep:
- dh_testdir
- dh_testroot
- dh_clean -k -i
- dh_installdirs -i
-
- cd $(objdir) && \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
- #cd $(objdir) && \
- $(MAKE) install-apidox DESTDIR=$(CURDIR)/debian/tmp
-
- dh_install -i
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
-# dh_installexamples
- dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
- dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.sty -X.tag
- dh_fixperms
-# dh_perl
-# dh_python
- env DH_COMPAT=3 dh_makeshlibs -V
- dh_installdeb
- dh_shlibdeps -ldebian/kghostview/usr/lib:debian/kpovmodeler/usr/lib:debian/ksvg/usr/lib:debian/kview/usr/lib:debian/kviewshell/usr/lib:debian/libkscan1/usr/lib
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+DEB_SHLIBDEPS_INCLUDE := \
+ debian/kdelibs4/usr/lib \
+ debian/kghostview/usr/lib \
+ debian/kpovmodeler/usr/lib \
+ debian/ksvg/usr/lib \
+ debian/kview/usr/lib \
+ debian/kviewshell/usr/lib \
+ debian/libkscan1/usr/lib