[Fusionforge-commits] r7542 - in trunk/gforge: . debian packaging
Roland Mas
lolando at libremir.placard.fr.eu.org
Wed Apr 29 20:27:23 CEST 2009
Author: lolando
Date: 2009-04-29 20:27:22 +0200 (Wed, 29 Apr 2009)
New Revision: 7542
Added:
trunk/gforge/packaging/
trunk/gforge/packaging/control/
trunk/gforge/packaging/cron.d/
trunk/gforge/packaging/dirs/
trunk/gforge/packaging/install/
Removed:
trunk/gforge/control/
trunk/gforge/cron.d/
trunk/gforge/dirs/
trunk/gforge/install/
Modified:
trunk/gforge/debian/changelog
trunk/gforge/debian/rules
trunk/gforge/fusionforge.spec
trunk/gforge/install.sh
Log:
Moved common packaging files into a subdirectory
Modified: trunk/gforge/debian/changelog
===================================================================
--- trunk/gforge/debian/changelog 2009-04-29 15:35:52 UTC (rev 7541)
+++ trunk/gforge/debian/changelog 2009-04-29 18:27:22 UTC (rev 7542)
@@ -6,9 +6,12 @@
* New globalsearch plugin allowing to publish lists of projects for
other forges and to search for projects in remote forges.
* New projectlabels plugin from Adullact.
+ * Packaging-related files are now stored in
+ gforge/packaging/{dirs,install,cron.d,control}/* rather than the
+ previous gforge/{dirs,install,cron.d,control}/*.
+
+ -- Roland Mas <lolando at debian.org> Wed, 29 Apr 2009 15:21:31 +0200
- -- Roland Mas <lolando at debian.org> Wed, 29 Apr 2009 11:54:57 +0200
-
gforge (4.8~rc1-1+1) experimental; urgency=low
* New upstream snapshot.
Modified: trunk/gforge/debian/rules
===================================================================
--- trunk/gforge/debian/rules 2009-04-29 15:35:52 UTC (rev 7541)
+++ trunk/gforge/debian/rules 2009-04-29 18:27:22 UTC (rev 7542)
@@ -12,8 +12,8 @@
# This one should be declared like other when it will be unified with rpm
CRONFILESLIST=debian/$(PACKAGE)-lists-mailman.cron.d debian/$(PACKAGE)-web-apache2.cron.d debian/$(PACKAGE)-db-postgresql.cron.d debian/$(PACKAGE)-dns-bind9.cron.d debian/$(PACKAGE)-plugin-scmcvs.cron.d debian/$(PACKAGE)-ftp-proftpd.cron.d debian/$(PACKAGE)-shell-postgresql.cron.d debian/$(PACKAGE)-plugin-scmsvn.cron.d
-DIRSFILESLIST=$(patsubst dirs/%,debian/$(PACKAGE)-%.dirs,$(wildcard dirs/[a-z]*))
-INSTALLFILESLIST=$(patsubst install/%,debian/$(PACKAGE)-%.install,$(wildcard install/[a-z]*))
+DIRSFILESLIST=$(patsubst packaging/dirs/%,debian/$(PACKAGE)-%.dirs,$(wildcard packaging/dirs/[a-z]*))
+INSTALLFILESLIST=$(patsubst packaging/install/%,debian/$(PACKAGE)-%.install,$(wildcard packaging/install/[a-z]*))
listecho:
@echo $(CRONFILESLIST)
@@ -38,23 +38,23 @@
debian/$(PACKAGE)-%.cron.d:
@echo "Creating $@"
@if [ "$@" = "debian/$(PACKAGE)-db-postgresql.cron.d" ] ; then \
- cat $(CURDIR)/cron.d/00phpcron > $@ ; \
- cat $(CURDIR)/cron.d/db-postgresql >> $@ ; \
+ cat $(CURDIR)/packaging/cron.d/00phpcron > $@ ; \
+ cat $(CURDIR)/packaging/cron.d/db-postgresql >> $@ ; \
else \
- echo "copy $(CURDIR)/cron.d/$* to $@" ; \
- cp $(CURDIR)/cron.d/$* $@ ; \
+ echo "copy $(CURDIR)/packaging/cron.d/$* to $@" ; \
+ cp $(CURDIR)/packaging/cron.d/$* $@ ; \
fi
debian/$(PACKAGE)-%.dirs:
@echo "Creating $@"
- cp $(CURDIR)/dirs/$* $@
+ cp $(CURDIR)/packaging/dirs/$* $@
debian/$(PACKAGE)-%.install:
@echo "Creating $@"
- cp $(CURDIR)/install/$* $@
+ cp $(CURDIR)/packaging/install/$* $@
gencontrol:
- ls $(CURDIR)/control/[0-9][0-9][0-9]* | grep -v shortdesc | while read file ; do cat $${file}; if [ -f $${file}.shortdesc ] ; then cat $(CURDIR)/control/AAAdesc; echo ' .'; cat $${file}.shortdesc; fi; echo ''; done | sed 's/@PACKAGE@/$(PACKAGE)/g' > $(CURDIR)/debian/control
+ ls $(CURDIR)/packaging/control/[0-9][0-9][0-9]* | grep -v shortdesc | while read file ; do cat $${file}; if [ -f $${file}.shortdesc ] ; then cat $(CURDIR)/packaging/control/AAAdesc; echo ' .'; cat $${file}.shortdesc; fi; echo ''; done | sed 's/@PACKAGE@/$(PACKAGE)/g' > $(CURDIR)/debian/control
configure: configure-stamp debian/po/templates.pot
configure-stamp: remove-binary-files
@@ -100,7 +100,7 @@
dh_testroot
dh_clean -k
- # Generate conffiles *.cron.d *.dirs *.install
+ # Generate conffiles *.cron.d *.dirs *.install control
$(CURDIR)/debian/rules conffiles
dh_installdirs
Modified: trunk/gforge/fusionforge.spec
===================================================================
--- trunk/gforge/fusionforge.spec 2009-04-29 15:35:52 UTC (rev 7541)
+++ trunk/gforge/fusionforge.spec 2009-04-29 18:27:22 UTC (rev 7542)
@@ -196,7 +196,7 @@
cp -rp locales/* $RPM_BUILD_ROOT/%{GFORGE_LANG_DIR}/
# setting crontab
-install -m 664 cron.d/fusionforge $RPM_BUILD_ROOT/%{CROND_DIR}/
+install -m 664 packaging/cron.d/fusionforge $RPM_BUILD_ROOT/%{CROND_DIR}/
%pre
%startpostgresql
Modified: trunk/gforge/install.sh
===================================================================
--- trunk/gforge/install.sh 2009-04-29 15:35:52 UTC (rev 7541)
+++ trunk/gforge/install.sh 2009-04-29 18:27:22 UTC (rev 7542)
@@ -84,7 +84,7 @@
service iptables stop
msg="IMPORTANT: Service iptables (firewall) disabled, please reconfigure after"
- cp cron.d/cron.fusionforge /etc/cron.d
+ cp packaging/cron.d/cron.fusionforge /etc/cron.d
cp plugins/*/etc/cron.d/* /etc/cron.d/
service crond reload
else
@@ -121,7 +121,7 @@
rcSuSEfirewall2 stop
msg="IMPORTANT: Service SuSEfirewall2 stopped, please reconfigure after"
- cp cron.d/cron.fusionforge /etc/cron.d
+ cp packaging/cron.d/cron.fusionforge /etc/cron.d
cp plugins/*/etc/cron.d/* /etc/cron.d/
rccron reload
else
More information about the Fusionforge-commits
mailing list