Update of /cvsroot/pure-data/packages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28441

Modified Files: Makefile Makefile.buildlayout Log Message: cleaned up version handling to make more sense; removed some obsolete chmods

Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** Makefile 18 Oct 2006 23:56:53 -0000 1.50 --- Makefile 21 Oct 2006 04:55:39 -0000 1.51 *************** *** 675,681 **** cd $(helpdir) && \ $(scripts_src)/convert-help-to-standard.sh - # remove write perms to prevent people form editing the helpfiles by mistake - find $(pddocdir) -name '*.pd' -print0 | xargs -0 chmod a-wx - find $(pddocdir) -name '*.txt' -print0 | xargs -0 chmod a-wx

--- 675,678 ---- *************** *** 784,788 **** # this needs the complete_version_defines patch to work cd $(pd_src)/src/ && \ ! sed 's|^(#define PD_TEST_VERSION ").*"|\1$(PACKAGE_VERSION)"|' m_pd.h > \ m_pd.h.tmp && mv m_pd.h.tmp m_pd.h

--- 781,785 ---- # this needs the complete_version_defines patch to work cd $(pd_src)/src/ && \ ! sed 's|^(#define PD_TEST_VERSION ").*"|\1$(PD-EXTENDED_VERSION)"|' m_pd.h > \ m_pd.h.tmp && mv m_pd.h.tmp m_pd.h

*************** *** 791,795 **** # this needs the complete_version_defines patch to work cd $(pd_src)/src && \ ! sed 's|^(#define PD_TEST_VERSION ".*)$(PACKAGE_VERSION_PREFIX).*"|\1"|' \ m_pd.h > m_pd.h.tmp && \ mv m_pd.h.tmp m_pd.h --- 788,792 ---- # this needs the complete_version_defines patch to work cd $(pd_src)/src && \ ! sed 's|^(#define PD_TEST_VERSION ".*)$(PD-EXTENDED_VERSION_PREFIX).*"|\1"|' \ m_pd.h > m_pd.h.tmp && \ mv m_pd.h.tmp m_pd.h *************** *** 856,860 **** # this needs the complete_version_defines patch to work cd $(pd_src)/src/ && \ ! sed 's|^(#define PD_TEST_VERSION ").*"|\1$(PACKAGE_VERSION)"|' m_pd.h > \ m_pd.h.tmp && mv m_pd.h.tmp m_pd.h @echo " " --- 853,857 ---- # this needs the complete_version_defines patch to work cd $(pd_src)/src/ && \ ! sed 's|^(#define PD_TEST_VERSION ").*"|\1$(PD-EXTENDED_VERSION)"|' m_pd.h > \ m_pd.h.tmp && mv m_pd.h.tmp m_pd.h @echo " " *************** *** 866,870 **** # this needs the complete_version_defines patch to work cd $(pd_src)/src && \ ! sed 's|^(#define PD_TEST_VERSION ".*)$(PACKAGE_VERSION)"|\1"|' \ m_pd.h > m_pd.h.tmp && \ mv m_pd.h.tmp m_pd.h --- 863,867 ---- # this needs the complete_version_defines patch to work cd $(pd_src)/src && \ ! sed 's|^(#define PD_TEST_VERSION ".*)$(PD-EXTENDED_VERSION)"|\1"|' \ m_pd.h > m_pd.h.tmp && \ mv m_pd.h.tmp m_pd.h *************** *** 930,934 **** test_locations: @echo "PD_VERSION: $(PD_VERSION)" ! @echo "PACKAGE_VERSION: $(PACKAGE_VERSION)" @echo "CWD $(CWD)" @echo "DESTDIR $(DESTDIR)" --- 927,931 ---- test_locations: @echo "PD_VERSION: $(PD_VERSION)" ! @echo "PD-EXTENDED_VERSION: $(PD-EXTENDED_VERSION)" @echo "CWD $(CWD)" @echo "DESTDIR $(DESTDIR)"

Index: Makefile.buildlayout =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile.buildlayout,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Makefile.buildlayout 17 Oct 2006 04:35:14 -0000 1.29 --- Makefile.buildlayout 21 Oct 2006 04:55:39 -0000 1.30 *************** *** 162,166 **** PD_TEST_VERSION := $(shell grep PD_TEST_VERSION $(pd_src)/src/m_pd.h | \ sed 's|^.define *PD_TEST_VERSION *"(.*)".*|\1|' ) ! PD_VERSION := $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) ifneq ($(PD_TEST_VERSION),) PD_VERSION := $(PD_VERSION)-$(PD_TEST_VERSION) --- 162,166 ---- PD_TEST_VERSION := $(shell grep PD_TEST_VERSION $(pd_src)/src/m_pd.h | \ sed 's|^.define *PD_TEST_VERSION *"(.*)".*|\1|' ) ! PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) ifneq ($(PD_TEST_VERSION),) PD_VERSION := $(PD_VERSION)-$(PD_TEST_VERSION) *************** *** 170,177 ****

# release version for this distro ! PACKAGE_VERSION_PREFIX = extended ! PACKAGE_VERSION = $(PACKAGE_VERSION_PREFIX)-$(VERSION_DATE) ! PACKAGE_NAME = Pd-$(PD_VERSION)

--- 170,177 ----

# release version for this distro ! PD-EXTENDED_VERSION_PREFIX = extended ! PD-EXTENDED_VERSION = $(PD-EXTENDED_VERSION_PREFIX)-$(VERSION_DATE)

+ PACKAGE_NAME = Pd-$(PD_VERSION)