rev 20367 - kde-extras/kvpnc/trunk/debian

[Pino Toscano]

Author: pino
Date: 2016-02-14 09:56:10 +0000 (Sun, 14 Feb 2016)
New Revision: 20367

Removed:
   kde-extras/kvpnc/trunk/debian/kvpnc-data.install
   kde-extras/kvpnc/trunk/debian/kvpnc.install
Modified:
   kde-extras/kvpnc/trunk/debian/changelog
   kde-extras/kvpnc/trunk/debian/control
   kde-extras/kvpnc/trunk/debian/rules
Log:
fold kvpnc-data into kvpnc


Modified: kde-extras/kvpnc/trunk/debian/changelog
===================================================================
--- kde-extras/kvpnc/trunk/debian/changelog	2016-02-14 09:43:53 UTC (rev 20366)
+++ kde-extras/kvpnc/trunk/debian/changelog	2016-02-14 09:56:10 UTC (rev 20367)
@@ -5,6 +5,12 @@
   * Backport upstream r1452682 and r1452683 to fix build with GCC 6; patches
     r1452682.diff and r1452683.diff. (Closes: #811679)
   * Use https for the Vcs-Browser field.
+  * Since kvpnc-data is really small (< 400K, compared to ~3M of kvpnc), fold
+    its content to kvpnc:
+    - remove kvpnc-data package
+    - add proper breaks/replaces in kvpnc
+    - force installation directly to the kvpnc destdir, and remove install files
+    - remove --list-missing
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 14 Feb 2016 10:22:07 +0100
 

Modified: kde-extras/kvpnc/trunk/debian/control
===================================================================
--- kde-extras/kvpnc/trunk/debian/control	2016-02-14 09:43:53 UTC (rev 20366)
+++ kde-extras/kvpnc/trunk/debian/control	2016-02-14 09:56:10 UTC (rev 20367)
@@ -12,10 +12,12 @@
 
 Package: kvpnc
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kvpnc-data (= ${source:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends},
  menu, net-tools, psmisc, kmod
 Suggests: iptables, openssl, openvpn, racoon, vpnc, pptp-linux, openswan,
  xl2tpd, openct, opensc
+Breaks: kvpnc-data (<< 0.9.6a-4~)
+Replaces: kvpnc-data (<< 0.9.6a-4~)
 Description: frontend to VPN clients
  KVpnc is a KDE frontend for various VPN clients.
  .
@@ -26,16 +28,6 @@
    * Virtual Private Network daemon (openvpn)
    * L2TP, Vtun & OpenSSH
 
-Package: kvpnc-data
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: kvpnc (>= ${source:Version})
-Replaces: kvpnc (<< 0.9.6a)
-Description: data files for KVpnc
- KVpnc is a KDE frontend for various VPN clients.
- .
- This package contains the data files for it.
-
 Package: kvpnc-dbg
 Section: debug
 Architecture: any

Modified: kde-extras/kvpnc/trunk/debian/rules
===================================================================
--- kde-extras/kvpnc/trunk/debian/rules	2016-02-14 09:43:53 UTC (rev 20366)
+++ kde-extras/kvpnc/trunk/debian/rules	2016-02-14 09:56:10 UTC (rev 20367)
@@ -1,8 +1,11 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --parallel --dbg-package=kvpnc-dbg --with kde --list-missing
+	dh $@ --parallel --dbg-package=kvpnc-dbg --with kde
 
+override_dh_auto_install:
+	dh_auto_install --buildsystem=kde --destdir=debian/kvpnc
+
 override_dh_fixperms:
 	dh_fixperms
 	find debian -type f -name 'ping_check.sh' | xargs chmod +x