Skip to content

Commit

Permalink
packaging updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jan 5, 2018
1 parent 421ef88 commit 4abac93
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 0 deletions.
3 changes: 3 additions & 0 deletions debian/qgis-common.install
Expand Up @@ -18,4 +18,7 @@ usr/share/qgis/i18n/*
usr/share/qgis/images/*
usr/share/qgis/resources/spatialite.db
usr/share/qgis/resources/themes/*
usr/share/qgis/resources/data/*
usr/share/qgis/resources/metadata-ISO/*
usr/share/qgis/resources/2to3migration.txt
usr/share/qgis/qgis_global_settings.ini
3 changes: 3 additions & 0 deletions debian/rules
Expand Up @@ -266,6 +266,9 @@ override_dh_auto_install:
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENSE
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/db_manager/LICENSE
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/MetaSearch/LICENSE.txt
$(RM) $(CURDIR)/debian/tmp/usr/bin/qgis_wcstest
$(RM) $(CURDIR)/debian/tmp/usr/bin/qgis_bench
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/resources/wcs-servers.json

# Man pages are installed by dh_installman
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1
Expand Down
3 changes: 3 additions & 0 deletions ms-windows/osgeo4w/package.cmd
Expand Up @@ -388,6 +388,9 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
"apps/%PACKAGENAME%/python/" ^
"apps/%PACKAGENAME%/resources/customization.xml" ^
"apps/%PACKAGENAME%/resources/themes/" ^
"apps/%PACKAGENAME%/resources/data/" ^
"apps/%PACKAGENAME%/resources/metadata-ISO/" ^
"apps/%PACKAGENAME%/resources/2to3migration.txt" ^
"bin/%PACKAGENAME%.bat.tmpl" ^
"bin/%PACKAGENAME%-designer.bat.tmpl" ^
"etc/postinstall/%PACKAGENAME%.bat" ^
Expand Down
1 change: 1 addition & 0 deletions resources/CMakeLists.txt
Expand Up @@ -5,6 +5,7 @@ INSTALL(FILES qgis_global_settings.ini
INSTALL(DIRECTORY cpt-city-qgis-min DESTINATION ${QGIS_DATA_DIR}/resources)
INSTALL(DIRECTORY themes DESTINATION ${QGIS_DATA_DIR}/resources)
INSTALL(DIRECTORY data DESTINATION ${QGIS_DATA_DIR}/resources)
INSTALL(DIRECTORY metadata-ISO DESTINATION ${QGIS_DATA_DIR}/resources)

IF (WITH_SERVER)
INSTALL(DIRECTORY server DESTINATION ${QGIS_DATA_DIR}/resources)
Expand Down

1 comment on commit 4abac93

@nirvn
Copy link
Contributor

@nirvn nirvn commented on 4abac93 Jan 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jef-n , thanks, that'll make a bunch of people happy 😄

Please sign in to comment.