Skip to content
Permalink
Browse files
debian packaging update for 1.7.2
  • Loading branch information
jef-n committed Nov 17, 2011
1 parent 32e5ead commit 659859c99c482204a4be05e3cc1ad548d88e606f
@@ -1,3 +1,9 @@
qgis (1.7.2-1) UNRELEASED; urgency=low

* new upstream bugfix release

-- Jürgen E. Fischer <jef@norbit.de> Wed, 16 Nov 2011 21:43:47 +0100

qgis (1.7.0) UNRELEASED; urgency=low

* new development version 1.7 after branch
@@ -1,7 +1,7 @@
usr/share/qgis/doc/CODING
usr/share/qgis/doc/favicon.ico
usr/share/qgis/doc/index.html
usr/share/qgis/doc/qgisdoc.css
usr/share/qgis/doc/style.css
usr/share/qgis/doc/AUTHORS
usr/share/qgis/doc/SPONSORS
usr/share/qgis/doc/CONTRIBUTORS
@@ -5,4 +5,3 @@ usr/share/qgis/grass/modules/*.png
usr/share/qgis/grass/modules/*.qgm
usr/share/qgis/grass/modules/*.svg
usr/share/qgis/grass/scripts/*.py
usr/share/qgis/themes/*/grass
@@ -4,4 +4,3 @@ usr/share/qgis/grass/config
usr/share/qgis/grass/modules/*.png
usr/share/qgis/grass/modules/*.qgm
usr/share/qgis/grass/modules/*.svg
usr/share/qgis/themes/*/grass
@@ -4,4 +4,3 @@ usr/share/qgis/grass/config
usr/share/qgis/grass/modules/*.png
usr/share/qgis/grass/modules/*.qgm
usr/share/qgis/grass/modules/*.svg
usr/share/qgis/themes/*/grass
@@ -143,7 +143,7 @@ binary-indep: build install
binary-arch: build install
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
dh_installchangelogs CHANGELOG
dh_installdocs
dh_installexamples
dh_install --sourcedir=debian/tmp
@@ -25,15 +25,13 @@
my $releasename;
my $shortname;
my $version;
my $revision;
my $help;

my $result = GetOptions(
"verbose+" => \$verbose,
"keep" => \$keep,
"releasename=s" => \$releasename,
"version=s" => \$version,
"revision=s" => \$revision,
"packagename=s" => \$packagename,
"shortname=s" => \$shortname,
"help" => \$help
@@ -234,22 +232,16 @@ sub getDeps {
}
close F;

$version = "$major.$minor.$patch" unless defined $version;
$version = "$major.$minor.$patch" unless defined $version;

unless( defined $revision ) {
open F, "svnversion|";
$revision = <F>;
$revision =~ s/\D+$//g;
close F;
}

$revision = 14615 unless $revision =~ /^\d+$/;
my $revision = $major * 0x10000 + $minor * 0x100 + $patch;

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

chdir "..";

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

my $cmd = "makensis";
@@ -258,7 +250,7 @@ sub getDeps {
$cmd .= " -DVERSION_NAME='$releasename'";
$cmd .= " -DSVN_REVISION='$revision'";
$cmd .= " -DQGIS_BASE='$packagename $releasename'";
$cmd .= " -DINSTALLER_NAME='QGIS-OSGeo4W-$version-$revision-Setup.exe'";
$cmd .= " -DINSTALLER_NAME='QGIS-OSGeo4W-$version-$sha-Setup.exe'";
$cmd .= " -DDISPLAYED_NAME='$packagename \'$releasename\' ($version)'";
$cmd .= " -DBINARY_REVISION=1";
$cmd .= " -DSHORTNAME='$shortname'";
@@ -518,7 +518,9 @@ class QgsPaintEngineHack : public QPaintEngine
// | QPaintEngine::PerspectiveTransform
| QPaintEngine::BlendModes
// | QPaintEngine::ObjectBoundingModeGradients
#if QT_VERSION >= 0x040500
| QPaintEngine::RasterOpModes
#endif
| QPaintEngine::PaintOutsidePaintEvent
);
}
@@ -362,7 +362,9 @@ class QgsPaintEngineHack : public QPaintEngine
// | QPaintEngine::PerspectiveTransform
| QPaintEngine::BlendModes
// | QPaintEngine::ObjectBoundingModeGradients
#if QT_VERSION >= 0x040500
| QPaintEngine::RasterOpModes
#endif
| QPaintEngine::PaintOutsidePaintEvent
);
}

0 comments on commit 659859c

Please sign in to comment.