Hi all,

I think flobopuyo is still a very good game and deserved to keep in bookworm. So I made a patch to fix this RC bug and plan to NMU.

Please see the attachment for the debdiff.

I'll upload it to delay/10 queue after 10 days if no one complains.

The changes are:
  * Non-maintainer upload.
  * Change source format to 3.0 (qulit)
    - Use quilt instead of simple-patchsys from cdbs.
  * Bump debhelper version to 9. (Closes: #965523)

Yours,
Paul

diff -Nru flobopuyo-0.20/debian/changelog flobopuyo-0.20/debian/changelog
--- flobopuyo-0.20/debian/changelog     2022-12-12 02:25:33.000000000 +0800
+++ flobopuyo-0.20/debian/changelog     2022-12-12 01:59:50.000000000 +0800
@@ -1,3 +1,12 @@
+flobopuyo (0.20-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Change source format to 3.0 (qulit)
+    - Use quilt instead of simple-patchsys from cdbs.
+  * Bump debhelper version to 9. (Closes: #965523)
+
+ -- Ying-Chun Liu (PaulLiu) <paul...@debian.org>  Mon, 12 Dec 2022 01:59:50 
+0800
+
 flobopuyo (0.20-5) unstable; urgency=low
 
   * Fix "FTBFS with binutils-gold" (Closes: #554359).
diff -Nru flobopuyo-0.20/debian/compat flobopuyo-0.20/debian/compat
--- flobopuyo-0.20/debian/compat        2022-12-12 02:25:33.000000000 +0800
+++ flobopuyo-0.20/debian/compat        2022-12-12 01:06:58.000000000 +0800
@@ -1 +1 @@
-5
+9
diff -Nru flobopuyo-0.20/debian/control flobopuyo-0.20/debian/control
--- flobopuyo-0.20/debian/control       2022-12-12 02:25:33.000000000 +0800
+++ flobopuyo-0.20/debian/control       2022-12-12 01:07:20.000000000 +0800
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: Uwe Hermann <u...@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), libsdl-image1.2-dev, 
libsdl-mixer1.2-dev, libsdl1.2-dev, flex, bison, sharutils
+Build-Depends: cdbs, debhelper (>= 9), libsdl-image1.2-dev, 
libsdl-mixer1.2-dev, libsdl1.2-dev, flex, bison, sharutils
 Standards-Version: 3.9.1
 Homepage: http://www.fovea.cc/flobopuyo-en
 
diff -Nru flobopuyo-0.20/debian/patches/20_makefile_prefix.patch 
flobopuyo-0.20/debian/patches/20_makefile_prefix.patch
--- flobopuyo-0.20/debian/patches/20_makefile_prefix.patch      2022-12-12 
02:25:33.000000000 +0800
+++ flobopuyo-0.20/debian/patches/20_makefile_prefix.patch      2022-12-12 
01:29:35.000000000 +0800
@@ -1,6 +1,8 @@
---- Makefile.orig      2008-04-15 13:54:47.000000000 +0200
-+++ Makefile   2008-04-15 13:58:35.000000000 +0200
-@@ -12,7 +12,7 @@
+Index: flobopuyo-0.20/Makefile
+===================================================================
+--- flobopuyo-0.20.orig/Makefile
++++ flobopuyo-0.20/Makefile
+@@ -12,7 +12,7 @@ ENABLE_DGA=false
  DEBUG_MODE=false
  
  # Unix/Linux settings
diff -Nru flobopuyo-0.20/debian/patches/30_datadir.patch 
flobopuyo-0.20/debian/patches/30_datadir.patch
--- flobopuyo-0.20/debian/patches/30_datadir.patch      2022-12-12 
02:25:33.000000000 +0800
+++ flobopuyo-0.20/debian/patches/30_datadir.patch      2022-12-12 
01:30:27.000000000 +0800
@@ -1,5 +1,7 @@
---- main.cpp.orig      2006-04-21 23:09:02.000000000 +0200
-+++ main.cpp   2006-04-21 23:09:20.000000000 +0200
+Index: flobopuyo-0.20/main.cpp
+===================================================================
+--- flobopuyo-0.20.orig/main.cpp
++++ flobopuyo-0.20/main.cpp
 @@ -7,7 +7,7 @@
  #include "PuyoCommander.h"
  
diff -Nru flobopuyo-0.20/debian/patches/50_handle_nostrip.patch 
flobopuyo-0.20/debian/patches/50_handle_nostrip.patch
--- flobopuyo-0.20/debian/patches/50_handle_nostrip.patch       2022-12-12 
02:25:33.000000000 +0800
+++ flobopuyo-0.20/debian/patches/50_handle_nostrip.patch       2022-12-12 
01:31:14.000000000 +0800
@@ -1,6 +1,8 @@
---- Makefile.orig      2008-04-15 16:43:36.000000000 +0200
-+++ Makefile   2008-04-15 16:43:42.000000000 +0200
-@@ -178,7 +178,6 @@
+Index: flobopuyo-0.20/Makefile
+===================================================================
+--- flobopuyo-0.20.orig/Makefile
++++ flobopuyo-0.20/Makefile
+@@ -178,7 +178,6 @@ clean:
        rm -f  .DS_Store */.DS_Store */*/.DS_Store .gdb_history
  
  install: flobopuyo
diff -Nru flobopuyo-0.20/debian/patches/80_fix_typo.patch 
flobopuyo-0.20/debian/patches/80_fix_typo.patch
--- flobopuyo-0.20/debian/patches/80_fix_typo.patch     2022-12-12 
02:25:33.000000000 +0800
+++ flobopuyo-0.20/debian/patches/80_fix_typo.patch     2022-12-12 
01:32:03.000000000 +0800
@@ -1,8 +1,10 @@
 Fix a typo to silence lintian.
 
---- sofont.c.orig      2011-03-13 22:55:42.000000000 +0100
-+++ sofont.c   2011-03-13 22:55:50.000000000 +0100
-@@ -291,7 +291,7 @@
+Index: flobopuyo-0.20/sofont.c
+===================================================================
+--- flobopuyo-0.20.orig/sofont.c
++++ flobopuyo-0.20/sofont.c
+@@ -291,7 +291,7 @@ SoFont_load (SoFont * font, IIM_Surface
        int     _Spacing[256];
  
        if (!FontSurface) {
diff -Nru flobopuyo-0.20/debian/patches/series 
flobopuyo-0.20/debian/patches/series
--- flobopuyo-0.20/debian/patches/series        1970-01-01 08:00:00.000000000 
+0800
+++ flobopuyo-0.20/debian/patches/series        2022-12-12 01:32:03.000000000 
+0800
@@ -0,0 +1,8 @@
+10_extra_qualification.patch
+20_makefile_prefix.patch
+30_datadir.patch
+40_build_fixes.patch
+50_handle_nostrip.patch
+60_set_window_title.patch
+70_fix_binutils_gold_error.patch
+80_fix_typo.patch
diff -Nru flobopuyo-0.20/debian/rules flobopuyo-0.20/debian/rules
--- flobopuyo-0.20/debian/rules 2022-12-12 02:25:33.000000000 +0800
+++ flobopuyo-0.20/debian/rules 2022-12-12 01:28:21.000000000 +0800
@@ -8,7 +8,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 binary-post-install/flobopuyo::
        cp debian/flobopuyo.desktop debian/flobopuyo/usr/share/applications
diff -Nru flobopuyo-0.20/debian/source/format 
flobopuyo-0.20/debian/source/format
--- flobopuyo-0.20/debian/source/format 1970-01-01 08:00:00.000000000 +0800
+++ flobopuyo-0.20/debian/source/format 2022-12-12 01:20:28.000000000 +0800
@@ -0,0 +1 @@
+3.0 (quilt)

Attachment: OpenPGP_0x44173FA13D058888.asc
Description: OpenPGP public key

Attachment: OpenPGP_signature
Description: OpenPGP digital signature

Reply via email to