This is the right diff... (Overlooked one versioned dependency on wfmath in the -dev package)
diff --git a/debian/changelog b/debian/changelog index 31d499a..f3472e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,11 @@ -eris (1.3.21-1) unstable; urgency=low +eris (1.3.21-0.1) unstable; urgency=low + [ Tobias Frost ] + * Non-maintainer upload. + * Fixing symbol file for liberis. + * Adding patch remove silent-rules. + + [ Stephen M. Webb ] * new upstream release * debian/control: bumped build-dep versions for new WorldForge packages * renamed packages due to new SONAME @@ -12,7 +18,7 @@ eris (1.3.21-1) unstable; urgency=low from source * debian/control: fixed Vcs-Browser URL - -- Stephen M. Webb <stephen.w...@bregmasoft.ca> Sun, 11 Aug 2013 17:26:33 -0400 + -- Tobias Frost <t...@debian.org> Sat, 16 Aug 2014 07:10:01 +0000 eris (1.3.19-5) unstable; urgency=low diff --git a/debian/control b/debian/control index a2d9b1f..68f3017 100644 --- a/debian/control +++ b/debian/control @@ -56,7 +56,7 @@ Depends: libatlas-cpp-0.6-dev (>= 0.6.2), libglib2.0-dev, libsigc++-2.0-dev, libskstream-0.3-dev (>= 0.3.8), - libwfmath-0.3-dev (>= 0.3.11), + libwfmath-1.0-dev, ${misc:Depends} Description: WorldForge client entity library - development files Eris is designed to simplify client development (and avoid repeating the diff --git a/debian/liberis-1.3-20.symbols b/debian/liberis-1.3-20.symbols index 9bb067a..4d75ddf 100644 --- a/debian/liberis-1.3-20.symbols +++ b/debian/liberis-1.3-20.symbols @@ -47,9 +47,9 @@ liberis-1.3.so.20 liberis-1.3-20 #MINVER# _ZN4Eris10SpawnPointC2ERKSsRKSt6vectorINS_13CharacterTypeESaIS4_EES2_@Base 1.3.19 _ZN4Eris10SpawnPointD1Ev@Base 1.3.19 _ZN4Eris10SpawnPointD2Ev@Base 1.3.19 - _ZN4Eris10TimedEventD0Ev@Base 1.3.19 - _ZN4Eris10TimedEventD1Ev@Base 1.3.19 - _ZN4Eris10TimedEventD2Ev@Base 1.3.19 + (optional=inline)_ZN4Eris10TimedEventD0Ev@Base 1.3.19 + (optional=inline)_ZN4Eris10TimedEventD1Ev@Base 1.3.19 + (optional=inline)_ZN4Eris10TimedEventD2Ev@Base 1.3.19 _ZN4Eris10ViewEntity11onTaskAddedEPNS_4TaskE@Base 1.3.19 _ZN4Eris10ViewEntity13onSoundActionERKN5Atlas7Objects8SmartPtrINS2_9Operation17RootOperationDataEEE@Base 1.3.19 _ZN4Eris10ViewEntity19onVisibilityChangedEb@Base 1.3.19 @@ -280,9 +280,9 @@ liberis-1.3.so.20 liberis-1.3-20 #MINVER# _ZN4Eris4Poll12new_timeout_E@Base 1.3.19 _ZN4Eris4Poll5_instE@Base 1.3.19 _ZN4Eris4Poll8instanceEv@Base 1.3.19 - _ZN4Eris4PollD0Ev@Base 1.3.19 - _ZN4Eris4PollD1Ev@Base 1.3.19 - _ZN4Eris4PollD2Ev@Base 1.3.19 + (optional=inline)_ZN4Eris4PollD0Ev@Base 1.3.19 + (optional=inline)_ZN4Eris4PollD1Ev@Base 1.3.19 + (optional=inline)_ZN4Eris4PollD2Ev@Base 1.3.19 _ZN4Eris4Room10appearanceERKSs@Base 1.3.19 _ZN4Eris4Room10checkEntryEv@Base 1.3.19 _ZN4Eris4Room10createRoomERKSs@Base 1.3.19 @@ -508,9 +508,9 @@ liberis-1.3.so.20 liberis-1.3-20 #MINVER# _ZN4Eris8IGRouterD0Ev@Base 1.3.19 _ZN4Eris8IGRouterD1Ev@Base 1.3.19 _ZN4Eris8IGRouterD2Ev@Base 1.3.19 - _ZN4Eris8PollDataD0Ev@Base 1.3.19 - _ZN4Eris8PollDataD1Ev@Base 1.3.19 - _ZN4Eris8PollDataD2Ev@Base 1.3.19 + (optional=inline)_ZN4Eris8PollDataD0Ev@Base 1.3.19 + (optional=inline)_ZN4Eris8PollDataD1Ev@Base 1.3.19 + (optional=inline)_ZN4Eris8PollDataD2Ev@Base 1.3.19 _ZN4Eris8TypeInfo11addAncestorEPS0_@Base 1.3.19 _ZN4Eris8TypeInfo12setAttributeERKSsRKN5Atlas7Message7ElementE@Base 1.3.19 _ZN4Eris8TypeInfo12validateBindEv@Base 1.3.19 @@ -908,7 +908,8 @@ liberis-1.3.so.20 liberis-1.3-20 #MINVER# _ZNSt5dequeISsSaISsEE16_M_push_back_auxERKSs@Base 1.3.19 (regex|optional=inline)_ZNSt5dequeISsSaISsEE17_M_reallocate_mapE[mj]b@Base 1.3.19 (optional=inline)_ZNSt5dequeISsSaISsEE19_M_destroy_data_auxESt15_Deque_iteratorISsRSsPSsES5_@Base 1.3.19 - _ZNSt5dequeISsSaISsEE5eraseESt15_Deque_iteratorISsRSsPSsE@Base 1.3.19 + (optional)_ZNSt5dequeISsSaISsEE5eraseESt15_Deque_iteratorISsRSsPSsE@Base 1.3.19 + (optional)_ZNSt5dequeISsSaISsEE8_M_eraseESt15_Deque_iteratorISsRSsPSsE@Base 1.3.21 (regex|optional=inline)_ZNSt5dequeISsSaISsEED[12]Ev@Base 1.3.19 _ZNSt6vectorIN4Eris10ServerInfoESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 1.3.19 (regex)_ZNSt6vectorIN4Eris10ServerInfoESaIS1_EE7reserveE[mj]@Base 1.3.19 @@ -981,9 +982,10 @@ liberis-1.3.so.20 liberis-1.3-20 #MINVER# (optional=inline)_ZNSt8_Rb_treeIPN4Eris9MetaQueryES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE5eraseERKS2_@Base 1.3.19 _ZNSt8_Rb_treeIPN4Eris9MetaQueryES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 1.3.19 (optional=gcc-4.7)_ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE10_M_insert_EPKSt18_Rb_tree_node_baseS8_RKSs@Base 1.3.19 + (optional)_ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE10_M_insert_EPSt18_Rb_tree_node_baseS7_RKSs@Base 1.3.21 (optional=inline)_ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE11equal_rangeERKSs@Base 1.3.19 (optional=gcc-4.7)_ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE12_M_erase_auxESt23_Rb_tree_const_iteratorISsES7_@Base 1.3.19 - _ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE16_M_insert_uniqueERKSs@Base 1.3.19 + (optional)_ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE16_M_insert_uniqueERKSs@Base 1.3.19 (optional=inline)_ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE16_M_insert_uniqueISt20_List_const_iteratorISsEEEvT_S9_@Base 1.3.19 (optional=gcc-4.7)_ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE17_M_insert_unique_ESt23_Rb_tree_const_iteratorISsERKSs@Base 1.3.19 (optional=gcc-4.8)_ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE24_M_get_insert_unique_posERKSs@Base 1.3.21 diff --git a/debian/patches/01-disable-silent-rules.patch b/debian/patches/01-disable-silent-rules.patch new file mode 100644 index 0000000..58e0475 --- /dev/null +++ b/debian/patches/01-disable-silent-rules.patch @@ -0,0 +1,18 @@ +Description: Patch autoconf to use non-silent rules +Author: Tobias Frost <t...@deiban.org> +Forwarded: not-needed +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/configure.ac ++++ b/configure.ac +@@ -11,8 +11,8 @@ + + dnl Automake setup + +-AM_INIT_AUTOMAKE([nostdinc dist-bzip2 color-tests parallel-tests no-define silent-rules]) +-AM_SILENT_RULES([yes]) ++AM_INIT_AUTOMAKE([nostdinc dist-bzip2 color-tests parallel-tests no-define]) ++#AM_SILENT_RULES([yes]) + + dnl versioning info for libtool + ERIS_CURRENT=20 diff --git a/debian/patches/series b/debian/patches/series index 23c5e0e..75dbc5b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +01-disable-silent-rules.patch 0001-bump-mercator-builddep.patch
signature.asc
Description: This is a digitally signed message part