[Pkg-privacy-commits] [Git][pkg-privacy-team/hexchat-otr][master] 8 commits: Updated debhelper compat level from 9 to 12.

Petter Reinholdtsen pere at debian.org
Wed Aug 12 09:35:44 BST 2020 


Petter Reinholdtsen pushed to branch master at Privacy Maintainers / hexchat-otr


Commits:
87099aef by Petter Reinholdtsen at 2020-08-12T10:03:07+02:00
Updated debhelper compat level from 9 to 12.

- - - - -
2d037faa by Petter Reinholdtsen at 2020-08-12T10:04:22+02:00
Document build status using 'Rules-Requires-Root: no'.

- - - - -
f892f2c4 by Petter Reinholdtsen at 2020-08-12T10:05:24+02:00
Use canonical Vcs links.

- - - - -
a0c1f4d7 by Petter Reinholdtsen at 2020-08-12T10:08:07+02:00
Updated Standards-Version from 4.2.1 to 4.5.0.

- - - - -
15521b0b by Petter Reinholdtsen at 2020-08-12T10:09:18+02:00
Changed hexchat dependency to enhances to better reflect the relation.

- - - - -
0efb82e6 by Petter Reinholdtsen at 2020-08-12T10:12:02+02:00
Added 'Multi-Arch: same' to document the state of the package.

- - - - -
7f5560ec by Petter Reinholdtsen at 2020-08-12T10:25:07+02:00
Fix GCC 10 build problem.

New patch fetched from upstream.  Adjusted 1000-prototypes.patch to get
it to apply on top of this new upstream patch.

Closes: #957330

- - - - -
072f2eb1 by Petter Reinholdtsen at 2020-08-12T10:33:39+02:00
releasing package hexchat-otr version 0.2.2-3

- - - - -


7 changed files:

- debian/changelog
- debian/compat
- debian/control
- + debian/patches/0010-enum-lvls.patch
- debian/patches/1000-prototypes.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+hexchat-otr (0.2.2-3) unstable; urgency=medium
+
+  * Updated debhelper compat level from 9 to 12.
+  * Document build status using 'Rules-Requires-Root: no'.
+  * Use canonical Vcs links.
+  * Updated Standards-Version from 4.2.1 to 4.5.0.
+  * Changed hexchat dependency to enhances to better reflect the relation.
+  * Added 'Multi-Arch: same' to document the state of the package.
+  * Fix GCC 10 build problem using upstream patch (Closes: #957330).
+
+ -- Petter Reinholdtsen <pere at debian.org>  Wed, 12 Aug 2020 10:33:18 +0200
+
 hexchat-otr (0.2.2-2) unstable; urgency=medium
 
   * Changed Vcs-* links in d/control.


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-9
+12


=====================================
debian/control
=====================================
@@ -4,22 +4,23 @@ Priority: optional
 Maintainer: Debian Privacy Tools Maintainers <pkg-privacy-maintainers at lists.alioth.debian.org>
 Uploaders:
  Petter Reinholdtsen <pere at debian.org>
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 12)
  , libotr5-dev
  , hexchat-dev
  , pkg-config
  , libglib2.0-dev
- , dh-autoreconf
  , autoconf-archive
-Standards-Version: 4.2.1
+Standards-Version: 4.5.0
 Homepage: https://github.com/TingPing/hexchat-otr
-Vcs-Browser: https://salsa.debian.org/pkg-privacy-team/hexchat-otr
-Vcs-Git: https://salsa.debian.org/pkg-privacy-team/hexchat-otr
+Vcs-Browser: https://salsa.debian.org/pkg-privacy-team/hexchat-otr.git
+Vcs-Git: https://salsa.debian.org/pkg-privacy-team/hexchat-otr.git
+Rules-Requires-Root: no
 
 Package: hexchat-otr
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
- , hexchat
+Enhances: hexchat
+Multi-Arch: same
 Description: hexchat plugin to support Off The Record (OTR)
  A plugin for the IRC client hexchat to support Off The Record (OTR)
  conversations.


=====================================
debian/patches/0010-enum-lvls.patch
=====================================
@@ -0,0 +1,67 @@
+Description: Fix GCC 10 build problem
+ Make sure only one lvls symbol is defined in the binary.
+ .
+ This patch combine two upstream commits reflecting the final code
+ added to upstream.
+Author: Andrew Cagney <cagney at gnu.org>
+Origin: https://github.com/TingPing/hexchat-otr/commit/d87484724ae1dfa49cc963351e07ec96d4e705b9
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/957330
+Reviewed-By: Petter Reinholdtsen <pere at debian.org>
+Last-Update: 2020-08-12
+
+Index: hexchat-otr-alioth/src/hexchat_otr.c
+===================================================================
+--- hexchat-otr-alioth.orig/src/hexchat_otr.c	2020-08-12 10:18:00.080111221 +0200
++++ hexchat-otr-alioth/src/hexchat_otr.c	2020-08-12 10:18:00.076111164 +0200
+@@ -337,12 +337,12 @@
+ 	return 1;
+ }
+ 
+-void otr_log(IRC_CTX *server, const char *nick, int level, const char *format, ...)
++void otr_log(IRC_CTX *server, const char *nick, MessageLevel level, const char *format, ...)
+ {
+ 	/* TODO: Implement me! */
+ }
+ 
+-void printformat (IRC_CTX *ircctx, const char *nick, int lvl, int fnum, ...)
++void printformat (IRC_CTX *ircctx, const char *nick, MessageLevel lvl, int fnum, ...)
+ {
+ 	va_list params;
+ 	va_start (params, fnum);
+Index: hexchat-otr-alioth/src/hexchat_otr.h
+===================================================================
+--- hexchat-otr-alioth.orig/src/hexchat_otr.h	2020-08-12 10:18:00.080111221 +0200
++++ hexchat-otr-alioth/src/hexchat_otr.h	2020-08-12 10:18:48.108797093 +0200
+@@ -51,15 +51,15 @@
+ 
+ typedef struct _FORMAT_REC FORMAT_REC;
+ 
+-enum
++typedef enum
+ {
+ 	MSGLEVEL_CRAP,
+ 	MSGLEVEL_MSGS
+-} lvls;
++} MessageLevel;
+ 
+ extern hexchat_plugin *ph; /* plugin handle */
+ 
+-void printformat (IRC_CTX *ircctx, const char *nick, int lvl, int fnum, ...);
++void printformat (IRC_CTX *ircctx, const char *nick, MessageLevel lvl, int fnum, ...);
+ 
+ #define otr_noticest(formatnum, ...) \
+ 	printformat (NULL, NULL, MSGLEVEL_MSGS, formatnum, ##__VA_ARGS__)
+Index: hexchat-otr-alioth/src/otr.h
+===================================================================
+--- hexchat-otr-alioth.orig/src/otr.h	2020-08-12 10:18:00.080111221 +0200
++++ hexchat-otr-alioth/src/otr.h	2020-08-12 10:18:00.076111164 +0200
+@@ -49,7 +49,7 @@
+ 	otr_log (NULL, NULL, level, format, ##__VA_ARGS__)
+ 
+ void otr_log (IRC_CTX *server, const char *to,
+-			  int level, const char *format, ...);
++	      MessageLevel level, const char *format, ...);
+ 
+ /* own */
+ 


=====================================
debian/patches/1000-prototypes.patch
=====================================
@@ -20,6 +20,6 @@ Last-Update: 2018-10-24
 +                         char *arg);
 +void hexchat_plugin_get_info (char **name, char **desc, char **version, void **reserved);
 +
- void printformat (IRC_CTX *ircctx, const char *nick, int lvl, int fnum, ...);
+ void printformat (IRC_CTX *ircctx, const char *nick, MessageLevel lvl, int fnum, ...);
  
  #define otr_noticest(formatnum, ...) \


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
+0010-enum-lvls.patch
 1000-prototypes.patch


=====================================
debian/rules
=====================================
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with autoreconf
+	dh $@
 
 override_dh_auto_install:
 	dh_auto_install



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/hexchat-otr/-/compare/23b04aba5a2b423313dda53181ee506245b855e0...072f2eb1bfcdb9eaa9a5392c8e5ced5908b59598

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/hexchat-otr/-/compare/23b04aba5a2b423313dda53181ee506245b855e0...072f2eb1bfcdb9eaa9a5392c8e5ced5908b59598
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/pkg-privacy-commits/attachments/20200812/4d883252/attachment-0001.html>

More information about the Pkg-privacy-commits mailing list