Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Please unblock package qjson This package closes #687537 (severity important), in which the Debian package was defining CMake variables in lowercase (like qjson_FOO) instead of uppercase (QJSON_FOO). The good news are that no package was using the lowercase variables, so the change does not affects reverse dependencies of this package. Of course, we did check this: - Pino Toscano rebuilt all the reverse dependencies without problems. - We used codesearch.debian.net to find qjson_* CMake variables having an empty result. This change affects the files: - patches/install_cmake_config.patch (removed) - patches/fix_cmake_variables.patch (added) I also fixed some minor stuff: - Updated Standars-Version. - Updated symbols files with buildds' logs. - Updated the versioned dependency of debhelper. The last time I uploaded this package compat 9 was provided by 8.1.3 in experimental mode. Now that debhelper is already on version 9, I updated this. diffstat: changelog | 15 ++++ control | 4 - libqjson-dev.install | 3 libqjson0.symbols | 93 ++++++++++++++------------ patches/enable_multiarch.patch | 16 +--- patches/fix_cmake_variables.patch | 130 +++++++++++++++++++++++++++++++++++++ patches/install_cmake_config.patch | 90 ------------------------- patches/series | 2 source/lintian-overrides | 2 9 files changed, 205 insertions(+), 150 deletions(-) Kinds regards, Lisandro. unblock qjson/0.7.1-7 -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (990, 'unstable'), (500, 'testing'), (101, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: mips i386 Kernel: Linux 3.2.21+edid (SMP w/2 CPU cores) Locale: LANG=es_AR.UTF-8, LC_CTYPE=es_AR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash
diff -Nru qjson-0.7.1/debian/changelog qjson-0.7.1/debian/changelog --- qjson-0.7.1/debian/changelog 2011-11-07 22:45:34.000000000 -0300 +++ qjson-0.7.1/debian/changelog 2012-11-08 09:09:53.000000000 -0300 @@ -1,3 +1,18 @@ +qjson (0.7.1-7) unstable; urgency=low + + * Add fix_cmake_variables.patch by Ralf Jung (Closes: #687537). + - Remove now obsolete install_cmake_config.patch. + - Refresh enable_multiarch.patch. + - Refresh debian/series. + - Refresh libqjson-dev.install. + * Fix versioned depends on debhelper. Last time we uploaded compat 9 was + experimental. + - Remove unused lintian override. + * Update symbols files with symbols from the buildds. + * Update Standars-Version to 3.9.4. No changes needed. + + -- Lisandro Damián Nicanor Pérez Meyer <[email protected]> Thu, 08 Nov 2012 08:46:09 -0300 + qjson (0.7.1-6) unstable; urgency=low [ Lisandro Damián Nicanor Pérez Meyer ] diff -Nru qjson-0.7.1/debian/control qjson-0.7.1/debian/control --- qjson-0.7.1/debian/control 2011-11-07 22:36:44.000000000 -0300 +++ qjson-0.7.1/debian/control 2012-11-08 09:09:08.000000000 -0300 @@ -2,9 +2,9 @@ Priority: extra Maintainer: Lisandro Damián Nicanor Pérez Meyer <[email protected]> Uploaders: Sune Vuorela <[email protected]> -Build-Depends: dpkg (>= 1.16.1~), debhelper (>= 8.1.3), cmake (>= 2.8.5), +Build-Depends: dpkg (>= 1.16.1~), debhelper (>= 9), cmake (>= 2.8.5), libqt4-dev, pkg-kde-tools (>= 0.6) -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Section: libs Homepage: http://qjson.sourceforge.net/ diff -Nru qjson-0.7.1/debian/libqjson0.symbols qjson-0.7.1/debian/libqjson0.symbols --- qjson-0.7.1/debian/libqjson0.symbols 2011-09-09 23:35:22.000000000 -0300 +++ qjson-0.7.1/debian/libqjson0.symbols 2012-11-07 19:20:11.000000000 -0300 @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 0.7.1 amd64 +# SymbolsHelper-Confirmed: 0.7.1 amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc libqjson.so.0 libqjson0 #MINVER# _ZN5QJson10Serializer9serializeERK8QVariant@Base 0.7.1 _ZN5QJson10Serializer9serializeERK8QVariantP9QIODevicePb@Base 0.7.1 @@ -44,50 +44,61 @@ _ZNK5QJson18SerializerRunnable10metaObjectEv@Base 0.7.1 _ZNK5QJson6Parser11errorStringEv@Base 0.7.1 _ZNK5QJson6Parser9errorLineEv@Base 0.7.1 - (optional=templinst)_ZNSt11_Deque_baseI8QVariantSaIS0_EE17_M_initialize_mapEm@Base 0.7.1 - (optional=templinst)_ZNSt11_Deque_baseI8QVariantSaIS0_EED1Ev@Base 0.7.1 - (optional=templinst)_ZNSt11_Deque_baseI8QVariantSaIS0_EED2Ev@Base 0.7.1 - (optional=templinst)_ZNSt11_Deque_baseIN2yy8locationESaIS1_EE17_M_initialize_mapEm@Base 0.7.1 - (optional=templinst)_ZNSt11_Deque_baseIN2yy8locationESaIS1_EED1Ev@Base 0.7.1 - (optional=templinst)_ZNSt11_Deque_baseIN2yy8locationESaIS1_EED2Ev@Base 0.7.1 - (optional=templinst)_ZNSt11_Deque_baseIiSaIiEE17_M_initialize_mapEm@Base 0.7.1 + (optional=templinst|arch=hurd-i386)_ZNKSt15_Deque_iteratorIiRiPiEmiEi@Base 0.7.1 + (optional=templinst|arch=hurd-i386)_ZNKSt15_Deque_iteratorIiRiPiEplEi@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386|subst)_ZNSt11_Deque_baseI8QVariantSaIS0_EE17_M_initialize_mapE{size_t}@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386)_ZNSt11_Deque_baseI8QVariantSaIS0_EED1Ev@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386)_ZNSt11_Deque_baseI8QVariantSaIS0_EED2Ev@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386|subst)_ZNSt11_Deque_baseIN2yy8locationESaIS1_EE17_M_initialize_mapE{size_t}@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386)_ZNSt11_Deque_baseIN2yy8locationESaIS1_EED1Ev@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386)_ZNSt11_Deque_baseIN2yy8locationESaIS1_EED2Ev@Base 0.7.1 + (optional=templinst|subst)_ZNSt11_Deque_baseIiSaIiEE17_M_initialize_mapE{size_t}@Base 0.7.1 (optional=templinst)_ZNSt11_Deque_baseIiSaIiEED1Ev@Base 0.7.1 (optional=templinst)_ZNSt11_Deque_baseIiSaIiEED2Ev@Base 0.7.1 - (optional=templinst)_ZNSt15_Deque_iteratorI8QVariantRS0_PS0_EppEv@Base 0.7.1 - (optional=templinst)_ZNSt5dequeI8QVariantSaIS0_EE13_M_insert_auxISt15_Deque_iteratorIS0_RKS0_PS5_EEEvS4_IS0_RS0_PS0_ET_SC_m@Base 0.7.1 - (optional=templinst)_ZNSt5dequeI8QVariantSaIS0_EE17_M_push_front_auxERKS0_@Base 0.7.1 - (optional=templinst)_ZNSt5dequeI8QVariantSaIS0_EE17_M_reallocate_mapEmb@Base 0.7.1 - (optional=templinst)_ZNSt5dequeI8QVariantSaIS0_EE18_M_fill_initializeERKS0_@Base 0.7.1 - (optional=templinst)_ZNSt5dequeI8QVariantSaIS0_EE19_M_destroy_data_auxESt15_Deque_iteratorIS0_RS0_PS0_ES6_@Base 0.7.1 - (optional=templinst)_ZNSt5dequeI8QVariantSaIS0_EE19_M_range_insert_auxISt15_Deque_iteratorIS0_RKS0_PS5_EEEvS4_IS0_RS0_PS0_ET_SC_St20forward_iterator_tag@Base 0.7.1 - (optional=templinst)_ZNSt5dequeI8QVariantSaIS0_EE23_M_new_elements_at_backEm@Base 0.7.1 - (optional=templinst)_ZNSt5dequeI8QVariantSaIS0_EE24_M_new_elements_at_frontEm@Base 0.7.1 - (optional=templinst)_ZNSt5dequeI8QVariantSaIS0_EEaSERKS2_@Base 0.7.1 - (optional=templinst)_ZNSt5dequeIN2yy8locationESaIS1_EE13_M_insert_auxISt15_Deque_iteratorIS1_RKS1_PS6_EEEvS5_IS1_RS1_PS1_ET_SD_m@Base 0.7.1 - (optional=templinst)_ZNSt5dequeIN2yy8locationESaIS1_EE17_M_reallocate_mapEmb@Base 0.7.1 - (optional=templinst)_ZNSt5dequeIN2yy8locationESaIS1_EE19_M_range_insert_auxISt15_Deque_iteratorIS1_RKS1_PS6_EEEvS5_IS1_RS1_PS1_ET_SD_St20forward_iterator_tag@Base 0.7.1 - (optional=templinst)_ZNSt5dequeIN2yy8locationESaIS1_EE23_M_new_elements_at_backEm@Base 0.7.1 - (optional=templinst)_ZNSt5dequeIN2yy8locationESaIS1_EE24_M_new_elements_at_frontEm@Base 0.7.1 - (optional=templinst)_ZNSt5dequeIN2yy8locationESaIS1_EE28_M_reserve_elements_at_frontEm@Base 0.7.1 - (optional=templinst)_ZNSt5dequeIN2yy8locationESaIS1_EEaSERKS3_@Base 0.7.1 - (optional=templinst)_ZNSt5dequeIiSaIiEE13_M_insert_auxISt15_Deque_iteratorIiRKiPS4_EEEvS3_IiRiPiET_SB_m@Base 0.7.1 - (optional=templinst)_ZNSt5dequeIiSaIiEE17_M_reallocate_mapEmb@Base 0.7.1 - (optional=templinst)_ZNSt5dequeIiSaIiEE19_M_range_insert_auxISt15_Deque_iteratorIiRKiPS4_EEEvS3_IiRiPiET_SB_St20forward_iterator_tag@Base 0.7.1 - (optional=templinst)_ZNSt5dequeIiSaIiEE23_M_new_elements_at_backEm@Base 0.7.1 - (optional=templinst)_ZNSt5dequeIiSaIiEE24_M_new_elements_at_frontEm@Base 0.7.1 - (optional=templinst)_ZNSt5dequeIiSaIiEE28_M_reserve_elements_at_frontEm@Base 0.7.1 + (optional=templinst|arch=i386 kfreebsd-i386 powerpc s390 s390x)_ZNSt15_Deque_iteratorI8QVariantRS0_PS0_EppEv@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386|subst)_ZNSt5dequeI8QVariantSaIS0_EE13_M_insert_auxISt15_Deque_iteratorIS0_RKS0_PS5_EEEvS4_IS0_RS0_PS0_ET_SC_{size_t}@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386)_ZNSt5dequeI8QVariantSaIS0_EE17_M_push_front_auxERKS0_@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386|subst)_ZNSt5dequeI8QVariantSaIS0_EE17_M_reallocate_mapE{size_t}b@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386)_ZNSt5dequeI8QVariantSaIS0_EE18_M_fill_initializeERKS0_@Base 0.7.1 + (optional=templinst|arch=!amd64 !armel !armhf !hurd-i386)_ZNSt5dequeI8QVariantSaIS0_EE19_M_destroy_data_auxESt15_Deque_iteratorIS0_RS0_PS0_ES6_@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386)_ZNSt5dequeI8QVariantSaIS0_EE19_M_range_insert_auxISt15_Deque_iteratorIS0_RKS0_PS5_EEEvS4_IS0_RS0_PS0_ET_SC_St20forward_iterator_tag@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386|subst)_ZNSt5dequeI8QVariantSaIS0_EE23_M_new_elements_at_backE{size_t}@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386|subst)_ZNSt5dequeI8QVariantSaIS0_EE24_M_new_elements_at_frontE{size_t}@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386)_ZNSt5dequeI8QVariantSaIS0_EEaSERKS2_@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386|subst)_ZNSt5dequeIN2yy8locationESaIS1_EE13_M_insert_auxISt15_Deque_iteratorIS1_RKS1_PS6_EEEvS5_IS1_RS1_PS1_ET_SD_{size_t}@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386|subst)_ZNSt5dequeIN2yy8locationESaIS1_EE17_M_reallocate_mapE{size_t}b@Base 0.7.1 + (optional=templinst|arch=i386 kfreebsd-i386 mips mipsel)_ZNSt5dequeIN2yy8locationESaIS1_EE18_M_fill_initializeERKS1_@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386)_ZNSt5dequeIN2yy8locationESaIS1_EE19_M_range_insert_auxISt15_Deque_iteratorIS1_RKS1_PS6_EEEvS5_IS1_RS1_PS1_ET_SD_St20forward_iterator_tag@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386|subst)_ZNSt5dequeIN2yy8locationESaIS1_EE23_M_new_elements_at_backE{size_t}@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386|subst)_ZNSt5dequeIN2yy8locationESaIS1_EE24_M_new_elements_at_frontE{size_t}@Base 0.7.1 + (optional=templinst|arch=i386 kfreebsd-i386 powerpc s390x|subst)_ZNSt5dequeIN2yy8locationESaIS1_EE28_M_reserve_elements_at_frontE{size_t}@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386)_ZNSt5dequeIN2yy8locationESaIS1_EEaSERKS3_@Base 0.7.1 + (optional=templinst|subst)_ZNSt5dequeIiSaIiEE13_M_insert_auxISt15_Deque_iteratorIiRKiPS4_EEEvS3_IiRiPiET_SB_{size_t}@Base 0.7.1 + (optional=templinst|arch=amd64 hurd-i386)_ZNSt5dequeIiSaIiEE16_M_pop_front_auxEv@Base 0.7.1 + (optional=templinst|subst)_ZNSt5dequeIiSaIiEE17_M_reallocate_mapE{size_t}b@Base 0.7.1 + (optional=templinst|arch=amd64 hurd-i386)_ZNSt5dequeIiSaIiEE18_M_fill_initializeERKi@Base 0.7.1 + (optional=templinst|arch=!amd64)_ZNSt5dequeIiSaIiEE19_M_range_insert_auxISt15_Deque_iteratorIiRKiPS4_EEEvS3_IiRiPiET_SB_St20forward_iterator_tag@Base 0.7.1 + (optional=templinst|subst)_ZNSt5dequeIiSaIiEE23_M_new_elements_at_backE{size_t}@Base 0.7.1 + (optional=templinst|subst)_ZNSt5dequeIiSaIiEE24_M_new_elements_at_frontE{size_t}@Base 0.7.1 + (optional=templinst|arch=hurd-i386)_ZNSt5dequeIiSaIiEE27_M_reserve_elements_at_backEj@Base 0.7.1 + (optional=templinst|arch=amd64 hurd-i386 i386 kfreebsd-i386 powerpc s390x|subst)_ZNSt5dequeIiSaIiEE28_M_reserve_elements_at_frontE{size_t}@Base 0.7.1 (optional=templinst)_ZNSt5dequeIiSaIiEEaSERKS1_@Base 0.7.1 - (optional=templinst)_ZSt13copy_backwardI8QVariantESt15_Deque_iteratorIT_RS2_PS2_ES1_IS2_RKS2_PS6_ES9_S5_@Base 0.7.1 - (optional=templinst)_ZSt13copy_backwardIN2yy8locationEESt15_Deque_iteratorIT_RS3_PS3_ES2_IS3_RKS3_PS7_ESA_S6_@Base 0.7.1 - (optional=templinst)_ZSt13copy_backwardIiESt15_Deque_iteratorIT_RS1_PS1_ES0_IS1_RKS1_PS5_ES8_S4_@Base 0.7.1 - (optional=templinst)_ZSt22__uninitialized_copy_aISt15_Deque_iteratorI8QVariantRKS1_PS2_ES0_IS1_RS1_PS1_ES1_ET0_T_SA_S9_RSaIT1_E@Base 0.7.1 - (optional=templinst)_ZSt22__uninitialized_copy_aISt15_Deque_iteratorIiRKiPS1_ES0_IiRiPiEiET0_T_S9_S8_RSaIT1_E@Base 0.7.1 - (optional=templinst)_ZSt22__uninitialized_move_aISt15_Deque_iteratorI8QVariantRS1_PS1_ES4_SaIS1_EET0_T_S7_S6_RT1_@Base 0.7.1 - (optional=templinst)_ZSt22__uninitialized_move_aISt15_Deque_iteratorIN2yy8locationERS2_PS2_ES5_SaIS2_EET0_T_S8_S7_RT1_@Base 0.7.1 - (optional=templinst)_ZSt22__uninitialized_move_aISt15_Deque_iteratorIiRiPiES3_SaIiEET0_T_S6_S5_RT1_@Base 0.7.1 - (optional=templinst)_ZSt4copyI8QVariantESt15_Deque_iteratorIT_RS2_PS2_ES1_IS2_RKS2_PS6_ES9_S5_@Base 0.7.1 - (optional=templinst)_ZSt4copyIN2yy8locationEESt15_Deque_iteratorIT_RS3_PS3_ES2_IS3_RKS3_PS7_ESA_S6_@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386)_ZSt13copy_backwardI8QVariantESt15_Deque_iteratorIT_RS2_PS2_ES1_IS2_RKS2_PS6_ES9_S5_@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386)_ZSt13copy_backwardIN2yy8locationEESt15_Deque_iteratorIT_RS3_PS3_ES2_IS3_RKS3_PS7_ESA_S6_@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386)_ZSt13copy_backwardIiESt15_Deque_iteratorIT_RS1_PS1_ES0_IS1_RKS1_PS5_ES8_S4_@Base 0.7.1 + (optional=templinst|arch=hurd-i386)_ZSt13copy_backwardIiESt15_Deque_iteratorIT_RS1_PS1_ES4_S4_S4_@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386 !ia64 !sparc)_ZSt22__uninitialized_copy_aISt15_Deque_iteratorI8QVariantRKS1_PS2_ES0_IS1_RS1_PS1_ES1_ET0_T_SA_S9_RSaIT1_E@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386 !ia64 !s390 !sparc)_ZSt22__uninitialized_copy_aISt15_Deque_iteratorIiRKiPS1_ES0_IiRiPiEiET0_T_S9_S8_RSaIT1_E@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386 !ia64 !sparc)_ZSt22__uninitialized_move_aISt15_Deque_iteratorI8QVariantRS1_PS1_ES4_SaIS1_EET0_T_S7_S6_RT1_@Base 0.7.1 + (optional=templinst|arch=!amd64 !armel !armhf !hurd-i386 !ia64 !s390 !sparc)_ZSt22__uninitialized_move_aISt15_Deque_iteratorIN2yy8locationERS2_PS2_ES5_SaIS2_EET0_T_S8_S7_RT1_@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386 !ia64 !s390 !sparc)_ZSt22__uninitialized_move_aISt15_Deque_iteratorIiRiPiES3_SaIiEET0_T_S6_S5_RT1_@Base 0.7.1 + (optional=templinst|arch=hurd-i386)_ZSt25__uninitialized_copy_moveISt15_Deque_iteratorIiRKiPS1_ES0_IiRiPiES7_SaIiEET1_T_SA_T0_SB_S9_RT2_@Base 0.7.1 + (optional=templinst|arch=hurd-i386)_ZSt25__uninitialized_move_copyISt15_Deque_iteratorIiRiPiES0_IiRKiPS4_ES3_SaIiEET1_T_SA_T0_SB_S9_RT2_@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386)_ZSt4copyI8QVariantESt15_Deque_iteratorIT_RS2_PS2_ES1_IS2_RKS2_PS6_ES9_S5_@Base 0.7.1 + (optional=templinst|arch=!amd64 !hurd-i386)_ZSt4copyIN2yy8locationEESt15_Deque_iteratorIT_RS3_PS3_ES2_IS3_RKS3_PS7_ESA_S6_@Base 0.7.1 + (optional=templinst|arch=armel armhf powerpc s390x)_ZSt4copyISt15_Deque_iteratorIiRKiPS1_ES0_IiRiPiEET0_T_S9_S8_@Base 0.7.1 (optional=templinst)_ZSt4copyIiESt15_Deque_iteratorIT_RS1_PS1_ES0_IS1_RKS1_PS5_ES8_S4_@Base 0.7.1 + (optional=templinst|arch=armel armhf ia64 mips mipsel sparc)_ZSt8_DestroyISt15_Deque_iteratorI8QVariantRS1_PS1_EEvT_S5_@Base 0.7.1 _ZTIN5QJson14ParserRunnableE@Base 0.7.1 _ZTIN5QJson18SerializerRunnableE@Base 0.7.1 _ZTSN5QJson14ParserRunnableE@Base 0.7.1 diff -Nru qjson-0.7.1/debian/libqjson-dev.install qjson-0.7.1/debian/libqjson-dev.install --- qjson-0.7.1/debian/libqjson-dev.install 2011-07-28 17:35:24.000000000 -0300 +++ qjson-0.7.1/debian/libqjson-dev.install 2012-11-07 18:38:30.000000000 -0300 @@ -1,5 +1,4 @@ usr/include/* usr/lib/*/libqjson.so usr/lib/*/pkgconfig/* -usr/lib/*/cmake/qjson/qjson-config-version.cmake -usr/lib/*/cmake/qjson/qjson-config.cmake +usr/lib/*/cmake/qjson/* diff -Nru qjson-0.7.1/debian/patches/enable_multiarch.patch qjson-0.7.1/debian/patches/enable_multiarch.patch --- qjson-0.7.1/debian/patches/enable_multiarch.patch 2011-07-28 17:35:21.000000000 -0300 +++ qjson-0.7.1/debian/patches/enable_multiarch.patch 2012-11-07 18:58:37.000000000 -0300 @@ -5,19 +5,20 @@ Author: Lisandro Damián Nicanor Pérez Meyer <[email protected]> Forwarded: not-needed +Last-Update: 2012-11-07 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -37,7 +37,7 @@ +@@ -37,7 +37,7 @@ SET( QT_DONT_USE_QTGUI TRUE ) #add extra search paths for libraries and includes SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) -SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Directory where lib will install") +SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE STRING "Directory where lib will install") SET (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in") - SET (CMAKE_MODULES_INSTALL_DIR "${CMAKE_ROOT}/Modules" CACHE PATH "The directory to install FindQJSON.cmake to") + SET (CMAKECONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}" CACHE PATH "Directory where to install QJSONConfig.cmake") -@@ -56,7 +56,7 @@ +@@ -56,7 +56,7 @@ IF (NOT WIN32) ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc @ONLY) INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc @@ -26,12 +27,3 @@ ENDIF (NOT WIN32) # Include the cmake file needed to use qt4 -@@ -89,7 +89,7 @@ - @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/qjson-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/qjson-config-version.cmake -- DESTINATION "lib/cmake/qjson") -+ DESTINATION "lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/qjson") - - ADD_CUSTOM_TARGET(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") diff -Nru qjson-0.7.1/debian/patches/fix_cmake_variables.patch qjson-0.7.1/debian/patches/fix_cmake_variables.patch --- qjson-0.7.1/debian/patches/fix_cmake_variables.patch 1969-12-31 21:00:00.000000000 -0300 +++ qjson-0.7.1/debian/patches/fix_cmake_variables.patch 2012-11-07 19:02:07.000000000 -0300 @@ -0,0 +1,130 @@ +Subject: installs QJSONConfigVersion.cmake with correct naming. +Author: Ralf Jung <[email protected]> +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687537 +Forwarded: not-needed +Last-Update: 2012-11-07 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,7 +39,7 @@ SET( QT_DONT_USE_QTGUI TRUE ) + SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) + SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Directory where lib will install") + SET (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in") +-SET (CMAKE_MODULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/apps/cmake/modules" CACHE PATH "The directory to install FindQRpc.cmake to") ++SET (CMAKECONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}" CACHE PATH "Directory where to install QJSONConfig.cmake") + + + set(QJSON_LIB_MAJOR_VERSION "0") +@@ -69,13 +69,24 @@ IF (KDE4_BUILD_TESTS OR QJSON_BUILD_TEST + ADD_SUBDIRECTORY(tests) + ENDIF (KDE4_BUILD_TESTS OR QJSON_BUILD_TESTS) + +-add_subdirectory(cmake/modules) +- + + #CONFIGURE_FILE( + # "${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in" + # "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + # IMMEDIATE @ONLY) + ++INSTALL(EXPORT qjson-export DESTINATION ${CMAKECONFIG_INSTALL_DIR} FILE QJSONTargets.cmake) ++ ++# cmake-modules ++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/QJSONConfig.cmake.in ++ ${CMAKE_CURRENT_BINARY_DIR}/QJSONConfig.cmake ++ @ONLY) ++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/QJSONConfigVersion.cmake.in ++ ${CMAKE_CURRENT_BINARY_DIR}/QJSONConfigVersion.cmake ++ @ONLY) ++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/QJSONConfig.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/QJSONConfigVersion.cmake ++ DESTINATION "${CMAKECONFIG_INSTALL_DIR}") ++ + #ADD_CUSTOM_TARGET(uninstall + # "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") +--- /dev/null ++++ b/QJSONConfig.cmake.in +@@ -0,0 +1,6 @@ ++GET_FILENAME_COMPONENT(myDir ${CMAKE_CURRENT_LIST_FILE} PATH) ++ ++SET(QJSON_LIBRARIES qjson) ++SET(QJSON_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@") ++ ++include(${myDir}/QJSONTargets.cmake) +--- /dev/null ++++ b/QJSONConfigVersion.cmake.in +@@ -0,0 +1,9 @@ ++SET(PACKAGE_VERSION "@QJSON_LIB_VERSION_STRING@") ++IF (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION) ++ SET(PACKAGE_VERSION_EXACT TRUE) ++ENDIF (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION) ++IF (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION) ++ SET(PACKAGE_VERSION_COMPATIBLE TRUE) ++ELSE (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION) ++ SET(PACKAGE_VERSION_UNSUITABLE TRUE) ++ENDIF (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION) +--- a/cmake/modules/CMakeLists.txt ++++ /dev/null +@@ -1,2 +0,0 @@ +-set(cmakeFiles FindQJSON.cmake) +-install(FILES ${cmakeFiles} DESTINATION ${CMAKE_MODULES_INSTALL_DIR}) +--- a/cmake/modules/FindQJSON.cmake ++++ /dev/null +@@ -1,46 +0,0 @@ +-# Find QJSON - JSON handling library for Qt +-# +-# This module defines +-# QJSON_FOUND - whether the qsjon library was found +-# QJSON_LIBRARIES - the qjson library +-# QJSON_INCLUDE_DIR - the include path of the qjson library +-# +- +-if (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) +- +- # Already in cache +- set (QJSON_FOUND TRUE) +- +-else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) +- +- if (NOT WIN32) +- # use pkg-config to get the values of QJSON_INCLUDE_DIRS +- # and QJSON_LIBRARY_DIRS to add as hints to the find commands. +- include (FindPkgConfig) +- pkg_check_modules (QJSON REQUIRED QJson>=0.5) +- endif (NOT WIN32) +- +- find_library (QJSON_LIBRARIES +- NAMES +- qjson +- PATHS +- ${QJSON_LIBRARY_DIRS} +- ${LIB_INSTALL_DIR} +- ${KDE4_LIB_DIR} +- ) +- +- find_path (QJSON_INCLUDE_DIR +- NAMES +- parser.h +- PATH_SUFFIXES +- qjson +- PATHS +- ${QJSON_INCLUDE_DIRS} +- ${INCLUDE_INSTALL_DIR} +- ${KDE4_INCLUDE_DIR} +- ) +- +- include(FindPackageHandleStandardArgs) +- find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR) +- +-endif (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -35,7 +35,7 @@ set_target_properties(qjson PROPERTIES + DEFINE_SYMBOL QJSON_MAKEDLL + ) + +-INSTALL(TARGETS qjson ++INSTALL(TARGETS qjson EXPORT qjson-export + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION bin + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} diff -Nru qjson-0.7.1/debian/patches/install_cmake_config.patch qjson-0.7.1/debian/patches/install_cmake_config.patch --- qjson-0.7.1/debian/patches/install_cmake_config.patch 2011-06-12 15:43:57.000000000 -0300 +++ qjson-0.7.1/debian/patches/install_cmake_config.patch 1969-12-31 21:00:00.000000000 -0300 @@ -1,90 +0,0 @@ -Description: install a CMake config file. - This patch enables the creation of CMake's config files for - QJson. It has been taken from upstream's GIT, taking the difference between - tag 0.7.1 and master's commit 83c1323 of CMakeLists.txt. - It also adds qjson-config-version.cmake.in and qjson-config.cmake.in, - taken from the same commit mentioned above. -Author: Lisandro Damián Nicanor Pérez Meyer <[email protected]> -Bug-Debian: http://bugs.debian.org/628981 -Forwarded: not-needed - ---- /dev/null -+++ qjson-0.7.1/qjson-config-version.cmake.in -@@ -0,0 +1,9 @@ -+SET(PACKAGE_VERSION "@QJSON_LIB_VERSION_STRING@") -+IF (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION) -+ SET(PACKAGE_VERSION_EXACT "true") -+ENDIF (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION) -+IF (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION) -+ SET(PACKAGE_VERSION_COMPATIBLE "true") -+ELSE (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION) -+ SET(PACKAGE_VERSION_UNSUITABLE "true") -+ENDIF (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION) ---- /dev/null -+++ qjson-0.7.1/qjson-config.cmake.in -@@ -0,0 +1,3 @@ -+SET(@CMAKE_PROJECT_NAME@_LIBRARIES "@LIB_INSTALL_DIR@/@LIB_OUT_NAME@" CACHE FILEPATH "Libraries for @CMAKE_PROJECT_NAME@") -+SET(@CMAKE_PROJECT_NAME@_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@" CACHE PATH "Include path for @CMAKE_PROJECT_NAME@") -+SET(@CMAKE_PROJECT_NAME@_FOUND "TRUE") ---- qjson-0.7.1.orig/CMakeLists.txt -+++ qjson-0.7.1/CMakeLists.txt -@@ -39,7 +39,7 @@ SET( QT_DONT_USE_QTGUI TRUE ) - SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) - SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Directory where lib will install") - SET (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in") --SET (CMAKE_MODULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/apps/cmake/modules" CACHE PATH "The directory to install FindQRpc.cmake to") -+SET (CMAKE_MODULES_INSTALL_DIR "${CMAKE_ROOT}/Modules" CACHE PATH "The directory to install FindQJSON.cmake to") - - - set(QJSON_LIB_MAJOR_VERSION "0") -@@ -72,10 +72,24 @@ ENDIF (KDE4_BUILD_TESTS OR QJSON_BUILD_T - add_subdirectory(cmake/modules) - - --#CONFIGURE_FILE( --# "${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in" --# "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" --# IMMEDIATE @ONLY) -+CONFIGURE_FILE( -+ "${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" -+ IMMEDIATE @ONLY) -+ -+GET_TARGET_PROPERTY(LIB_OUT_NAME qjson LOCATION) -+GET_FILENAME_COMPONENT(LIB_OUT_NAME ${LIB_OUT_NAME} NAME) -+ -+# cmake-modules -+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/qjson-config.cmake.in -+ ${CMAKE_CURRENT_BINARY_DIR}/qjson-config.cmake -+ @ONLY) -+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/qjson-config-version.cmake.in -+ ${CMAKE_CURRENT_BINARY_DIR}/qjson-config-version.cmake -+ @ONLY) -+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/qjson-config.cmake -+ ${CMAKE_CURRENT_BINARY_DIR}/qjson-config-version.cmake -+ DESTINATION "lib/cmake/qjson") - --#ADD_CUSTOM_TARGET(uninstall --# "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") -+ADD_CUSTOM_TARGET(uninstall -+ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") ---- /dev/null -+++ qjson-0.7.1/cmake/modules/cmake_uninstall.cmake.in -@@ -0,0 +1,17 @@ -+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") -+ MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") -+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") -+ -+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) -+STRING(REGEX REPLACE "\n" ";" files "${files}") -+FOREACH(file ${files}) -+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"") -+ EXEC_PROGRAM( -+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" -+ OUTPUT_VARIABLE rm_out -+ RETURN_VALUE rm_retval -+ ) -+ IF(NOT "${rm_retval}" STREQUAL 0) -+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"") -+ ENDIF(NOT "${rm_retval}" STREQUAL 0) -+ENDFOREACH(file) diff -Nru qjson-0.7.1/debian/patches/series qjson-0.7.1/debian/patches/series --- qjson-0.7.1/debian/patches/series 2011-07-28 17:34:49.000000000 -0300 +++ qjson-0.7.1/debian/patches/series 2012-11-07 18:10:18.000000000 -0300 @@ -1,2 +1,2 @@ -install_cmake_config.patch +fix_cmake_variables.patch enable_multiarch.patch diff -Nru qjson-0.7.1/debian/source/lintian-overrides qjson-0.7.1/debian/source/lintian-overrides --- qjson-0.7.1/debian/source/lintian-overrides 2011-07-28 17:35:18.000000000 -0300 +++ qjson-0.7.1/debian/source/lintian-overrides 2012-11-07 19:23:56.000000000 -0300 @@ -1,5 +1,3 @@ # This is actually a transitional package, # tell lintian not to complain. qjson source: dbg-package-missing-depends libqjson0-dbg -# To enable multiarch support we must use compat 9, wich is experimental. -qjson source: package-needs-versioned-debhelper-build-depends 9 \ No hay ningún carácter de nueva línea al final del fichero
