From df2c508d1507a0c783de27e53e55530d808b9d9a Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Mon, 23 Apr 2007 16:59:09 +0000 Subject: [PATCH 1/4] Initialize branch FC-6 for vdr-skins --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From a415940c389c127d217e9cf6e3f25280017109e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 1 May 2007 19:09:53 +0000 Subject: [PATCH 2/4] Sync with devel --- .cvsignore | 7 ++ sources | 7 ++ sttng-blue.theme | 62 ++++++++++ vdr-skins-aluminium-i18n.patch | 12 ++ vdr-skins-egalsimple-i18n.patch | 7 ++ vdr-skins-izegrey16-i18n.patch | 8 ++ vdr-skins-prepare-tarballs.sh | 54 +++++++++ vdr-skins.spec | 202 ++++++++++++++++++++++++++++++++ 8 files changed, 359 insertions(+) create mode 100644 sttng-blue.theme create mode 100644 vdr-skins-aluminium-i18n.patch create mode 100644 vdr-skins-egalsimple-i18n.patch create mode 100644 vdr-skins-izegrey16-i18n.patch create mode 100644 vdr-skins-prepare-tarballs.sh create mode 100644 vdr-skins.spec diff --git a/.cvsignore b/.cvsignore index e69de29..40ebaa1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,7 @@ +Aluminium-1.0-demo-nologos.tar.bz2 +DeepBlue-0.1.4-nologos.tar.bz2 +EgalSimple-1.0-demo.tar.bz2 +SilverGreen-0.1.7.tar.bz2 +izegrey16-1.0-20050304-nologos.tar.bz2 +vdrskin-enElchi-0.7.1-nologos.tar.bz2 +vdrskin-enigma-0.3a-nologos.tar.bz2 diff --git a/sources b/sources index e69de29..d111704 100644 --- a/sources +++ b/sources @@ -0,0 +1,7 @@ +f7aca33ccc3f17f257a6919d1f2d5bc0 Aluminium-1.0-demo-nologos.tar.bz2 +8527b1fc6f7a5bacd622ee828de3f203 DeepBlue-0.1.4-nologos.tar.bz2 +8676ae6f7596d7c09fbdec7468709bbc EgalSimple-1.0-demo.tar.bz2 +89dd82fa698d139a15c4d24601188a0c SilverGreen-0.1.7.tar.bz2 +8a238e3d1a3f2d62a37415e912e780e4 izegrey16-1.0-20050304-nologos.tar.bz2 +608e4f48ef1f7a6082ee50449b1b4dc1 vdrskin-enElchi-0.7.1-nologos.tar.bz2 +acdb6c15e86aee821401cc2697a4e225 vdrskin-enigma-0.3a-nologos.tar.bz2 diff --git a/sttng-blue.theme b/sttng-blue.theme new file mode 100644 index 0000000..62db27e --- /dev/null +++ b/sttng-blue.theme @@ -0,0 +1,62 @@ +Description = Blue LCARS +clrBackground = 7F000000 +clrButtonRedFg = FFFCFCFC +clrButtonRedBg = FFFC1414 +clrButtonGreenFg = FF000000 +clrButtonGreenBg = FF24FC24 +clrButtonYellowFg = FF000000 +clrButtonYellowBg = FFFCC024 +clrButtonBlueFg = FFFCFCFC +clrButtonBlueBg = FF0000FC +clrMessageFrame = FF598ACD +clrMessageStatusFg = FF000000 +clrMessageStatusBg = FF00FCFC +clrMessageInfoFg = FF000000 +clrMessageInfoBg = FF9C9CFF +clrMessageWarningFg = FF000000 +clrMessageWarningBg = FFFCC024 +clrMessageErrorFg = FFFCFCFC +clrMessageErrorBg = FFFC1414 +clrVolumeFrame = FF598ACD +clrVolumeSymbol = FF000000 +clrVolumeBarUpper = FF38359E +clrVolumeBarLower = FF9FCEFF +clrChannelFrame = FF598ACD +clrChannelName = FF000000 +clrChannelDate = FF000000 +clrChannelSymbolOn = FF000000 +clrChannelSymbolOff = FF5A7CA2 +clrChannelSymbolRecFg = FFFCFCFC +clrChannelSymbolRecBg = FFFC1414 +clrChannelEpgTime = FF000000 +clrChannelEpgTitle = FF00FCFC +clrChannelEpgShortText = FFFCC024 +clrChannelTimebarSeen = FF38359E +clrChannelTimebarRest = FF9FCEFF +clrMenuFrame = FF598ACD +clrMenuTitle = FF000000 +clrMenuDate = FF000000 +clrMenuItemCurrentFg = FF000000 +clrMenuItemCurrentBg = FF9C9CFF +clrMenuItemSelectable = FF9C9CFF +clrMenuItemNonSelectable = FF00FCFC +clrMenuEventTime = FFFCC024 +clrMenuEventVps = FF000000 +clrMenuEventTitle = FF00FCFC +clrMenuEventShortText = FFFCC024 +clrMenuEventDescription = FF00FCFC +clrMenuScrollbarTotal = FF38359E +clrMenuScrollbarShown = FF00FCFC +clrMenuScrollbarArrow = FF000000 +clrMenuText = FF00FCFC +clrReplayFrame = FF598ACD +clrReplayTitle = FF000000 +clrReplayMode = FF000000 +clrReplayCurrent = FF000000 +clrReplayTotal = FF000000 +clrReplayJump = FF000000 +clrReplayProgressSeen = FF9FCEFF +clrReplayProgressRest = FF38359E +clrReplayProgressSelected = FFFC1414 +clrReplayProgressMark = FF000000 +clrReplayProgressCurrent = FFFC1414 diff --git a/vdr-skins-aluminium-i18n.patch b/vdr-skins-aluminium-i18n.patch new file mode 100644 index 0000000..ebbbebf --- /dev/null +++ b/vdr-skins-aluminium-i18n.patch @@ -0,0 +1,12 @@ +--- Aluminium/Aluminium.trans.orig 2005-10-22 21:01:28.000000000 +0300 ++++ Aluminium/Aluminium.trans 2005-10-22 21:02:11.000000000 +0300 +@@ -1,3 +1,7 @@ +-Item=Translation,eng=Total:,deu=Gesamt:; ++Item=Translation,eng=Total:,deu=Gesamt:,fin=Yhteensä:; + Item=Translation,eng=Current:,deu=Aktuell:; +-Item=Translation,eng=-,deu=-; ++Item=Translation,eng=-,deu=-,fin=-; ++Item=Translation,eng={PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M},deu={PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M},fin={PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M}; ++Item=Translation,eng=VPS: {PresentVPSDateTime:%H\:%M},deu=VPS: {PresentVPSDateTime:%H\:%M},fin=VPS: {PresentVPSDateTime:%H\:%M}; ++Item=Translation,eng={PresentShortText} {PresentDescription},deu={PresentShortText} {PresentDescription},fin={PresentShortText} {PresentDescription}; ++Item=Translation,eng=->,deu=->,fin=->; diff --git a/vdr-skins-egalsimple-i18n.patch b/vdr-skins-egalsimple-i18n.patch new file mode 100644 index 0000000..1bb56c4 --- /dev/null +++ b/vdr-skins-egalsimple-i18n.patch @@ -0,0 +1,7 @@ +--- EgalSimple/EgalSimple.trans~ 2004-10-27 18:40:25.000000000 +0300 ++++ EgalSimple/EgalSimple.trans 2005-10-22 20:53:10.000000000 +0300 +@@ -13,3 +13,4 @@ + Item=Translation,eng=R,deu=R,fin=R; + Item=Translation,eng=p,deu=p,fin=p; + Item=Translation,eng=Volume,deu=Lautstärke,fin=Äanenvoimakk.; ++Item=Translation,eng={PresentShortText} {PresentDescription},deu={PresentShortText} {PresentDescription},fin={PresentShortText} {PresentDescription}; diff --git a/vdr-skins-izegrey16-i18n.patch b/vdr-skins-izegrey16-i18n.patch new file mode 100644 index 0000000..456e49b --- /dev/null +++ b/vdr-skins-izegrey16-i18n.patch @@ -0,0 +1,8 @@ +--- izegrey16/izegrey16.trans~ 2005-03-04 20:41:46.000000000 +0200 ++++ izegrey16/izegrey16.trans 2005-10-22 20:38:54.000000000 +0300 +@@ -1,2 +1,5 @@ + Item=Translation,eng=Volume,deu=Lautstärke,fin=Äänenvoimakkuus; + Item=Translation,eng=/,deu=/,fin=/; ++Item=Translation,eng={ReplayPosition} / {ReplayDuration},deu={ReplayPosition} / {ReplayDuration},fin={ReplayPosition} / {ReplayDuration}; ++Item=Translation,eng={PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M},deu={PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M},fin={PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M}; ++Item=Translation,eng=VPS: {PresentVPSDateTime:%H\:%M},deu=VPS: {PresentVPSDateTime:%H\:%M},fin=VPS: {PresentVPSDateTime:%H\:%M}; diff --git a/vdr-skins-prepare-tarballs.sh b/vdr-skins-prepare-tarballs.sh new file mode 100644 index 0000000..e9c933b --- /dev/null +++ b/vdr-skins-prepare-tarballs.sh @@ -0,0 +1,54 @@ +#!/bin/sh + +set -e + +[ ! -e izegrey16-1.0-20050304.tar.gz ] && \ +wget -q http://skins.vdr-developer.org/text2skin/files/izegrey16-1.0-20050304.tar.gz +rm -rf izegrey16 +tar zxf izegrey16-1.0-20050304.tar.gz +rm -f izegrey16/{*.tar,*.ttf,logos/{*.mng,*.png,*.xpm}} +tar jcf izegrey16-1.0-20050304-nologos.tar.bz2 izegrey16 +rm -rf izegrey16 + +[ ! -e vdrskin-enigma-0.3a.tar.bz2 ] && \ +wget -q http://home.pages.at/brougs78/files/vdrskin-enigma-0.3a.tar.bz2 +[ ! -e icons-low-low-col.tar.gz ] && \ +wget -q http://ventoso.org/luca/vdr/Enigma/icons-low-low-col.tar.gz +rm -rf Enigma +tar jxf vdrskin-enigma-0.3a.tar.bz2 +find Enigma -type d -exec chmod +x {} ';' +mv Enigma/icons Enigma/icons-normal +tar zx -C Enigma -f $PWD/icons-low-low-col.tar.gz +rm -rf Enigma/{hqlogos/*,fonts/ttf-bitstream-vera*,patches} +tar jcf vdrskin-enigma-0.3a-nologos.tar.bz2 Enigma +rm -rf Enigma + +[ ! -e DeepBlue-0.1.4.tar.gz ] && \ +wget -q http://vdr.pfroen.de/download/DeepBlue-0.1.4.tar.gz +[ ! -e DeepBlueDXR3.tar.bz2 ] && \ +wget -q http://koti.mbnet.fi/cccatch/vdr/DeepBlueDXR3.tar.bz2 +rm -rf DeepBlue DeepBlueDXR3 +tar zxf DeepBlue-0.1.4.tar.gz +tar jxf DeepBlueDXR3.tar.bz2 +find DeepBlueDXR3 -type d -exec chmod +x {} ';' +rm -rf DeepBlue/logos/* +mv DeepBlueDXR3/HISTORY DeepBlue +mv DeepBlueDXR3/images DeepBlue/images-dxr3 +tar jcf DeepBlue-0.1.4-nologos.tar.bz2 DeepBlue +rm -rf DeepBlue DeepBlueDXR3 + +[ ! -e vdrskin-enElchi-0.7.1.tgz ] && \ +wget -q http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdrskin-enElchi-0.7.1.tgz +rm -rf enElchi +tar zxf vdrskin-enElchi-0.7.1.tgz +rm -f enElchi/logos-*/* +tar jcf vdrskin-enElchi-0.7.1-nologos.tar.bz2 enElchi +rm -rf enElchi + +[ ! -e Aluminium-1.0-demo.tar.bz2 ] && \ +wget -q http://linux.kompiliert.net/contrib/Aluminium-1.0-demo.tar.bz2 +rm -rf Aluminium +tar jxf Aluminium-1.0-demo.tar.bz2 +rm -f Aluminium/logos/* +tar jcf Aluminium-1.0-demo-nologos.tar.bz2 Aluminium +rm -rf Aluminium diff --git a/vdr-skins.spec b/vdr-skins.spec new file mode 100644 index 0000000..5ca529e --- /dev/null +++ b/vdr-skins.spec @@ -0,0 +1,202 @@ +# TODO: +# - http://linux.kompiliert.net/contrib/DeepBlue.skin-recordinginfo.diff +# - where has DeepBlue gone? +# - manage symlinks with alternatives? + +%define vardir %(vdr-config --vardir 2>/dev/null || echo ERROR) +%define datadir %(vdr-config --datadir 2>/dev/null || echo ERROR) +%define vdr_group %(vdr-config --group 2>/dev/null || echo ERROR) +%define vdr_user %(vdr-config --user 2>/dev/null || echo ERROR) + +Name: vdr-skins +Version: 20061119 +Release: 2 +Summary: Collection of OSD skins for VDR + +Group: Applications/Multimedia +License: GPL + +# Non-linked tarballs prepared with source99 + +# http://home.arcor.de/bjoern.sturzrehm/vdr/ +Source0: http://home.arcor.de/bjoern.sturzrehm/vdr/SilverGreen-0.1.7.tar.bz2 +# http://skins.vdr-developer.org/ +Source1: izegrey16-1.0-20050304-nologos.tar.bz2 +# http://home.pages.at/brougs78/ +# http://ventoso.org/luca/vdr/ +Source2: vdrskin-enigma-0.3a-nologos.tar.bz2 +# http://vdr.pfroen.de/ +# http://www.netholic.com/viewtopic.php?t=1464 +Source3: DeepBlue-0.1.4-nologos.tar.bz2 +# http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/ +Source4: vdrskin-enElchi-0.7.1-nologos.tar.bz2 +# http://www.fdm-ware.de/vdrskin/ +# http://linux.kompiliert.net/contrib/ +Source5: Aluminium-1.0-demo-nologos.tar.bz2 +# http://linux.kompiliert.net/contrib/ +Source6: http://linux.kompiliert.net/contrib/EgalSimple-1.0-demo.tar.bz2 +# http://www.vdrskins.org/vdrskins/thumbnails.php?album=58 +Source8: http://web.archive.org/web/20060322201106/http://www.magoa.net/sttng-blue.theme +Source99: %{name}-prepare-tarballs.sh + +Patch0: %{name}-aluminium-i18n.patch +Patch1: %{name}-egalsimple-i18n.patch +Patch2: %{name}-izegrey16-i18n.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: vdr-devel +Requires: vdr-text2skin >= 1.1 +Requires: vdr >= 1.4.6-2 +Requires: bitstream-vera-fonts + +%description +This package contains a collection of skins for VDR's on-screen display. + + +%prep +%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 +find . -type d -exec chmod 755 {} ';' +find . -type f -exec chmod 644 {} ';' +find . -type d -name CVS* | xargs rm -r +sed -i -e 's/\r//g' SilverGreen/{HISTORY,README,SilverGreen.trans} +for f in DeepBlue/HISTORY enElchi/HISTORY Enigma/TODO \ + SilverGreen/{HISTORY,README*}; do + iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f +done +%patch0 +%patch1 +%patch2 + +SKINS=$(find * -maxdepth 0 -type d) + +mv DeepBlue/COPYING . +for s in $SKINS ; do + for f in COPYING HISTORY README README.DE TODO ; do + [ -f $s/$f ] && mv $s/$f $f.$s + done +done + +find . -type f -name "*.theme" -exec mv {} . ';' +for s in $SKINS ; do + [ -f $s-default.theme ] || touch $s-default.theme +done + +ln -sf mp3.png Aluminium/replay/mp3oss.png +rm Aluminium/{Aluminium.skin.*,MERKEN} + +cd DeepBlue +mv images images-normal +ln -s images-normal images +mv logos logos-normal +ln -s logos-normal logos +cd .. + +rm -r EgalSimple/{EgalSimple.skin.*,themes} + +cd Enigma +rm -r themes +ln -sf %{_datadir}/fonts/bitstream-vera/VeraMono.ttf FontMonoSpaced.ttf +find . -type f -iname thumbs.db | xargs rm +mv icons icons-dxr3 +ln -s icons-normal icons +cd .. + +rm -rf enElchi/themes + +sed -i -e \ + 's|Vera\(Bd\)\?\.ttf|%{_datadir}/fonts/bitstream-vera/Vera\1.ttf|' \ + izegrey16/izegrey16.skin + + +%build + + +%install +rm -rf $RPM_BUILD_ROOT + +install -dm 755 $RPM_BUILD_ROOT%{vardir}/themes +install -pm 644 *.theme %{SOURCE8} $RPM_BUILD_ROOT%{vardir}/themes/ +echo "%%defattr(-,%{vdr_user},%{vdr_group},-)" > %{name}.themes +find $RPM_BUILD_ROOT%{vardir}/themes -name "*.theme" -size 0 \ + -printf "%%%%ghost %%p\n" >> %{name}.themes +find $RPM_BUILD_ROOT%{vardir}/themes -name "*.theme" ! -size 0 \ + -print >> %{name}.themes +%{__perl} -pi -e "s|$RPM_BUILD_ROOT||" %{name}.themes + +install -dm 755 $RPM_BUILD_ROOT%{datadir}/text2skin +cp -pR $(find * -maxdepth 0 -type d) $RPM_BUILD_ROOT%{datadir}/text2skin/ + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%triggerin -- vdr-dxr3 +for l in DeepBlue/{images,logos} enElchi/logos Enigma/icons ; do + [ -L %{datadir}/text2skin/$l -o ! -e %{datadir}/text2skin/$l ] && \ + rm -f %{datadir}/text2skin/$l && \ + ln -s $(basename $l)-dxr3 %{datadir}/text2skin/$l || : +done + +%triggerun -- vdr-dxr3 +if [ $2 -eq 0 ] ; then + for l in DeepBlue/{images,logos} enElchi/logos Enigma/icons ; do + [ -L %{datadir}/text2skin/$l -o ! -e %{datadir}/text2skin/$l ] && \ + rm -f %{datadir}/text2skin/$l && \ + ln -s $(basename $l)-normal %{datadir}/text2skin/$l || : + done +fi + + +%files -f %{name}.themes +%defattr(-,root,root,-) +%doc COPYING* HISTORY.* README.* + +%{datadir}/text2skin/Aluminium/ + +%dir %{datadir}/text2skin/DeepBlue/ +%{datadir}/text2skin/DeepBlue/DeepBlue.* +%{datadir}/text2skin/DeepBlue/images-* +%verify(not link) %{datadir}/text2skin/DeepBlue/images +%{datadir}/text2skin/DeepBlue/logos-* +%verify(not link) %{datadir}/text2skin/DeepBlue/logos + +%{datadir}/text2skin/EgalSimple/ + +%dir %{datadir}/text2skin/enElchi/ +%{datadir}/text2skin/enElchi/enElchi* +%verify(not link) %{datadir}/text2skin/enElchi/logos +%{datadir}/text2skin/enElchi/logos-*/ +%{datadir}/text2skin/enElchi/symbols/ + +%dir %{datadir}/text2skin/Enigma/ +%{datadir}/text2skin/Enigma/Enigma* +%{datadir}/text2skin/Enigma/Font* +%{datadir}/text2skin/Enigma/fonts/ +%{datadir}/text2skin/Enigma/hqlogos/ +%{datadir}/text2skin/Enigma/icons-*/ +%verify(not link) %{datadir}/text2skin/Enigma/icons +%{datadir}/text2skin/Enigma/pics/ +%{datadir}/text2skin/Enigma/symbols/ + +%{datadir}/text2skin/izegrey16/ + +%{datadir}/text2skin/SilverGreen/ + + +%changelog +* Mon Apr 23 2007 Ville Skyttä - 20061119-2 +- Relocate themes to /var/lib/vdr/themes, drop disttag (#216355). +- Drop file based dependency on /usr/share/vdr/text2skin. +- Fix sttng-blue source URL. + +* Sun Nov 19 2006 Ville Skyttä - 20061119-1 +- Install skins to /usr/share/vdr/text2skin. +- Don't ship channel logos. + +* Sun Sep 24 2006 Ville Skyttä - 20060924-1 +- Add DXR3 compatible image set for DeepBlue from cccache. + +* Sun May 21 2006 Ville Skyttä - 20060311-2 +- Fix some enElchi logos. From 77dd2bc34857944234a5f4ac528b781e57aa01db Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:12:50 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bab502b..847a52f 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vdr-skins -# $Id$ +# $Id: Makefile,v 1.1 2007/04/23 16:59:04 wtogami Exp $ NAME := vdr-skins SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From c2ce46bcb2fc706e4fc92bbd0172859063f96929 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:55:52 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 847a52f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vdr-skins -# $Id: Makefile,v 1.1 2007/04/23 16:59:04 wtogami Exp $ -NAME := vdr-skins -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6