Étienne Mollier pushed to branch master at Debian Med / civetweb


Commits:
7712763c by Étienne Mollier at 2023-07-23T18:58:47+02:00
d/libcivetweb1.symbols.amd64: update symbol table some more.

Changes include the marking of a couple of symbols leaked by g++ as
optional.

- - - - -
803d3120 by Étienne Mollier at 2023-07-23T19:15:09+02:00
d/rules: move pkgconfig files.

Their content is architecture specific, so they must relocate to an
architecture specific directory.

- - - - -
e2f4c0c4 by Étienne Mollier at 2023-07-23T19:31:39+02:00
ready for upload to unstable.

- - - - -


3 changed files:

- debian/changelog
- debian/libcivetweb1.symbols.amd64
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,6 @@
-civetweb (1.16+dfsg-1) UNRELEASED; urgency=medium
+civetweb (1.16+dfsg-1) unstable; urgency=medium
+
+  * Team upload.
 
   [ Sebastien Jodogne ]
   * Update symbols file (Closes: #1037603)
@@ -12,7 +14,13 @@ civetweb (1.16+dfsg-1) UNRELEASED; urgency=medium
   * Install pkgconfig files
   * Update symbols
 
- -- Andreas Tille <[email protected]>  Sat, 15 Jul 2023 16:18:38 +0200
+  [ Étienne Mollier ]
+  * d/libcivetweb1.symbols.amd64: update symbol table some more.  Changes
+    include the marking of a couple of symbols leaked by g++ as optional.
+  * d/rules: move pkgconfig files.  Their content is architecture specific, so
+    they must relocate to an architecture specific directory.
+
+ -- Étienne Mollier <[email protected]>  Sun, 23 Jul 2023 19:30:39 +0200
 
 civetweb (1.15+dfsg-4) unstable; urgency=medium
 


=====================================
debian/libcivetweb1.symbols.amd64
=====================================
@@ -61,10 +61,12 @@ libcivetweb-cpp.so.1 libcivetweb1 #MINVER#
  _ZN21CivetWebSocketHandlerD0Ev@Base 1.15
  _ZN21CivetWebSocketHandlerD1Ev@Base 1.15
  _ZN21CivetWebSocketHandlerD2Ev@Base 1.15
- _ZNSt12_Vector_baseIcSaIcEED1Ev@Base 1.16
- _ZNSt12_Vector_baseIcSaIcEED2Ev@Base 1.16
+ (optional)_ZNSt12_Vector_baseIcSaIcEED1Ev@Base 1.16
+ (optional)_ZNSt12_Vector_baseIcSaIcEED2Ev@Base 1.16
  _ZNSt6vectorIcSaIcEE17_M_default_appendEm@Base 1.15
  
_ZNSt6vectorIcSaIcEE17_M_realloc_insertIJcEEEvN9__gnu_cxx17__normal_iteratorIPcS1_EEDpOT_@Base
 1.16
+ (optional)_ZNSt6vectorIcSaIcEED1Ev@Base 1.16
+ (optional)_ZNSt6vectorIcSaIcEED2Ev@Base 1.16
  _ZTI11CivetServer@Base 1.15
  _ZTI12CivetHandler@Base 1.15
  _ZTI14CivetException@Base 1.15


=====================================
debian/rules
=====================================
@@ -26,3 +26,11 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
        cp -a /usr/share/javascript/jquery/jquery.min.js test/ajax/jquery.js
        dh_auto_test
 endif
+
+CIVETWEB_DEV_DIR = $(CURDIR)/debian/libcivetweb-dev
+execute_after_dh_install:
+       # Fix pkg-config-multi-arch-wrong-dir: pkgconfig files contain
+       # architecture specific information, so must be installed in an
+       # architecture specific location.
+       mv -v $(CIVETWEB_DEV_DIR)/usr/share/pkgconfig \
+               $(CIVETWEB_DEV_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/



View it on GitLab: 
https://salsa.debian.org/med-team/civetweb/-/compare/d096ad3b42e0e4975d1f02bf1ed18c4294e17d22...e2f4c0c426c5cc7afc9bb38d24b121b326396b85

-- 
View it on GitLab: 
https://salsa.debian.org/med-team/civetweb/-/compare/d096ad3b42e0e4975d1f02bf1ed18c4294e17d22...e2f4c0c426c5cc7afc9bb38d24b121b326396b85
You're receiving this email because of your account on salsa.debian.org.


_______________________________________________
debian-med-commit mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit

Reply via email to