Adapt packaging to c988dd2

qgis · Feb 17, 2018 · 17039ff · 17039ff
1 parent bbcd332
commit 17039ff
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/debian/qgis-common.install b/debian/qgis-common.install
@@ -21,4 +21,4 @@ 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
+usr/share/qgis/resources/qgis_global_settings.ini
diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -416,8 +416,8 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
 	"apps/%PACKAGENAME%/resources/data/" ^
 	"apps/%PACKAGENAME%/resources/metadata-ISO/" ^
 	"apps/%PACKAGENAME%/resources/2to3migration.txt" ^
+	"apps/%PACKAGENAME%/resources/qgis_global_settings.ini" ^
 	"apps/%PACKAGENAME%/qgiscrashhandler.exe" ^
-	"apps/%PACKAGENAME%/qgis_global_settings.ini" ^
 	"bin/%PACKAGENAME%.bat.tmpl" ^
 	"bin/%PACKAGENAME%-designer.bat.tmpl" ^
 	"etc/postinstall/%PACKAGENAME%.bat" ^

diff --git a/rpm/qgis.spec.template b/rpm/qgis.spec.template
@@ -327,7 +327,6 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/hicolor/*/mimetypes/*
 %{_datadir}/applications/*%{name}.desktop
-%{_datadir}/%{name}/qgis_global_settings.ini
 %{_datadir}/%{name}/images/
 %{_datadir}/%{name}/resources/
 %{_datadir}/%{name}/svg/