rev 14095 - in kde-extras/yzis/trunk/debian: . patches

[Adrian Friedli]

Author: adi-guest
Date: 2009-03-17 22:20:44 +0000 (Tue, 17 Mar 2009)
New Revision: 14095

Removed:
   kde-extras/yzis/trunk/debian/patches/disable-logging.patch
Modified:
   kde-extras/yzis/trunk/debian/changelog
   kde-extras/yzis/trunk/debian/control
   kde-extras/yzis/trunk/debian/kyzis.install
   kde-extras/yzis/trunk/debian/rules
Log:
patch removed, general house keeping

Modified: kde-extras/yzis/trunk/debian/changelog
===================================================================
--- kde-extras/yzis/trunk/debian/changelog	2009-03-17 22:12:09 UTC (rev 14094)
+++ kde-extras/yzis/trunk/debian/changelog	2009-03-17 22:20:44 UTC (rev 14095)
@@ -1,3 +1,11 @@
+yzis (1.0~alpha1+hg4251-1) UNRELEASED; urgency=low
+
+  * Patch disable-logging removed, logging now disabled for non debug versions.
+  * Linking with '-Wl,--as-needed', no more dpkg-shlibdeps warnings.
+  * Bumped Standards-Version to 3.8.1.
+
+ -- Adrian Friedli <adi at koalatux.ch>  Mon, 16 Mar 2009 23:08:34 +0100
+
 yzis (1.0~alpha1-2) experimental; urgency=medium
 
   * Disable log file. Fixes symlink attack vulnerability. (Closes: #504680)

Modified: kde-extras/yzis/trunk/debian/control
===================================================================
--- kde-extras/yzis/trunk/debian/control	2009-03-17 22:12:09 UTC (rev 14094)
+++ kde-extras/yzis/trunk/debian/control	2009-03-17 22:20:44 UTC (rev 14095)
@@ -5,13 +5,14 @@
 Build-Depends: cdbs, debhelper (>= 5), cmake, liblua5.1-0-dev, libncursesw5-dev,
  kdelibs5-dev, libmagic-dev, libice-dev, libxft-dev, libxcursor-dev, libsm-dev,
  docbook2x
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/yzis/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/yzis/trunk/
 Homepage: http://www.yzis.org/
 
 Package: yzis-common
 Architecture: all
+Depends: ${misc:Depends}
 Recommends: yzis
 Description: editor inspired by vim - common files
  Yzis (pronounced why this) is a vi-like editor inspired by vim. Yzis aims to be
@@ -26,7 +27,7 @@
 
 Package: libyzis0
 Architecture: any
-Depends: yzis-common (= ${source:Version}), ${shlibs:Depends}
+Depends: yzis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Recommends: yzis
 Description: editor inspired by vim - core library
  Yzis (pronounced why this) is a vi-like editor inspired by vim. Yzis aims to be
@@ -41,7 +42,7 @@
 
 Package: nyzis
 Architecture: any
-Depends: libyzis0 (= ${binary:Version}), ${shlibs:Depends}
+Depends: libyzis0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: yzis, editor
 Description: editor inspired by vim - ncurses frontend
  Yzis (pronounced why this) is a vi-like editor inspired by vim. Yzis aims to be
@@ -56,7 +57,7 @@
 
 Package: qyzis
 Architecture: any
-Depends: libyzis0 (= ${binary:Version}), ${shlibs:Depends}
+Depends: libyzis0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: yzis
 Description: editor inspired by vim - Qt frontend
  Yzis (pronounced why this) is a vi-like editor inspired by vim. Yzis aims to be
@@ -71,7 +72,7 @@
 
 Package: kyzis
 Architecture: any
-Depends: libyzis0 (= ${binary:Version}), ${shlibs:Depends}
+Depends: libyzis0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: yzis
 Description: editor inspired by vim - KDE frontend
  Yzis (pronounced why this) is a vi-like editor inspired by vim. Yzis aims to be

Modified: kde-extras/yzis/trunk/debian/kyzis.install
===================================================================
--- kde-extras/yzis/trunk/debian/kyzis.install	2009-03-17 22:12:09 UTC (rev 14094)
+++ kde-extras/yzis/trunk/debian/kyzis.install	2009-03-17 22:20:44 UTC (rev 14095)
@@ -1,3 +1,4 @@
+debian/tmp/usr/bin/kyzis
 debian/tmp/usr/lib/kde4/yzispart.so
 debian/tmp/usr/share/kde4/apps/yzispart/yzispart.rc
 debian/tmp/usr/share/kde4/services/yzispart.desktop

Deleted: kde-extras/yzis/trunk/debian/patches/disable-logging.patch

Modified: kde-extras/yzis/trunk/debian/rules
===================================================================
--- kde-extras/yzis/trunk/debian/rules	2009-03-17 22:12:09 UTC (rev 14094)
+++ kde-extras/yzis/trunk/debian/rules	2009-03-17 22:20:44 UTC (rev 14095)
@@ -1,13 +1,15 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/cmake.mk
 
 DEB_CMAKE_EXTRA_FLAGS = -DENABLE_LIBYZISRUNNER=OFF -DENABLE_TESTS=OFF \
 			-DENABLE_DOCUMENTATION=OFF \
-			-DENABLE_KYZIS=ON -DENABLE_KPART_YZIS=ON
+			-DENABLE_KYZIS=ON -DENABLE_KPART_YZIS=ON \
+			-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
+			-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed" \
+			-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed"
 
 # build manpages
 MANPAGES = nyzis.1 qyzis.1 kyzis.1
@@ -18,7 +20,3 @@
 
 clean::
 	rm -f $(MANPAGES)
-
-# install kyzis binary
-common-install-arch::
-	dh_install -pkyzis $(DEB_BUILDDIR)/kyzis/kyzis /usr/bin