CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fixreplacements-geoip-database-contrib' into 'flidas'

Browse source 
Fix geoip-database-contrib

Fixed makefile and modified DATA/* names so they relate to new names in package downloaded

See merge request !184
This commit is contained in:
Ruben Rodriguez 2018-02-16 04:34:10 +00:00
commit 5d0c60f698
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

0
helpers/DATA/geoip-database-contrib/geoip-database-contrib_update.shim → helpers/DATA/geoip-database-contrib/update-geoip-database.shim
View file

12
helpers/make-geoip-database-contrib
View file

@ -22,20 +22,22 @@ EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu $UPSTREAM multiverse'
. ./config . ./config
sed "/^exit 0/d" -i geoip-database-contrib_update sed "/^exit 0/d" -i update-geoip-database
cat $DATA/geoip-database-contrib_update.shim >> geoip-database-contrib_update cat $DATA/update-geoip-database.shim >> update-geoip-database
cat $DATA/copyright.shim >> debian/copyright cat $DATA/copyright.shim >> debian/copyright
sed '/rm -f \/usr\/share\/GeoIP\/GeoLiteCityv6\.dat/a\ sed '\|rm -f /var/lib/geoip-database-contrib/GeoLiteCityv6\.dat|a\
rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPCountryCSV.zip\ rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPCountryCSV.zip\
rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPv6.csv.gz\ rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPv6.csv.gz\
rm -f /usr/share/doc/geoip-database-contrib/csv/GeoLiteCity-latest.tar.xz\ rm -f /usr/share/doc/geoip-database-contrib/csv/GeoLiteCity-latest.tar.xz\
rm -f /usr/share/doc/geoip-database-contrib/csv/GeoLiteCityv6.csv.gz\ rm -f /usr/share/doc/geoip-database-contrib/csv/GeoLiteCityv6.csv.gz\
rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPASNum2.zip\ rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPASNum2.zip\
rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPASNum2v6.zip rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPASNum2v6.zip\
rmdir --ignore-fail-on-non-empty /usr/share/doc/geoip-database-contrib/csv &&\\\
rmdir --ignore-fail-on-non-empty /usr/share/doc/geoip-database-contrib
' -i debian/postrm ' -i debian/postrm
changelog 'Handle CSV source in geoip-database-contrib_update and postrm #13927' changelog 'Handle CSV source in update-geoip-database and postrm #13927'
compile compile