From c240763598534c2200aa7327311d6199269fb17a Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 19 May 2010 17:56:49 +0000 Subject: [PATCH] 2010-05-19 Miguel de Dios * DEBIAN/conffiles: added the conffiles to tell to package maker that its the conf file. * DEBIAN/make_deb_package.sh: changed the script to try to be similar to spec RPM (set the location of perl libs). git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2759 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 8 ++ pandora_server/DEBIAN/conffiles | 1 + pandora_server/DEBIAN/make_deb_package.sh | 105 +++++++++++++--------- 3 files changed, 74 insertions(+), 40 deletions(-) create mode 100755 pandora_server/DEBIAN/conffiles diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 9b387aa184..0fffdbf1fc 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,11 @@ +2010-05-19 Miguel de Dios + + * DEBIAN/conffiles: added the conffiles to tell to package maker that its + the conf file. + + * DEBIAN/make_deb_package.sh: changed the script to try to be similar to + spec RPM (set the location of perl libs). + 2010-05-19 Miguel de Dios * DEBIAN/make_deb_package.sh: added cpan parameter for to make module diff --git a/pandora_server/DEBIAN/conffiles b/pandora_server/DEBIAN/conffiles new file mode 100755 index 0000000000..7a4bd226ed --- /dev/null +++ b/pandora_server/DEBIAN/conffiles @@ -0,0 +1 @@ +/etc/pandora/pandora_server.conf diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh index a1b2703b25..533c625ee8 100644 --- a/pandora_server/DEBIAN/make_deb_package.sh +++ b/pandora_server/DEBIAN/make_deb_package.sh @@ -62,48 +62,73 @@ cd .. echo "Make a \"temp_package\" temp dir for job." mkdir temp_package +############################################ +mkdir -p temp_package/usr/bin/ +mkdir -p temp_package/usr/sbin/ +mkdir -p temp_package/etc/init.d/ +mkdir -p temp_package/etc/pandora/ +mkdir -p temp_package/var/spool/pandora/data_in +mkdir -p temp_package/var/spool/pandora/data_in/conf +mkdir -p temp_package/var/spool/pandora/data_in/md5 +mkdir -p temp_package/var/log/pandora/ +mkdir -p temp_package/usr/share/pandora_server/conf/ +mkdir -p temp_package/usr/lib/perl5/ + +cp -aRf bin/pandora_server temp_package/usr/bin/ +cp -aRf bin/pandora_exec temp_package/usr/bin/ +cp -aRf bin/tentacle_server temp_package/usr/bin/ + +cp -aRf conf/* temp_package/pandora_server/conf/ +cp -aRf util temp_package/usr/share/pandora_server/ +cp -aRf lib/* temp_package/usr/lib/perl5/ +cp -aRf AUTHORS COPYING ChangeLog README temp_package/usr/share/pandora_server/ + +cp -aRf util/pandora_server temp_package/etc/init.d/ +cp -aRf util/tentacle_serverd temp_package/etc/init.d/ +############################################ + if [ $package_pandora -eq 1 ] then - echo "Make the fake tree system in \"temp_package\"." - mkdir -p temp_package/var/spool/pandora/data_in/conf - mkdir -p temp_package/var/spool/pandora/data_in/md5 - mkdir -p temp_package/var/log/pandora - mkdir -p temp_package/etc/pandora - mkdir -p temp_package/etc/init.d/ - mkdir -p temp_package/etc/logrotate.d - mkdir -p temp_package/usr/share/pandora_server - mkdir -p temp_package/usr/bin - - echo "Make the perl of Pandora Server." - perl Makefile.PL - make - - # Adjust Makefile to use our "fake" root dir to install libraries and also binaries" - cat Makefile | sed -e "s/PREFIX = \/usr/PREFIX = temp_package\/usr/" > Makefile.temp - - # This is needed to create .DEB in OpenSUSE. - - cat Makefile.temp | sed -e "s/INSTALLBIN = .*/INSTALLBIN = temp_package\/usr\/bin/" > Makefile - cat Makefile | sed -e "s/INSTALLSITEBIN = .*/INSTALLSITEBIN = temp_package\/usr\/bin/" > Makefile.temp - cat Makefile.temp | sed -e "s/INSTALLVENDORBIN = .*/INSTALLVENDORBIN = temp_package\/usr\/bin/" > Makefile - cat Makefile | sed -e "s/INSTALLSCRIPT = .*/INSTALLSCRIPT = temp_package\/usr\/bin/" > Makefile.temp - cat Makefile.temp | sed -e "s/INSTALLSITESCRIPT = .*/INSTALLSITESCRIPT = temp_package\/usr\/bin/" > Makefile - cat Makefile | sed -e "s/INSTALLVENDORSCRIPT = .*/INSTALLVENDORSCRIPT = temp_package\/usr\/bin/" > Makefile.temp - - mv Makefile.temp Makefile - make install - - echo "Copy other files in fake file." - cp util/pandora_logrotate temp_package/etc/logrotate.d/pandora - - cp bin/tentacle_server temp_package/usr/bin - cp util/tentacle_serverd temp_package/etc/init.d/tentacle_serverd - - cp conf/pandora_server.conf temp_package/etc/pandora/ - cp util/pandora_server temp_package/etc/init.d/ - - cp -R util temp_package/usr/share/pandora_server - cp -R DEBIAN temp_package/ + #~ echo "Make the fake tree system in \"temp_package\"." + #~ mkdir -p temp_package/var/spool/pandora/data_in/conf + #~ mkdir -p temp_package/var/spool/pandora/data_in/md5 + #~ mkdir -p temp_package/var/log/pandora + #~ mkdir -p temp_package/etc/pandora + #~ mkdir -p temp_package/etc/init.d/ + #~ mkdir -p temp_package/etc/logrotate.d + #~ mkdir -p temp_package/usr/share/pandora_server + #~ mkdir -p temp_package/usr/bin +#~ + #~ echo "Make the perl of Pandora Server." + #~ perl Makefile.PL + #~ make +#~ + #~ # Adjust Makefile to use our "fake" root dir to install libraries and also binaries" + #~ cat Makefile | sed -e "s/PREFIX = \/usr/PREFIX = temp_package\/usr/" > Makefile.temp +#~ + #~ # This is needed to create .DEB in OpenSUSE. +#~ + #~ cat Makefile.temp | sed -e "s/INSTALLBIN = .*/INSTALLBIN = temp_package\/usr\/bin/" > Makefile + #~ cat Makefile | sed -e "s/INSTALLSITEBIN = .*/INSTALLSITEBIN = temp_package\/usr\/bin/" > Makefile.temp + #~ cat Makefile.temp | sed -e "s/INSTALLVENDORBIN = .*/INSTALLVENDORBIN = temp_package\/usr\/bin/" > Makefile + #~ cat Makefile | sed -e "s/INSTALLSCRIPT = .*/INSTALLSCRIPT = temp_package\/usr\/bin/" > Makefile.temp + #~ cat Makefile.temp | sed -e "s/INSTALLSITESCRIPT = .*/INSTALLSITESCRIPT = temp_package\/usr\/bin/" > Makefile + #~ cat Makefile | sed -e "s/INSTALLVENDORSCRIPT = .*/INSTALLVENDORSCRIPT = temp_package\/usr\/bin/" > Makefile.temp +#~ + #~ mv Makefile.temp Makefile + #~ make install +#~ + #~ echo "Copy other files in fake file." + #~ cp util/pandora_logrotate temp_package/etc/logrotate.d/pandora +#~ + #~ cp bin/tentacle_server temp_package/usr/bin + #~ cp util/tentacle_serverd temp_package/etc/init.d/tentacle_serverd +#~ + #~ cp conf/pandora_server.conf temp_package/etc/pandora/ + #~ cp util/pandora_server temp_package/etc/init.d/ +#~ + #~ cp -R util temp_package/usr/share/pandora_server + #~ cp -R DEBIAN temp_package/ echo "Remove the SVN files and other temp files." for item in `find temp_package`