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

Kai Wasserbäch curan at alioth.debian.org
Mon Sep 12 09:26:17 UTC 2011


The following commit has been merged in the master branch:
commit 875c6f126dae5230aee56b1ecca33b291686a9f3
Author: Kai Wasserbäch <curan at debian.org>
Date:   Mon Sep 12 10:07:34 2011 +0200

    Don't build the two demo applications.
---
 debian/changelog                             |    4 ++++
 debian/gtk2-engines-oxygen.lintian-overrides |    3 ---
 debian/patches/dont-build-demos.patch        |   18 ++++++++++++++++++
 debian/patches/series                        |    1 +
 debian/rules                                 |    1 +
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 727f425..e14f9a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ gtk2-engines-oxygen (1.1.2-2) UNRELEASED; urgency=low
       · Bumped B-D on debhelper.
       · Bumped B-D on libgtk2.0-dev (multiarch ready since 2.24.5-4).
       · Added Pre-Depends and Multi-Arch entries to binary package.
+  * Don't build the two demo applications:
+    - debian/rules: Set DEBIAN_NO_DEMOS.
+    - debian/patches/dont-build-demos.patch: Added to make demo building
+      optional.
 
  -- Kai Wasserbäch <curan at debian.org>  Thu, 08 Sep 2011 22:25:50 +0200
 
diff --git a/debian/gtk2-engines-oxygen.lintian-overrides b/debian/gtk2-engines-oxygen.lintian-overrides
deleted file mode 100644
index e98f736..0000000
--- a/debian/gtk2-engines-oxygen.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# No real need for a man page (only demo apps)
-gtk2-engines-oxygen: binary-without-manpage usr/bin/oxygen-gtk-deco
-gtk2-engines-oxygen: binary-without-manpage usr/bin/oxygen-gtk-demo
diff --git a/debian/patches/dont-build-demos.patch b/debian/patches/dont-build-demos.patch
new file mode 100644
index 0000000..b931575
--- /dev/null
+++ b/debian/patches/dont-build-demos.patch
@@ -0,0 +1,18 @@
+From: Kai Wasserbäch <curan at debian.org>
+Subject: Make building of the demos optional.
+Last-Update: 2011-09-12
+Forwarded: not-needed
+---
+ CMakeLists.txt |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -152,4 +152,6 @@ configure_file( config.h.cmake ${CMAKE_B
+ add_subdirectory( src )
+ add_subdirectory( rc )
+ add_subdirectory( special-icons )
+-add_subdirectory( demo )
++if( NOT DEBIAN_NO_DEMOS )
++  add_subdirectory( demo )
++endif( NOT DEBIAN_NO_DEMOS )
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..625ddbd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+dont-build-demos.patch
diff --git a/debian/rules b/debian/rules
index 9eab08a..b5faebb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \
+		-DDEBIAN_NO_DEMOS=1 \
 		-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"

-- 
gtk2-engines-oxygen packaging



More information about the pkg-kde-commits mailing list