diff options
| author | modax-guest <modax-guest@fe476991-40d1-0310-a08b-93a1e690bb93> | 2009-01-24 09:41:42 +0000 |
|---|---|---|
| committer | modax-guest <modax-guest@fe476991-40d1-0310-a08b-93a1e690bb93> | 2009-01-24 09:41:42 +0000 |
| commit | 592800a3488e52389fa1eb1b9ef78f4549038278 (patch) | |
| tree | 0ecf39b9d9d3fa790e52c119a5c0ff5179839475 | |
| parent | 953026d01e047727414351f75f04255de1613fed (diff) | |
| download | pkg-kde-tools-592800a3488e52389fa1eb1b9ef78f4549038278.tar.gz | |
Add makefiles/1/cdbs/kde4.mk symlink to makefiles/1/cdbs/kde.mk for
clarity.
| -rw-r--r-- | debian/changelog | 4 | ||||
| l--------- | makefiles/1/cdbs/kde4.mk | 1 | ||||
| -rw-r--r-- | makefiles/1/cdbs/symbolshelper.mk | 5 | ||||
| -rw-r--r-- | pkg-kde-build/1/control.mk | 20 | ||||
| -rw-r--r-- | pkg-kde-build/1/versions.mk | 14 |
5 files changed, 9 insertions, 35 deletions
diff --git a/debian/changelog b/debian/changelog index 1206789..18d45c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,8 +19,10 @@ pkg-kde-tools (0.4.0~pre3) UNRELEASED; urgency=low - add README to discourage other developers from using pkg-kde-build. * Add makefiles/1/cdbs/symbolshelper.mk which hooks pkgkde-symbolshelper calls to cdbs. + * Add makefiles/1/cdbs/kde4.mk symlink to makefiles/1/cdbs/kde.mk for + clarity. - -- Modestas Vainius <modestas@vainius.eu> Sat, 24 Jan 2009 04:16:47 +0200 + -- Modestas Vainius <modestas@vainius.eu> Sat, 24 Jan 2009 11:35:33 +0200 pkg-kde-tools (0.3.1) experimental; urgency=low diff --git a/makefiles/1/cdbs/kde4.mk b/makefiles/1/cdbs/kde4.mk new file mode 120000 index 0000000..98298d1 --- /dev/null +++ b/makefiles/1/cdbs/kde4.mk @@ -0,0 +1 @@ +kde.mk
\ No newline at end of file diff --git a/makefiles/1/cdbs/symbolshelper.mk b/makefiles/1/cdbs/symbolshelper.mk index e55d985..b59b943 100644 --- a/makefiles/1/cdbs/symbolshelper.mk +++ b/makefiles/1/cdbs/symbolshelper.mk @@ -1,5 +1,8 @@ include /usr/share/cdbs/1/rules/buildvars.mk +ifndef _cdbs_pkgkde_symbolshelper +_cdbs_pkgkde_symbolshelper = 1 + SYMBOLSHELPER_PACKAGES := $(filter $(DEB_PACKAGES),$(patsubst debian/%.symbols.in,%,$(wildcard debian/*.symbols.in))) $(patsubst %,binary-strip/%,$(SYMBOLSHELPER_PACKAGES)):: binary-strip/%: @@ -10,3 +13,5 @@ $(patsubst %,binary-fixup/%,$(SYMBOLSHELPER_PACKAGES)):: binary-fixup/%: clean:: rm -f $(patsubst %,debian/%.symbols.$(DEB_HOST_ARCH),$(SYMBOLSHELPER_PACKAGES)) + +endif diff --git a/pkg-kde-build/1/control.mk b/pkg-kde-build/1/control.mk deleted file mode 100644 index f6bfbc9..0000000 --- a/pkg-kde-build/1/control.mk +++ /dev/null @@ -1,20 +0,0 @@ -#### 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 diff --git a/pkg-kde-build/1/versions.mk b/pkg-kde-build/1/versions.mk deleted file mode 100644 index 987f4e5..0000000 --- a/pkg-kde-build/1/versions.mk +++ /dev/null @@ -1,14 +0,0 @@ - -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/-.*//') - |