rev 20459 - kde-extras/ctemplate/trunk/debian

[Pino Toscano]

Author: pino
Date: 2016-05-04 21:35:56 +0000 (Wed, 04 May 2016)
New Revision: 20459

Modified:
   kde-extras/ctemplate/trunk/debian/changelog
   kde-extras/ctemplate/trunk/debian/control
   kde-extras/ctemplate/trunk/debian/libctemplate-dev.install
   kde-extras/ctemplate/trunk/debian/libctemplate3.install
   kde-extras/ctemplate/trunk/debian/rules
Log:
convert the package to multiarch

- remove the --libdir setting
- adapt the library paths in .install files
- add "Multi-Arch: same" to libctemplate3


Modified: kde-extras/ctemplate/trunk/debian/changelog
===================================================================
--- kde-extras/ctemplate/trunk/debian/changelog	2016-05-04 21:30:59 UTC (rev 20458)
+++ kde-extras/ctemplate/trunk/debian/changelog	2016-05-04 21:35:56 UTC (rev 20459)
@@ -5,6 +5,10 @@
   * Rename libctemplate2v5 to libctemplate3, according to the new SONAME.
   * Update the patches:
     - r129.patch: drop, backported from upstream
+  * Convert the package to multiarch:
+    - remove the --libdir setting
+    - adapt the library paths in .install files
+    - add "Multi-Arch: same" to libctemplate3
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 04 May 2016 23:20:27 +0200
 

Modified: kde-extras/ctemplate/trunk/debian/control
===================================================================
--- kde-extras/ctemplate/trunk/debian/control	2016-05-04 21:30:59 UTC (rev 20458)
+++ kde-extras/ctemplate/trunk/debian/control	2016-05-04 21:35:56 UTC (rev 20459)
@@ -24,6 +24,7 @@
 Package: libctemplate3
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: libctemplate2
 Replaces: libctemplate2

Modified: kde-extras/ctemplate/trunk/debian/libctemplate-dev.install
===================================================================
--- kde-extras/ctemplate/trunk/debian/libctemplate-dev.install	2016-05-04 21:30:59 UTC (rev 20458)
+++ kde-extras/ctemplate/trunk/debian/libctemplate-dev.install	2016-05-04 21:35:56 UTC (rev 20459)
@@ -1,8 +1,8 @@
 usr/bin/ctemplate-*
 usr/include/ctemplate/*
-usr/lib/libctemplate.a
-usr/lib/libctemplate.so
-usr/lib/libctemplate_nothreads.a
-usr/lib/libctemplate_nothreads.so
+usr/lib/*/libctemplate.a
+usr/lib/*/libctemplate.so
+usr/lib/*/libctemplate_nothreads.a
+usr/lib/*/libctemplate_nothreads.so
 usr/share/doc/ctemplate-*/*.css usr/share/doc/libctemplate-dev/html/
 usr/share/doc/ctemplate-*/*.html usr/share/doc/libctemplate-dev/html/

Modified: kde-extras/ctemplate/trunk/debian/libctemplate3.install
===================================================================
--- kde-extras/ctemplate/trunk/debian/libctemplate3.install	2016-05-04 21:30:59 UTC (rev 20458)
+++ kde-extras/ctemplate/trunk/debian/libctemplate3.install	2016-05-04 21:35:56 UTC (rev 20459)
@@ -1,2 +1,2 @@
-usr/lib/libctemplate.so.3*
-usr/lib/libctemplate_nothreads.so.3*
+usr/lib/*/libctemplate.so.3*
+usr/lib/*/libctemplate_nothreads.so.3*

Modified: kde-extras/ctemplate/trunk/debian/rules
===================================================================
--- kde-extras/ctemplate/trunk/debian/rules	2016-05-04 21:30:59 UTC (rev 20458)
+++ kde-extras/ctemplate/trunk/debian/rules	2016-05-04 21:35:56 UTC (rev 20459)
@@ -6,7 +6,7 @@
 	dh $@ --parallel --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --program-prefix=ctemplate- --libdir=/usr/lib
+	dh_auto_configure -- --program-prefix=ctemplate-
 
 override_dh_auto_test:
 	# There are some random failures in the tests.