Bug#701273: eris: diff for NMU version 1.3.21-0.1

Sat Aug 16 08:37:31 UTC 2014

Control: tags 701273 + patch
Control: tags 701273 + pending

Dear maintainer,

I've prepared an NMU for eris (versioned as 1.3.21-0.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

The NMU-diff is based on the current version in git.

Regards.

diff --git a/debian/changelog b/debian/changelog
index 31d499a..2fe94f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
-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.
+
+  [ Stephen M. Webb ]
   * new upstream release
   * debian/control: bumped build-dep versions for new WorldForge packages
   * renamed packages due to new SONAME
@@ -12,7 +17,7 @@ eris (1.3.21-1) unstable; urgency=low
       from source
   * debian/control: fixed Vcs-Browser URL
 
- -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Sun, 11 Aug 2013 17:26:33 -0400
+ -- Tobias Frost <tobi at debian.org>  Sat, 16 Aug 2014 07:10:01 +0000
 
 eris (1.3.19-5) unstable; urgency=low
 
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_ at Base 1.3.19
  _ZN4Eris10SpawnPointD1Ev at Base 1.3.19
  _ZN4Eris10SpawnPointD2Ev at Base 1.3.19
- _ZN4Eris10TimedEventD0Ev at Base 1.3.19
- _ZN4Eris10TimedEventD1Ev at Base 1.3.19
- _ZN4Eris10TimedEventD2Ev at Base 1.3.19
+ (optional=inline)_ZN4Eris10TimedEventD0Ev at Base 1.3.19
+ (optional=inline)_ZN4Eris10TimedEventD1Ev at Base 1.3.19
+ (optional=inline)_ZN4Eris10TimedEventD2Ev at Base 1.3.19
  _ZN4Eris10ViewEntity11onTaskAddedEPNS_4TaskE at Base 1.3.19
  _ZN4Eris10ViewEntity13onSoundActionERKN5Atlas7Objects8SmartPtrINS2_9Operation17RootOperationDataEEE at Base 1.3.19
  _ZN4Eris10ViewEntity19onVisibilityChangedEb at Base 1.3.19
@@ -280,9 +280,9 @@ liberis-1.3.so.20 liberis-1.3-20 #MINVER#
  _ZN4Eris4Poll12new_timeout_E at Base 1.3.19
  _ZN4Eris4Poll5_instE at Base 1.3.19
  _ZN4Eris4Poll8instanceEv at Base 1.3.19
- _ZN4Eris4PollD0Ev at Base 1.3.19
- _ZN4Eris4PollD1Ev at Base 1.3.19
- _ZN4Eris4PollD2Ev at Base 1.3.19
+ (optional=inline)_ZN4Eris4PollD0Ev at Base 1.3.19
+ (optional=inline)_ZN4Eris4PollD1Ev at Base 1.3.19
+ (optional=inline)_ZN4Eris4PollD2Ev at Base 1.3.19
  _ZN4Eris4Room10appearanceERKSs at Base 1.3.19
  _ZN4Eris4Room10checkEntryEv at Base 1.3.19
  _ZN4Eris4Room10createRoomERKSs at Base 1.3.19
@@ -508,9 +508,9 @@ liberis-1.3.so.20 liberis-1.3-20 #MINVER#
  _ZN4Eris8IGRouterD0Ev at Base 1.3.19
  _ZN4Eris8IGRouterD1Ev at Base 1.3.19
  _ZN4Eris8IGRouterD2Ev at Base 1.3.19
- _ZN4Eris8PollDataD0Ev at Base 1.3.19
- _ZN4Eris8PollDataD1Ev at Base 1.3.19
- _ZN4Eris8PollDataD2Ev at Base 1.3.19
+ (optional=inline)_ZN4Eris8PollDataD0Ev at Base 1.3.19
+ (optional=inline)_ZN4Eris8PollDataD1Ev at Base 1.3.19
+ (optional=inline)_ZN4Eris8PollDataD2Ev at Base 1.3.19
  _ZN4Eris8TypeInfo11addAncestorEPS0_ at Base 1.3.19
  _ZN4Eris8TypeInfo12setAttributeERKSsRKN5Atlas7Message7ElementE at Base 1.3.19
  _ZN4Eris8TypeInfo12validateBindEv at Base 1.3.19
@@ -908,7 +908,8 @@ liberis-1.3.so.20 liberis-1.3-20 #MINVER#
  _ZNSt5dequeISsSaISsEE16_M_push_back_auxERKSs at Base 1.3.19
  (regex|optional=inline)_ZNSt5dequeISsSaISsEE17_M_reallocate_mapE[mj]b at Base 1.3.19
  (optional=inline)_ZNSt5dequeISsSaISsEE19_M_destroy_data_auxESt15_Deque_iteratorISsRSsPSsES5_ at Base 1.3.19
- _ZNSt5dequeISsSaISsEE5eraseESt15_Deque_iteratorISsRSsPSsE at Base 1.3.19
+ (optional)_ZNSt5dequeISsSaISsEE5eraseESt15_Deque_iteratorISsRSsPSsE at Base 1.3.19
+ (optional)_ZNSt5dequeISsSaISsEE8_M_eraseESt15_Deque_iteratorISsRSsPSsE at Base 1.3.21
  (regex|optional=inline)_ZNSt5dequeISsSaISsEED[12]Ev at Base 1.3.19
  _ZNSt6vectorIN4Eris10ServerInfoESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_ at 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_ at Base 1.3.19
  _ZNSt8_Rb_treeIPN4Eris9MetaQueryES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E at Base 1.3.19
  (optional=gcc-4.7)_ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE10_M_insert_EPKSt18_Rb_tree_node_baseS8_RKSs at Base 1.3.19
+ (optional)_ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE10_M_insert_EPSt18_Rb_tree_node_baseS7_RKSs at Base 1.3.21
  (optional=inline)_ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE11equal_rangeERKSs at Base 1.3.19
  (optional=gcc-4.7)_ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE12_M_erase_auxESt23_Rb_tree_const_iteratorISsES7_ at Base 1.3.19
- _ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE16_M_insert_uniqueERKSs at Base 1.3.19
+ (optional)_ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE16_M_insert_uniqueERKSs at Base 1.3.19
  (optional=inline)_ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE16_M_insert_uniqueISt20_List_const_iteratorISsEEEvT_S9_ at Base 1.3.19
  (optional=gcc-4.7)_ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE17_M_insert_unique_ESt23_Rb_tree_const_iteratorISsERKSs at Base 1.3.19
  (optional=gcc-4.8)_ZNSt8_Rb_treeISsSsSt9_IdentityISsESt4lessISsESaISsEE24_M_get_insert_unique_posERKSs at Base 1.3.21
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

