Control: tags 1019810 + patch

Dear maintainer,

I've prepared an NMU for golly (versioned as 3.3-1.1) and
uploaded it to unstable as per the NMU guidelines in the devref:

https://www.debian.org/doc/manuals/developers-reference/pkgs.html#nmu-guidelines

The package built with wxWidgets 3.2 without changes, and seems to run
without problems (I tried to exercise all the windows and dialogs I
could find).

Cheers,
    Olly
diff -Nru golly-3.3/debian/changelog golly-3.3/debian/changelog
--- golly-3.3/debian/changelog	2019-12-02 13:40:25.000000000 +1300
+++ golly-3.3/debian/changelog	2022-11-26 08:12:59.000000000 +1300
@@ -1,3 +1,11 @@
+golly (3.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control: Switch to use wxwidgets3.2 (Closes: #1019810)
+  * Drop patch 0005-wxwidgets-inmature-yet.patch which is no longer required.
+
+ -- Olly Betts <o...@survex.com>  Sat, 26 Nov 2022 08:12:59 +1300
+
 golly (3.3-1) unstable; urgency=medium
 
   * New upstream.
diff -Nru golly-3.3/debian/control golly-3.3/debian/control
--- golly-3.3/debian/control	2019-12-02 13:40:25.000000000 +1300
+++ golly-3.3/debian/control	2022-11-26 07:12:30.000000000 +1300
@@ -2,8 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: NIIBE Yutaka <gni...@fsij.org>
-Build-Conflicts: libwxgtk2.6-dev
-Build-Depends: debhelper-compat (= 12), libwxgtk3.0-gtk3-dev, perl, libperl-dev, zlib1g-dev, dh-lua
+Build-Depends: debhelper-compat (= 12), libwxgtk3.2-dev, perl, libperl-dev, zlib1g-dev, dh-lua
 Standards-Version: 4.4.1
 Homepage: http://golly.sourceforge.net/
 Vcs-Git: https://salsa.debian.org/debian/golly.git
diff -Nru golly-3.3/debian/patches/0005-wxwidgets-inmature-yet.patch golly-3.3/debian/patches/0005-wxwidgets-inmature-yet.patch
--- golly-3.3/debian/patches/0005-wxwidgets-inmature-yet.patch	2019-12-02 13:40:25.000000000 +1300
+++ golly-3.3/debian/patches/0005-wxwidgets-inmature-yet.patch	1970-01-01 12:00:00.000000000 +1200
@@ -1,21 +0,0 @@
-Description: Add -D__WX_GTK20__ until wxWidgets will be fixed
-Author: NIIBE Yutaka <gni...@fsij.org>
-Last-Update: 2019-12-02
-
-Index: golly/gui-wx/configure/m4/wxwin.m4
-===================================================================
---- golly.orig/gui-wx/configure/m4/wxwin.m4
-+++ golly/gui-wx/configure/m4/wxwin.m4
-@@ -295,9 +295,9 @@ AC_DEFUN([WX_CONFIG_CHECK],
-          WX_CXXFLAGS_ONLY=$WX_CFLAGS
-       else
-          dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS
--         WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags $4`
--         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags $4`
--         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4`
-+         WX_CPPFLAGS="`$WX_CONFIG_WITH_ARGS --cppflags $4` -D__WXGTK20__"
-+         WX_CXXFLAGS="`$WX_CONFIG_WITH_ARGS --cxxflags $4` -D__WXGTK20__"
-+         WX_CFLAGS="`$WX_CONFIG_WITH_ARGS --cflags $4`  -D__WXGTK20__"
- 
-          WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
-          WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
diff -Nru golly-3.3/debian/patches/series golly-3.3/debian/patches/series
--- golly-3.3/debian/patches/series	2019-12-02 13:40:25.000000000 +1300
+++ golly-3.3/debian/patches/series	2022-11-26 07:15:15.000000000 +1300
@@ -1,5 +1,4 @@
 0001-Build-Add-libs.patch
 0002-dont-include-tilda-files.patch
 # 0003-automake-subdir-obj.patch
-0005-wxwidgets-inmature-yet.patch
 0006-python2-support-removal.patch

Reply via email to