Skip to content

Commit 659859c

Browse files
committed
debian packaging update for 1.7.2
1 parent 32e5ead commit 659859c

9 files changed

+16
-17
lines changed

debian/changelog

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
qgis (1.7.2-1) UNRELEASED; urgency=low
2+
3+
* new upstream bugfix release
4+
5+
-- Jürgen E. Fischer <jef@norbit.de> Wed, 16 Nov 2011 21:43:47 +0100
6+
17
qgis (1.7.0) UNRELEASED; urgency=low
28

39
* new development version 1.7 after branch

debian/qgis-common.install

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
usr/share/qgis/doc/CODING
22
usr/share/qgis/doc/favicon.ico
33
usr/share/qgis/doc/index.html
4-
usr/share/qgis/doc/qgisdoc.css
4+
usr/share/qgis/doc/style.css
55
usr/share/qgis/doc/AUTHORS
66
usr/share/qgis/doc/SPONSORS
77
usr/share/qgis/doc/CONTRIBUTORS

debian/qgis-plugin-grass-common.install

-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ usr/share/qgis/grass/modules/*.png
55
usr/share/qgis/grass/modules/*.qgm
66
usr/share/qgis/grass/modules/*.svg
77
usr/share/qgis/grass/scripts/*.py
8-
usr/share/qgis/themes/*/grass

debian/qgis-plugin-grass-common.install.jaunty

-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ usr/share/qgis/grass/config
44
usr/share/qgis/grass/modules/*.png
55
usr/share/qgis/grass/modules/*.qgm
66
usr/share/qgis/grass/modules/*.svg
7-
usr/share/qgis/themes/*/grass

debian/qgis-plugin-grass-common.install.lenny

-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ usr/share/qgis/grass/config
44
usr/share/qgis/grass/modules/*.png
55
usr/share/qgis/grass/modules/*.qgm
66
usr/share/qgis/grass/modules/*.svg
7-
usr/share/qgis/themes/*/grass

debian/rules

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ binary-indep: build install
143143
binary-arch: build install
144144
dh_testdir
145145
dh_testroot
146-
dh_installchangelogs ChangeLog
146+
dh_installchangelogs CHANGELOG
147147
dh_installdocs
148148
dh_installexamples
149149
dh_install --sourcedir=debian/tmp

ms-windows/osgeo4w/creatensis.pl

+4-12
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,13 @@
2525
my $releasename;
2626
my $shortname;
2727
my $version;
28-
my $revision;
2928
my $help;
3029

3130
my $result = GetOptions(
3231
"verbose+" => \$verbose,
3332
"keep" => \$keep,
3433
"releasename=s" => \$releasename,
3534
"version=s" => \$version,
36-
"revision=s" => \$revision,
3735
"packagename=s" => \$packagename,
3836
"shortname=s" => \$shortname,
3937
"help" => \$help
@@ -234,22 +232,16 @@ sub getDeps {
234232
}
235233
close F;
236234

237-
$version = "$major.$minor.$patch" unless defined $version;
235+
$version = "$major.$minor.$patch" unless defined $version;
238236

239-
unless( defined $revision ) {
240-
open F, "svnversion|";
241-
$revision = <F>;
242-
$revision =~ s/\D+$//g;
243-
close F;
244-
}
245-
246-
$revision = 14615 unless $revision =~ /^\d+$/;
237+
my $revision = $major * 0x10000 + $minor * 0x100 + $patch;
247238

248239
system "unzip packages/Untgz.zip" unless -d "untgz";
249240

250241
chdir "..";
251242

252243
$packagename = "Quantum GIS" unless defined $packagename;
244+
my $sha = `git log -n1 --pretty=format:%h`;
253245
$shortname = "qgis" unless defined $shortname;
254246

255247
my $cmd = "makensis";
@@ -258,7 +250,7 @@ sub getDeps {
258250
$cmd .= " -DVERSION_NAME='$releasename'";
259251
$cmd .= " -DSVN_REVISION='$revision'";
260252
$cmd .= " -DQGIS_BASE='$packagename $releasename'";
261-
$cmd .= " -DINSTALLER_NAME='QGIS-OSGeo4W-$version-$revision-Setup.exe'";
253+
$cmd .= " -DINSTALLER_NAME='QGIS-OSGeo4W-$version-$sha-Setup.exe'";
262254
$cmd .= " -DDISPLAYED_NAME='$packagename \'$releasename\' ($version)'";
263255
$cmd .= " -DBINARY_REVISION=1";
264256
$cmd .= " -DSHORTNAME='$shortname'";

src/app/composer/qgscomposer.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,9 @@ class QgsPaintEngineHack : public QPaintEngine
518518
// | QPaintEngine::PerspectiveTransform
519519
| QPaintEngine::BlendModes
520520
// | QPaintEngine::ObjectBoundingModeGradients
521+
#if QT_VERSION >= 0x040500
521522
| QPaintEngine::RasterOpModes
523+
#endif
522524
| QPaintEngine::PaintOutsidePaintEvent
523525
);
524526
}

src/mapserver/qgswmsserver.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,9 @@ class QgsPaintEngineHack : public QPaintEngine
362362
// | QPaintEngine::PerspectiveTransform
363363
| QPaintEngine::BlendModes
364364
// | QPaintEngine::ObjectBoundingModeGradients
365+
#if QT_VERSION >= 0x040500
365366
| QPaintEngine::RasterOpModes
367+
#endif
366368
| QPaintEngine::PaintOutsidePaintEvent
367369
);
368370
}

0 commit comments

Comments
 (0)