[devel-42: remove file missed out in devel-41 reorg
ganesh**Mon Jan 20 23:55:58 GMT 2003
devel-42: remove file missed out in devel-41 reorg
update distribution stuff to reflect reorg
"templatealias" option
modified distribution photopubrc to templatealias /basic to /
] {
hunk ./CHANGELOG 1
-$Fix for perl 5.00503
-$Make it possible to "include" other config files
-$Copyright notice updated
hunk ./CHANGELOG 2
+$Copyright notice updated
+$Make it possible to "include" other config files
+$Fix for perl 5.00503
+$Aliasing of templates (e.g. make the templates in / be those from /basic)
+$Call existing distribution templates /basic/... rather than /...
+;(but alias / to /basic)
hunk ./MERGING 66
+devel-42: remove file missed out in devel-41 reorg
+ update distribution stuff to reflect reorg
+ "templatealias" option
+ modified distribution photopubrc to templatealias /basic to /
hunk ./Makefile 19
+ for d in `find dist/templates -path '*CVS' -prune -o -type d -print` ; \
+ do install -d -m 755 photopub-$(VERSION)/$$d ; done
+ for d in `find dist/templates -path '*CVS' -prune -o -type f -print` ; \
+ do install -m 644 $$d photopub-$(VERSION)/$$d ; done
hunk ./Makefile 91
+
hunk ./PhotoPub/Config.pm 310
+ } elsif($item eq 'templatealias') {
+ my $target=&singlevalue($item,$value);
+ $target="$target/" if substr($target,-1,1) ne '/';
+ while(my ($plural,$type)=each %templatetypes) {
+ my $handler=$type."template";
+ &installhandler($handler,&makepath($curpath),sub {
+ my ($subpath)=@_;
+ return &handlephoto($handler,$target.$subpath);
+ });
+ }
hunk ./dist/debian/rules 38
- /etc/photopub/templates /etc/apache/conf.d \
+ /etc/apache/conf.d \
hunk ./dist/debian/rules 53
- install -m 644 dist/templates.conf $(rootdir)/etc/photopub/templates/templates.conf
- for d in album album-book downwards downwards-fixedwidth across slideshow ; do install -m 644 dist/$$d.thtml $(rootdir)/etc/photopub/templates/$$d.thtml ; echo /etc/photopub/templates/$$d.thtml >> $(rootdir)/DEBIAN/conffiles ; done
+ cd dist && for d in `find templates -type d` ; \
+ do install -d -m 755 ../$(rootdir)/etc/photopub/$$d ; done
hunk ./dist/debian/rules 56
+ cd dist && for d in `find templates -type f` ; \
+ do install -m 644 $$d ../$(rootdir)/etc/photopub/$$d ; \
+ echo /etc/photopub/$$d >> ../$(rootdir)/DEBIAN/conffiles ; done
+
hunk ./dist/downwards-fixedwidth.thtml 1
-
-
-Pictures $range
-
-
-
-
-
-![]() |
-
-$description
- |
-
-
-
-
-
rmfile ./dist/downwards-fixedwidth.thtml
hunk ./dist/manifest.files 23
-dist/album.thtml
-dist/album-book.thtml
-dist/downwards.thtml
-dist/downwards-fixedwidth.thtml
-dist/across.thtml
-dist/slideshow.thtml
hunk ./dist/manifest.files 25
-dist/templates.conf
hunk ./dist/photopubrc 4
+templatealias /basic
+
hunk ./dist/photopubrc 13
-
- include templates.conf
-
+
+
+ include conf
+
+
hunk ./dist/redhat/photopub.spec 42
- /etc/photopub/templates /etc/httpd/conf.d
+ /etc/httpd/conf.d
hunk ./dist/redhat/photopub.spec 69
-install -m 644 dist/templates.conf $RPM_BUILD_ROOT/etc/photopub/templates/templates.conf
+cd dist
hunk ./dist/redhat/photopub.spec 71
-for d in album album-book downwards downwards-fixedwidth across slideshow
- do install -m 644 dist/$d.thtml $RPM_BUILD_ROOT/etc/photopub/templates/$d.thtml
+for d in `find templates -type d`
+ do install -d -m 755 $RPM_BUILD_ROOT/etc/photopub/$d
hunk ./dist/redhat/photopub.spec 75
+for d in `find templates -type f`
+ do install -m 644 $d $RPM_BUILD_ROOT/etc/photopub/$d
+done
+
+cd ..
+
hunk ./dist/redhat/photopub.spec 159
+# need to build files list so the list of template packages isn't hardcoded
hunk ./dist/redhat/photopub.spec 163
-/var/cache/photopub
-/usr/lib/photopub
hunk ./dist/redhat/photopub.spec 165
-%config(noreplace) /etc/photopub/templates/*
+/var/cache/photopub
+/usr/lib/photopub
+%dir /etc/photopub
+%dir /etc/photopub/templates
+%dir /etc/photopub/templates/basic
+%config(noreplace) /etc/photopub/templates/conf
+%config(noreplace) /etc/photopub/templates/basic/*
}