Skip to content
Permalink
Browse files

- debian packaging update for 1.7.1

- composer/wmsserver fix for lenny (Qt <4.5)
  • Loading branch information
jef-n committed Sep 24, 2011
1 parent 8c3e066 commit e6718b654a73a3c07eaaaa1f178a51d51265ef0b
Showing with 14 additions and 3 deletions.
  1. +6 −0 debian/changelog
  2. +1 −1 debian/qgis-common.install
  3. +1 −1 debian/rules
  4. +2 −1 doc/CMakeLists.txt
  5. +2 −0 src/app/composer/qgscomposer.cpp
  6. +2 −0 src/mapserver/qgswmsserver.cpp
@@ -1,3 +1,9 @@
qgis (1.7.1-1) UNRELEASED; urgency=low

* new upstream bugfix release

-- Jürgen E. Fischer <jef@norbit.de> Sat, 24 Sep 2011 13:57:22 +0200

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
@@ -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
@@ -2,12 +2,13 @@ INCLUDE(Txt2Tags)
FIND_TXT2TAGS()

IF(TXT2TAGS_EXECUTABLE)
ADD_TXT2TAGS_FILES(QGIS_DOC_FILES INSTALL.t2t CODING.t2t)
ADD_TXT2TAGS_FILES(QGIS_DOC_FILES INSTALL.t2t CODING.t2t changelog.t2t)
ADD_CUSTOM_TARGET (t2tdoc ALL DEPENDS ${QGIS_DOC_FILES})
ELSE(TXT2TAGS_EXECUTABLE)
SET(QGIS_DOC_FILES
${CMAKE_SOURCE_DIR}/INSTALL
${CMAKE_SOURCE_DIR}/CODING
${CMAKE_SOURCE_DIR}/CHANGELOG
)
ENDIF(TXT2TAGS_EXECUTABLE)

@@ -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 e6718b6

Please sign in to comment.
You can’t perform that action at this time.