Run of fresh-releases for pamix

Merge these changes:

git pull https://janitor.debian.net/git/pamix fresh-releases/main
git pull https://janitor.debian.net/git/pamix fresh-releases/pristine-tar
git pull https://janitor.debian.net/git/pamix fresh-releases/upstream

Summary

Merged new upstream version: 1.6 (was: 1.6~git20180112.ea4ab3b).

Diff

Branch: main

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2886c90..38605f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,18 +17,15 @@ file(GLOB_RECURSE pamix_SRC
 include_directories("include")
 link_libraries("pulse" "pthread")
 
-find_package(PkgConfig REQUIRED QUIET)
 IF (WITH_UNICODE)
-    pkg_search_module(NCURSESW REQUIRED ncursesw)
-    link_libraries(${NCURSESW_LDFLAGS})
+    link_libraries("ncursesw")
     add_definitions(-DFEAT_UNICODE)
 ELSE ()
-    pkg_search_module(NCURSES REQUIRED ncurses)
-    link_libraries(${NCURSES_LDFLAGS})
+    link_libraries("ncurses")
 ENDIF ()
 
 add_executable(pamix ${pamix_SRC})
-install(FILES pamix.conf DESTINATION /etc/xdg)
+install(FILES pamix.conf DESTINATION /etc)
 install(TARGETS pamix DESTINATION bin)
 install(FILES man/pamix.1 DESTINATION share/man/man1)
 
diff --git a/README.md b/README.md
index 9543109..8061e17 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,6 @@
 1. [**Installation**](#installation)
 	1. Gentoo
 	2. Arch
-	3. openSUSE
 2. [**Building Manually**](#building-manually)
 	1. Dependencies
 	2. Building and Installing
@@ -21,9 +20,6 @@
 ### Arch ###
 `yaourt -S pamix-git`
 
-### openSUSE ###
-`zypper in pamix`
-
 # Building Manually: #
 ## Dependencies: #
 
@@ -31,7 +27,6 @@ In order for CMake to properly inject the current version into the headers and m
 
 ### Build ##
 * cmake
-* pkg-config
 
 ### Runtime ##
 * PulseAudio
diff --git a/debian/changelog b/debian/changelog
index da7af88..7dd9acb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pamix (1.6-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 14 Mar 2022 03:20:07 -0000
+
 pamix (1.6~git20180112.ea4ab3b-4) unstable; urgency=medium
 
   * Add patch to fix FTBFS error due to missing format arguments passed to
diff --git a/debian/patches/00-fix-man-syntax.patch b/debian/patches/00-fix-man-syntax.patch
index 8bd4165..9f8d2fe 100644
--- a/debian/patches/00-fix-man-syntax.patch
+++ b/debian/patches/00-fix-man-syntax.patch
@@ -3,8 +3,10 @@ Author: Josue Ortega <josue@debian.org>
 Last-Update: 2018-03-30
 Forwarded: not-needed
 
---- a/man/pamix.1.in
-+++ b/man/pamix.1.in
+Index: pamix/man/pamix.1.in
+===================================================================
+--- pamix.orig/man/pamix.1.in
++++ pamix/man/pamix.1.in
 @@ -1,6 +1,9 @@
 -.\" this is the manpage of the pamix pulseaudio ncurses mixer
 +\" this is the manpage of the pamix pulseaudio ncurses mixer
@@ -16,7 +18,7 @@ Forwarded: not-needed
  .SH SYNOPSIS
  .\" Commandline arguments
  .B pamix
-@@ -19,7 +22,6 @@
+@@ -19,7 +22,6 @@ pamix is configured using a file called
  .br
  $XDG_CONFIG_HOME will be preferred over $XDG_CONFIG_DIRS.
  .br
@@ -24,7 +26,7 @@ Forwarded: not-needed
  .SH COMMANDS
  .PP
  PAmix conf files support the following commands:
-@@ -138,7 +140,6 @@
+@@ -138,7 +140,6 @@ and takes no arguments.
  .SH set\-mute
  .PP
  works like the set\-lock mixer\-command, but sets weather the currently selected entry is muted or not
diff --git a/debian/patches/01-fix-string-literal.patch b/debian/patches/01-fix-string-literal.patch
index c2810d0..00924e9 100644
--- a/debian/patches/01-fix-string-literal.patch
+++ b/debian/patches/01-fix-string-literal.patch
@@ -4,9 +4,11 @@ Bug-Debian: https://bugs.debian.org/995979
 Forwarded: not-needed
 Last-Update: 2021-11-01
 
---- a/src/pamix_ui.cpp
-+++ b/src/pamix_ui.cpp
-@@ -103,7 +103,7 @@
+Index: pamix/src/pamix_ui.cpp
+===================================================================
+--- pamix.orig/src/pamix_ui.cpp
++++ pamix/src/pamix_ui.cpp
+@@ -111,7 +111,7 @@ void pamix_ui::redrawAll() {
  		string_maxlen_pct(applicationName, 0.4);
  		if (isSelectedEntry)
  			attron(A_STANDOUT);
@@ -15,7 +17,7 @@ Last-Update: 2021-11-01
  		attroff(A_STANDOUT);
  
  		bool isMuted = entry->m_Mute || averageVolume == PA_VOLUME_MUTED;
-@@ -121,7 +121,7 @@
+@@ -129,7 +129,7 @@ void pamix_ui::redrawAll() {
  			remainingChars -= displayName.length();
  		}
  
diff --git a/src/pamix.cpp b/src/pamix.cpp
index d5f7ead..3ea2730 100644
--- a/src/pamix.cpp
+++ b/src/pamix.cpp
@@ -130,7 +130,7 @@ void loadConfiguration() {
 
 	char *xdg_config_dirs = getenv("XDG_CONFIG_DIRS");
 
-	path = xdg_config_dirs ? xdg_config_dirs : "/etc/xdg";
+	path = xdg_config_dirs ? xdg_config_dirs : "/etc";
 	path += "/pamix.conf";
 	size_t cpos = path.find(':');
 	while (cpos != std::string::npos) {
diff --git a/src/pamix_ui.cpp b/src/pamix_ui.cpp
index 16a2e34..ed2d65e 100644
--- a/src/pamix_ui.cpp
+++ b/src/pamix_ui.cpp
@@ -1,5 +1,13 @@
 #include <pamix_ui.hpp>
 
+#ifdef FEAT_UNICODE
+
+#include <ncursesw/ncurses.h>
+
+#else
+#include <ncurses.h>
+#endif
+
 #include <pamix.hpp>
 
 void pamix_ui::reset() {

Branch: pristine-tar

diff --git a/pamix_1.6.orig.tar.gz.delta b/pamix_1.6.orig.tar.gz.delta
index a1e2f3b..9eebfaa 100644
Binary files a/pamix_1.6.orig.tar.gz.delta and b/pamix_1.6.orig.tar.gz.delta differ

Branch: upstream

Tag: upstream/1.6
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2886c90..38605f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,18 +17,15 @@ file(GLOB_RECURSE pamix_SRC
 include_directories("include")
 link_libraries("pulse" "pthread")
 
-find_package(PkgConfig REQUIRED QUIET)
 IF (WITH_UNICODE)
-    pkg_search_module(NCURSESW REQUIRED ncursesw)
-    link_libraries(${NCURSESW_LDFLAGS})
+    link_libraries("ncursesw")
     add_definitions(-DFEAT_UNICODE)
 ELSE ()
-    pkg_search_module(NCURSES REQUIRED ncurses)
-    link_libraries(${NCURSES_LDFLAGS})
+    link_libraries("ncurses")
 ENDIF ()
 
 add_executable(pamix ${pamix_SRC})
-install(FILES pamix.conf DESTINATION /etc/xdg)
+install(FILES pamix.conf DESTINATION /etc)
 install(TARGETS pamix DESTINATION bin)
 install(FILES man/pamix.1 DESTINATION share/man/man1)
 
diff --git a/README.md b/README.md
index 9543109..8061e17 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,6 @@
 1. [**Installation**](#installation)
 	1. Gentoo
 	2. Arch
-	3. openSUSE
 2. [**Building Manually**](#building-manually)
 	1. Dependencies
 	2. Building and Installing
@@ -21,9 +20,6 @@
 ### Arch ###
 `yaourt -S pamix-git`
 
-### openSUSE ###
-`zypper in pamix`
-
 # Building Manually: #
 ## Dependencies: #
 
@@ -31,7 +27,6 @@ In order for CMake to properly inject the current version into the headers and m
 
 ### Build ##
 * cmake
-* pkg-config
 
 ### Runtime ##
 * PulseAudio
diff --git a/src/pamix.cpp b/src/pamix.cpp
index d5f7ead..3ea2730 100644
--- a/src/pamix.cpp
+++ b/src/pamix.cpp
@@ -130,7 +130,7 @@ void loadConfiguration() {
 
 	char *xdg_config_dirs = getenv("XDG_CONFIG_DIRS");
 
-	path = xdg_config_dirs ? xdg_config_dirs : "/etc/xdg";
+	path = xdg_config_dirs ? xdg_config_dirs : "/etc";
 	path += "/pamix.conf";
 	size_t cpos = path.find(':');
 	while (cpos != std::string::npos) {
diff --git a/src/pamix_ui.cpp b/src/pamix_ui.cpp
index 16a2e34..ed2d65e 100644
--- a/src/pamix_ui.cpp
+++ b/src/pamix_ui.cpp
@@ -1,5 +1,13 @@
 #include <pamix_ui.hpp>
 
+#ifdef FEAT_UNICODE
+
+#include <ncursesw/ncurses.h>
+
+#else
+#include <ncurses.h>
+#endif
+
 #include <pamix.hpp>
 
 void pamix_ui::reset() {

Publish Blockers

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-releases pamix-dbgsymapt install -t fresh-releases pamix

Lintian Result

Full worker log Full build log