[med-svn] [Git][med-team/libcereal][master] some patches don't need forwarding upstream.

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / libcereal


Commits:
5604b008 by Michael R. Crusoe at 2021-01-13T10:15:51+01:00
some patches don't need forwarding upstream.

- - - - -


4 changed files:

- debian/changelog
- debian/patches/drop-google-analytics
- debian/patches/reproducible-doxygen
- debian/patches/use_debian_packaged_rapidjson.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
 libcereal (1.3.0+dfsg-1) UNRELEASED; urgency=medium
 
+  [ Andreas Tille ]
   * Team upload.
   * Standards-Version: 4.5.1 (routine-update)
   * debhelper-compat 13 (routine-update)
@@ -10,6 +11,10 @@ libcereal (1.3.0+dfsg-1) UNRELEASED; urgency=medium
   * install cmake file
   * Remove code copy of rapidjson and use Debian packaged code instead
 
+  [ Michael R. Crusoe ]
+  * debian/patches/{reproducible-doxygen,drop-google-analytics}:
+    doesn't need forwarding upstream.
+
  -- Andreas Tille <tille at debian.org>  Sat, 05 Dec 2020 17:12:21 +0100
 
 libcereal (1.3.0-3) unstable; urgency=medium


=====================================
debian/patches/drop-google-analytics
=====================================
@@ -1,4 +1,6 @@
 Description: Drop google analytics
+Author: Michael R. Crusoe <crusoe at debian.org>
+Forwarded: not-needed
 --- libcereal.orig/doc/footer.html
 +++ libcereal/doc/footer.html
 @@ -17,15 +17,5 @@


=====================================
debian/patches/reproducible-doxygen
=====================================
@@ -1,6 +1,6 @@
-From: Michael R. Crusoe <michael.crusoe at gmail.com>
+From: Michael R. Crusoe <crusoe at debian.org>
 Subject: Make doxygen docs reproducible
-
+Forwarded: not-needed
 --- libcereal.orig/doc/doxygen.in
 +++ libcereal/doc/doxygen.in
 @@ -119,7 +119,7 @@
@@ -17,7 +17,7 @@ Subject: Make doxygen docs reproducible
  # started.
  
 -STRIP_FROM_PATH        =
-+STRIP_FROM_PATH        = @CMAKE_CURRENT_SOURCE_DIR@
++STRIP_FROM_PATH        = @PROJECT_SOURCE_DIR@
  
  # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
  # the path mentioned in the documentation of a class, which tells


=====================================
debian/patches/use_debian_packaged_rapidjson.patch
=====================================
@@ -2,7 +2,7 @@ Author: Andreas Tille <tille at debian.org>
 Last-Update: Sat, 05 Dec 2020 17:12:21 +0100
 Bug-Debian: https://bugs.debian.org/976585
 Description: Include Debian packaged rapidjson
-
+Forwarded: not-needed
 --- a/include/cereal/archives/json.hpp
 +++ b/include/cereal/archives/json.hpp
 @@ -41,30 +41,30 @@ namespace cereal



View it on GitLab: https://salsa.debian.org/med-team/libcereal/-/commit/5604b00854ac1bb8adf1cafcffc69290f7b9b3c9

-- 
View it on GitLab: https://salsa.debian.org/med-team/libcereal/-/commit/5604b00854ac1bb8adf1cafcffc69290f7b9b3c9
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210113/47322469/attachment-0001.html>