[SCM] gtk2-engines-oxygen packaging branch, master, updated. debian/1.1.3-1

Kai Wasserbäch curan at alioth.debian.org
Tue Sep 20 10:18:36 UTC 2011


The following commit has been merged in the master branch:
commit c3fda2c10c3fcb1cf39bc0b8917ae4c795143780
Author: Kai Wasserbäch <curan at debian.org>
Date:   Tue Sep 20 11:47:03 2011 +0200

    New upstream release (1.1.3).
    
    * debian/changelog: Updated for new release.
    * debian/patches/use-sane-prefix-to-install-engine.patch: Removed again,
      was merged upstream (in a slightly different way).
    * debian/rules: Change needed due to different approach in setting the
      install path for the module.
---
 debian/changelog                                   |    4 +-
 debian/patches/series                              |    1 -
 .../use-sane-prefix-to-install-engine.patch        |   30 --------------------
 debian/rules                                       |    3 +-
 4 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c9f388d..07c7a7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-gtk2-engines-oxygen (1.1.2-2) UNRELEASED; urgency=low
+gtk2-engines-oxygen (1.1.3-1) UNRELEASED; urgency=low
 
+  * New upstream release.
   * debian/control: Updated Vcs-* entries to point to anonscm.d.o.
   * Prepare for multiarch:
-    - debian/patches/use-sane-prefix-to-install-engine.patch: Added.
     - debian/control:
       · Bumped B-D on debhelper.
       · Bumped B-D on libgtk2.0-dev (multiarch ready since 2.24.5-4).
diff --git a/debian/patches/series b/debian/patches/series
index 6c56076..625ddbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 dont-build-demos.patch
-use-sane-prefix-to-install-engine.patch
diff --git a/debian/patches/use-sane-prefix-to-install-engine.patch b/debian/patches/use-sane-prefix-to-install-engine.patch
deleted file mode 100644
index 1062f29..0000000
--- a/debian/patches/use-sane-prefix-to-install-engine.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Kai Wasserbäch <curan at debian.org>
-Description: Use Gtk's libdir as install prefix for the engine
- Ask pkg-config for the libdir, this allows an easy multiarch
- installation of the engine. Otherwise we'd need to pass
- "-DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH)" to CMake during configuration,
- which makes backporting more complex than needed. (Now you only need
- to lower the B-Ds on debhelper and libgtk2.0-dev).
-Last-Update: 2011-09-12
-Bug: https://bugs.kde.org/show_bug.cgi?id=281857
-Forwarded: https://bugs.kde.org/attachment.cgi?id=63581
----
- CMakeLists.txt |    7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -101,7 +101,12 @@ exec_program(
- 	ARGS --variable=gtk_binary_version gtk+-2.0
- 	OUTPUT_VARIABLE GTK_BIN_VERSION )
- 
--set( INSTALL_PATH_GTK_ENGINES "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/gtk-2.0/${GTK_BIN_VERSION}/engines" CACHE PATH "The directory in which to install the theme engine library( eg. /usr/lib/gtk-2.0/2.4.0/engines )" )
-+exec_program(
-+  ${PKGCONFIG_EXECUTABLE}
-+  ARGS --variable=libdir gtk+-2.0
-+  OUTPUT_VARIABLE GTK_LIBDIR_PREFIX )
-+
-+set( INSTALL_PATH_GTK_ENGINES "${GTK_LIBDIR_PREFIX}/gtk-2.0/${GTK_BIN_VERSION}/engines" CACHE PATH "The directory in which to install the theme engine library( eg. /usr/lib/gtk-2.0/2.4.0/engines )" )
- set( INSTALL_PATH_GTK_THEMES "${CMAKE_INSTALL_PREFIX}/share/themes" CACHE PATH "The directory in which to install the theme data( eg. /usr/share/themes )" )
- set( GTK_THEME_DIR ${INSTALL_PATH_GTK_THEMES}/oxygen-gtk )
- 
diff --git a/debian/rules b/debian/rules
index c3cba52..60a0979 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,11 +7,12 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DDEBIAN_NO_DEMOS=1 \
+		-DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=yes \
 		-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
 		-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
 		-DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"
 
 override_dh_makeshlibs:
-	dh_makeshlibs -X/usr/lib/gtk-2.0
+	dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/gtk-2.0
 
 .PHONY: override_dh_makeshlibs override_dh_auto_configure

-- 
gtk2-engines-oxygen packaging



More information about the pkg-kde-commits mailing list