rev 13487 - in branches/kde4.2/packages/pkg-kde-tools/trunk: . debian pkg-kde-build pkg-kde-build/1

Modestas Vainius modax-guest at alioth.debian.org
Sat Jan 24 00:57:44 UTC 2009 

Author: modax-guest
Date: 2009-01-24 00:57:44 +0000 (Sat, 24 Jan 2009)
New Revision: 13487

Added:
   branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/
   branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/
   branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/control.mk
   branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/kde4.mk
   branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/versions.mk
   branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/README
Modified:
   branches/kde4.2/packages/pkg-kde-tools/trunk/Makefile
   branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog
   branches/kde4.2/packages/pkg-kde-tools/trunk/debian/control
   branches/kde4.2/packages/pkg-kde-tools/trunk/debian/install
   branches/kde4.2/packages/pkg-kde-tools/trunk/debian/rules
   branches/kde4.2/packages/pkg-kde-tools/trunk/dh_sameversiondep
Log:
  - make pkg-kde-tools suggest debhelper v7 and dpkg-dev;
* Pass -X.svn to dh_install
* Add stuff from svn pkg-kde/cdbs as pkg-kde-build. Port kde.mk and rename
  it to kde4.mk:
  - use /usr/share/pkg-kde-tools/makefiles/1/variables.mk;
  - link with --as-needed by default;
  - remove lintian section, we should use dh_lintian;
  - add versions.mk and control.mk too. The latter needs porting if it is
    useful;
  - add README to discourage other developers from using pkg-kde-build.

Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/Makefile
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/Makefile	2009-01-24 00:54:43 UTC (rev 13486)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/Makefile	2009-01-24 00:57:44 UTC (rev 13487)
@@ -3,6 +3,7 @@
 
 BINDIR := $(DESTDIR)/usr/bin
 MANDIR := $(DESTDIR)/usr/share/man
+#DATADIR := $(DESTDIR)/usr/share/pkg-kde-tools
 
 install:
 	install -d $(BINDIR) $(MANDIR)

Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog	2009-01-24 00:54:43 UTC (rev 13486)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog	2009-01-24 00:57:44 UTC (rev 13487)
@@ -5,11 +5,20 @@
   * pkgkde-symbolshelper create: add support for adding arch specific symbols
     to the symbol template.
   * Add dh_sameversiondep from official KDE packaging:
-    - make pkg-kde-tools suggest debhelper v7;
+    - make pkg-kde-tools suggest debhelper v7 and dpkg-dev;
     - add POD help and generate manual page from it;
     - add support for the external reference package.
+  * Pass -X.svn to dh_install
+  * Add stuff from svn pkg-kde/cdbs as pkg-kde-build. Port kde.mk and rename
+    it to kde4.mk:
+    - use /usr/share/pkg-kde-tools/makefiles/1/variables.mk;
+    - link with --as-needed by default;
+    - remove lintian section, we should use dh_lintian;
+    - add versions.mk and control.mk too. The latter needs porting if it is
+      useful;
+    - add README to discourage other developers from using pkg-kde-build.
 
- -- Modestas Vainius <modestas at vainius.eu>  Sat, 24 Jan 2009 01:26:33 +0200
+ -- Modestas Vainius <modestas at vainius.eu>  Sat, 24 Jan 2009 02:47:13 +0200
 
 pkg-kde-tools (0.3.1) experimental; urgency=low
 

Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/debian/control
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/debian/control	2009-01-24 00:54:43 UTC (rev 13486)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/debian/control	2009-01-24 00:57:44 UTC (rev 13487)
@@ -10,7 +10,7 @@
 Package: pkg-kde-tools
 Architecture: all
 Depends: ${perl:Depends}
-Suggests: debhelper (>= 7), cdbs
+Suggests: debhelper (>= 7), cdbs, dpkg-dev
 Description: common makesnippets and build scripts for KDE4 related packages
  This package contains makefiles setting the default build arguments for KDE4
  packages.

Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/debian/install
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/debian/install	2009-01-24 00:54:43 UTC (rev 13486)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/debian/install	2009-01-24 00:57:44 UTC (rev 13487)
@@ -1 +1,2 @@
 makefiles /usr/share/pkg-kde-tools/
+pkg-kde-build /usr/share/pkg-kde-tools/
\ No newline at end of file

Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/debian/rules
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/debian/rules	2009-01-24 00:54:43 UTC (rev 13486)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/debian/rules	2009-01-24 00:57:44 UTC (rev 13487)
@@ -17,7 +17,7 @@
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installexamples
-	dh_install
+	dh_install -X.svn
 	dh_installman
 	dh_link
 	dh_perl

Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/dh_sameversiondep
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/dh_sameversiondep	2009-01-24 00:54:43 UTC (rev 13486)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/dh_sameversiondep	2009-01-24 00:57:44 UTC (rev 13487)
@@ -79,8 +79,7 @@
 substvar appears in, becomes the default I<dependency type> for that substvar.
 B<sameVersionDep> should be formatted as follows (everything is case sensitive):
 
-${B<sameVersionDep>:I<dependency package>[[:I<reference package>]-I<dependency
-type>]}
+S<< ${B<sameVersionDep>:I<dependency package>[[:I<reference package>]-I<dependency type>]} >>
 
 =over 4
 


Property changes on: branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build
___________________________________________________________________
Name: svn:mergeinfo
   + 

Added: branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/control.mk
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/control.mk	                        (rev 0)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/control.mk	2009-01-24 00:57:44 UTC (rev 13487)
@@ -0,0 +1,20 @@
+#### NEEDS porting if it is still useful ####
+include debian/cdbs/versions.mk
+debian/control: debian/control.tmp
+	mv debian/control.tmp debian/control
+
+debian/control.tmp: update-versions
+
+update-versions: debian/control.in
+	sed "s/CDBS_MIN_VER/$(CDBS_MIN_VER)/;\
+	     s/QUILT_MIN_VER/$(QUILT_MIN_VER)/;\
+	     s/CMAKE_MIN_VER/$(CMAKE_MIN_VER)/;\
+	     s/KDELIBS_VERSION/$(KDELIBS_VERSION)/;\
+	     s/KDELIBS_UPSTREAM_VERSION/$(KDELIBS_UPSTREAM_VERSION)/;\
+	     s/KDELIBS_SOURCE_VERSION/$(KDELIBS_SOURCE_VERSION)/;\
+	     s/KDEPIMLIBS_VERSION/$(KDEPIMLIBS_VERSION)/;\
+	     s/KDEPIMLIBS_SOURCE_VERSION/$(KDEPIMLIBS_SOURCE_VERSION)/;\
+	     s/KDEPIMLIBS_UPSTREAM_VERSION/$(KDEPIMLIBS_UPSTREAM_VERSION)/;\
+	     " debian/control.in > debian/control.tmp
+
+.PHONY: update-versions

Added: branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/kde4.mk
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/kde4.mk	                        (rev 0)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/kde4.mk	2009-01-24 00:57:44 UTC (rev 13487)
@@ -0,0 +1,79 @@
+include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+# Link with --as-needed by default
+DEB_KDE_LINK_WITH_AS_NEEDED ?= yes
+
+# Include default KDE 4 cmake configuration variables
+include /usr/share/pkg-kde-tools/makefiles/1/variables.mk
+
+# Since cmake 2.6.2 or higher is required from now on, enable
+# relative paths to get more ccache hits.
+# NOTE: might not work with vanilla 2.6.2, only with Debian's one.
+DEB_CMAKE_KDE4_FLAGS += -DCMAKE_USE_RELATIVE_PATHS=ON
+
+# Pass standard KDE 4 flags to cmake via appropriate CDBS variable
+# (DEB_CMAKE_EXTRA_FLAGS)
+DEB_CMAKE_EXTRA_FLAGS += $(DEB_CMAKE_KDE4_FLAGS) $(DEB_CMAKE_CUSTOM_FLAGS)
+
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+#DEB_MAKE_ENVVARS += XDG_CONFIG_DIRS=/etc/xdg XDG_DATA_DIRS=/usr/share
+#DEB_STRIP_EXCLUDE = so
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+clean::
+ifndef THIS_SHOULD_GO_TO_UNSTABLE
+	#guard against experimental uploads to unstable
+	dpkg-parsechangelog | grep ^Distribution | grep -q 'experimental\|UNRELEASED\|jaunty'
+endif
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -f CMakeCache.txt
+
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+	if test -e debian/$(cdbs_curpkg).bugscript; then \
+		install -p -D -m755 debian/$(cdbs_curpkg).bugscript \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/script; \
+	fi
+	if test -e debian/$(cdbs_curpkg).bugcontrol; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).bugcontrol \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/control; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		meinproc4 $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+		rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+	done
+
+# Run dh_sameversiondep
+common-binary-predeb-arch common-binary-predeb-indep::
+	dh_sameversiondep $(if $(filter common-binary-predeb-arch,$@),-a,-i)

Added: branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/versions.mk
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/versions.mk	                        (rev 0)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/versions.mk	2009-01-24 00:57:44 UTC (rev 13487)
@@ -0,0 +1,14 @@
+
+CDBS_MIN_VER:=0.4.52
+QUILT_MIN_VER:=0.40
+CMAKE_MIN_VER:=2.4.8
+
+
+KDELIBS_VERSION:=$(shell dpkg -l kdelibs5 | grep kdelibs5 | awk '{print $$3}')
+KDELIBS_SOURCE_VERSION:=$(shell echo $(KDELIBS_VERSION) | sed 's/+b.*//')
+KDELIBS_UPSTREAM_VERSION:=$(shell echo $(KDELIBS_VERSION) | sed 's/-.*//')
+
+KDEPIMLIBS_VERSION:=$(shell dpkg -l kdepimlibs5 | grep kdepimlibs5 | awk '{print $$3}')
+KDEPIMLIBS_SOURCE_VERSION:=$(shell echo $(KDEPIMLIBS_VERSION) | sed 's/+b.*//')
+KDEPIMLIBS_UPSTREAM_VERSION:=$(shell echo $(KDEPIMLIBS_VERSION) | sed 's/-.*//')
+

Added: branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/README
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/README	                        (rev 0)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/README	2009-01-24 00:57:44 UTC (rev 13487)
@@ -0,0 +1,8 @@
+Makefile snippets and scripts found in this directory and its subdirectories
+are for use with official KDE or kdesupport packages maintained by Debian
+Qt/KDE Maintainers team ONLY. Compatibility of any kind is not guaranteed and
+may be broken at any time without any notice.
+
+Maintainers of other software based on KDE 4 should consider using makefile
+snippets under /usr/share/pkg-kde-tools/makefiles/. Please read
+/usr/share/doc/pkg-kde-tools/README.Debian for more information.

More information about the pkg-kde-commits mailing list