I am uploading a LowNMU to DELAYED/10 fix this. The debdiff is attached.
diff -Nru icheck-0.9.7/ChangeLog icheck-0.9.7/ChangeLog
--- icheck-0.9.7/ChangeLog      2023-06-12 14:32:45.000000000 +0200
+++ icheck-0.9.7/ChangeLog      2005-08-01 19:28:55.000000000 +0200
@@ -2,46 +2,6 @@
 # arch-tag: 
[email protected]/icheck--main--0
 #
 
-2005-10-10 03:04:53 GMT        Andrew Suffield <[email protected]>  patch-46
-
-    Summary:
-      fix stupid makefile
-    Revision:
-      icheck--main--0--patch-46
-
-
-    modified files:
-     ChangeLog Makefile
-
-
-2005-08-15 16:32:43 GMT        Andrew Suffield <[email protected]>  patch-45
-
-    Summary:
-      fix test update
-    Revision:
-      icheck--main--0--patch-45
-
-
-    removed files:
-     t/04_align/.arch-ids/result.compare.id
-     t/04_align/result.compare
-
-    modified files:
-     ChangeLog
-
-
-2005-08-15 16:29:34 GMT        Andrew Suffield <[email protected]>  patch-44
-
-    Summary:
-      forget it, alignment and size diffs will never work with these tests
-    Revision:
-      icheck--main--0--patch-44
-
-
-    modified files:
-     ChangeLog NEWS t/04_align/diff t/04_align/original
-
-
 2005-08-01 17:27:22 GMT        Andrew Suffield <[email protected]>  patch-43
 
     Summary:
diff -Nru icheck-0.9.7/CParse/String.pm icheck-0.9.7/CParse/String.pm
--- icheck-0.9.7/CParse/String.pm       2023-06-12 14:32:45.000000000 +0200
+++ icheck-0.9.7/CParse/String.pm       2005-07-31 19:21:16.000000000 +0200
@@ -23,7 +23,7 @@
     $str =~ s/\r/\\r/g;
     $str =~ s/\t/\\t/g;
     $str =~ s/\0x0b/\\v/g;
-    $str =~ s/([^[:print:]])/sprintf "\\x%x", ord($1)/ge;
+    $str =~ s/([^[:print]])/sprintf "\\x%x", ord($1)/ge;
     return $str;
   }
 
diff -Nru icheck-0.9.7/debian/changelog icheck-0.9.7/debian/changelog
--- icheck-0.9.7/debian/changelog       2023-06-12 14:32:45.000000000 +0200
+++ icheck-0.9.7/debian/changelog       2023-06-12 14:22:25.000000000 +0200
@@ -1,3 +1,10 @@
+icheck (0.9.7-6.5) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Convert to 3.0 (quilt) source format.
+
+ -- Bastian Germann <[email protected]>  Mon, 12 Jun 2023 14:22:25 +0200
+
 icheck (0.9.7-6.4) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru icheck-0.9.7/debian/patches/debian.patch 
icheck-0.9.7/debian/patches/debian.patch
--- icheck-0.9.7/debian/patches/debian.patch    1970-01-01 01:00:00.000000000 
+0100
+++ icheck-0.9.7/debian/patches/debian.patch    2023-06-12 14:22:25.000000000 
+0200
@@ -0,0 +1,128 @@
+Description: Debian patches before the source format conversion
+---
+--- icheck-0.9.7.orig/CParse/String.pm
++++ icheck-0.9.7/CParse/String.pm
+@@ -23,7 +23,7 @@ sub escape
+     $str =~ s/\r/\\r/g;
+     $str =~ s/\t/\\t/g;
+     $str =~ s/\0x0b/\\v/g;
+-    $str =~ s/([^[:print]])/sprintf "\\x%x", ord($1)/ge;
++    $str =~ s/([^[:print:]])/sprintf "\\x%x", ord($1)/ge;
+     return $str;
+   }
+ 
+--- icheck-0.9.7.orig/ChangeLog
++++ icheck-0.9.7/ChangeLog
+@@ -2,6 +2,46 @@
+ # arch-tag: 
[email protected]/icheck--main--0
+ #
+ 
++2005-10-10 03:04:53 GMT       Andrew Suffield <[email protected]>  patch-46
++
++    Summary:
++      fix stupid makefile
++    Revision:
++      icheck--main--0--patch-46
++
++
++    modified files:
++     ChangeLog Makefile
++
++
++2005-08-15 16:32:43 GMT       Andrew Suffield <[email protected]>  patch-45
++
++    Summary:
++      fix test update
++    Revision:
++      icheck--main--0--patch-45
++
++
++    removed files:
++     t/04_align/.arch-ids/result.compare.id
++     t/04_align/result.compare
++
++    modified files:
++     ChangeLog
++
++
++2005-08-15 16:29:34 GMT       Andrew Suffield <[email protected]>  patch-44
++
++    Summary:
++      forget it, alignment and size diffs will never work with these tests
++    Revision:
++      icheck--main--0--patch-44
++
++
++    modified files:
++     ChangeLog NEWS t/04_align/diff t/04_align/original
++
++
+ 2005-08-01 17:27:22 GMT       Andrew Suffield <[email protected]>  patch-43
+ 
+     Summary:
+--- icheck-0.9.7.orig/Makefile
++++ icheck-0.9.7/Makefile
+@@ -164,6 +164,7 @@ INSTALL_perl_FILES = \
+       CType/Pointer.pm \
+       CType/Ref.pm \
+       CType/Struct.pm \
++      CType/Structural.pm \
+       CType/Union.pm
+ 
+ INSTALL_arch_perl_FILES = CType/Native.pm
+@@ -204,5 +205,5 @@ CType/Native.pm: typegen
+       mv CType/Native.pm.new CType/Native.pm
+ 
+ parser-perlxs:
+-      (cd ext/CParse-Parser-PerlXS && perl Makefile.PL 
INSTALLSITELIB=$(DESTDIR)$(prefix)/share/icheck/perl5/ 
INSTALLSITEARCH=$(DESTDIR)$(prefix)/lib/icheck/perl5 OPTIMIZE="-O2 -Wall -g")
++      (cd ext/CParse-Parser-PerlXS && perl Makefile.PL INSTALLDIRS=vendor 
INSTALLVENDORLIB=$(prefix)/share/icheck/perl5 
INSTALLVENDORARCH=$(prefix)/lib/icheck/perl5 OPTIMIZE="-O2 -Wall -g")
+       $(MAKE) -C ext/CParse-Parser-PerlXS
+--- icheck-0.9.7.orig/NEWS
++++ icheck-0.9.7/NEWS
+@@ -1,5 +1,10 @@
+ Hey, emacs! This is a -*- text -*- file
+ 
++icheck 0.9.7
++------------
++
++* Bugfix release
++
+ icheck 0.9.6
+ ------------
+ 
+--- icheck-0.9.7.orig/ext/CParse-Parser-PerlXS/PerlXS.xs
++++ icheck-0.9.7/ext/CParse-Parser-PerlXS/PerlXS.xs
+@@ -1718,11 +1718,11 @@ try_direct_declarator_array_suffix (SV *
+   if (try_parse(self, punctuator, "*"))
+     croak("Unhandled foo[*] construct");
+ 
+-  bool restrict = false;
++  bool is_restrict = false;
+   SV *expr = &PL_sv_undef;
+   if (try_parse(self, type_qualifier, "restrict"))
+     {
+-      restrict = true;
++      is_restrict = true;
+     }
+   else
+     {
+@@ -1732,7 +1732,7 @@ try_direct_declarator_array_suffix (SV *
+   if (!try_parse(self, punctuator, "]"))
+     return NULL;
+ 
+-  return new_obj2("CParse::Declarator::Array", expr ? expr : &PL_sv_undef, 
restrict ? sv_2mortal(newSViv(1)) : &PL_sv_undef);
++  return new_obj2("CParse::Declarator::Array", expr ? expr : &PL_sv_undef, 
is_restrict ? sv_2mortal(newSViv(1)) : &PL_sv_undef);
+ }
+ 
+ static SV *
+--- icheck-0.9.7.orig/t/04_align/original
++++ icheck-0.9.7/t/04_align/original
+@@ -12,7 +12,7 @@ union foo11;
+ enum foo12;
+ enum foo13;
+ # 1 "t/04_align/source/foo.c"
+-struct __attribute__((aligned(17))) foo1
++struct __attribute__((aligned(__alignof__(int)))) foo1
+   {
+     int a;
+     char b;
diff -Nru icheck-0.9.7/debian/patches/series icheck-0.9.7/debian/patches/series
--- icheck-0.9.7/debian/patches/series  1970-01-01 01:00:00.000000000 +0100
+++ icheck-0.9.7/debian/patches/series  2023-06-12 14:22:25.000000000 +0200
@@ -0,0 +1 @@
+debian.patch
diff -Nru icheck-0.9.7/debian/source/format icheck-0.9.7/debian/source/format
--- icheck-0.9.7/debian/source/format   1970-01-01 01:00:00.000000000 +0100
+++ icheck-0.9.7/debian/source/format   2023-06-12 14:22:25.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru icheck-0.9.7/ext/CParse-Parser-PerlXS/PerlXS.xs 
icheck-0.9.7/ext/CParse-Parser-PerlXS/PerlXS.xs
--- icheck-0.9.7/ext/CParse-Parser-PerlXS/PerlXS.xs     2023-06-12 
14:32:45.000000000 +0200
+++ icheck-0.9.7/ext/CParse-Parser-PerlXS/PerlXS.xs     2005-07-31 
19:21:45.000000000 +0200
@@ -1718,11 +1718,11 @@
   if (try_parse(self, punctuator, "*"))
     croak("Unhandled foo[*] construct");
 
-  bool is_restrict = false;
+  bool restrict = false;
   SV *expr = &PL_sv_undef;
   if (try_parse(self, type_qualifier, "restrict"))
     {
-      is_restrict = true;
+      restrict = true;
     }
   else
     {
@@ -1732,7 +1732,7 @@
   if (!try_parse(self, punctuator, "]"))
     return NULL;
 
-  return new_obj2("CParse::Declarator::Array", expr ? expr : &PL_sv_undef, 
is_restrict ? sv_2mortal(newSViv(1)) : &PL_sv_undef);
+  return new_obj2("CParse::Declarator::Array", expr ? expr : &PL_sv_undef, 
restrict ? sv_2mortal(newSViv(1)) : &PL_sv_undef);
 }
 
 static SV *
diff -Nru icheck-0.9.7/Makefile icheck-0.9.7/Makefile
--- icheck-0.9.7/Makefile       2023-06-12 14:32:45.000000000 +0200
+++ icheck-0.9.7/Makefile       2005-08-01 03:11:40.000000000 +0200
@@ -164,7 +164,6 @@
        CType/Pointer.pm \
        CType/Ref.pm \
        CType/Struct.pm \
-       CType/Structural.pm \
        CType/Union.pm
 
 INSTALL_arch_perl_FILES = CType/Native.pm
@@ -205,5 +204,5 @@
        mv CType/Native.pm.new CType/Native.pm
 
 parser-perlxs:
-       (cd ext/CParse-Parser-PerlXS && perl Makefile.PL INSTALLDIRS=vendor 
INSTALLVENDORLIB=$(prefix)/share/icheck/perl5 
INSTALLVENDORARCH=$(prefix)/lib/icheck/perl5 OPTIMIZE="-O2 -Wall -g")
+       (cd ext/CParse-Parser-PerlXS && perl Makefile.PL 
INSTALLSITELIB=$(DESTDIR)$(prefix)/share/icheck/perl5/ 
INSTALLSITEARCH=$(DESTDIR)$(prefix)/lib/icheck/perl5 OPTIMIZE="-O2 -Wall -g")
        $(MAKE) -C ext/CParse-Parser-PerlXS
diff -Nru icheck-0.9.7/NEWS icheck-0.9.7/NEWS
--- icheck-0.9.7/NEWS   2023-06-12 14:32:45.000000000 +0200
+++ icheck-0.9.7/NEWS   2005-08-01 02:54:09.000000000 +0200
@@ -1,10 +1,5 @@
 Hey, emacs! This is a -*- text -*- file
 
-icheck 0.9.7
-------------
-
-* Bugfix release
-
 icheck 0.9.6
 ------------
 
diff -Nru icheck-0.9.7/t/04_align/diff icheck-0.9.7/t/04_align/diff
--- icheck-0.9.7/t/04_align/diff        2023-06-12 14:32:45.000000000 +0200
+++ icheck-0.9.7/t/04_align/diff        2005-08-01 19:28:55.000000000 +0200
@@ -0,0 +1,16 @@
+ABI mismatch: size of 64 versus 136
+ABI mismatch: alignment of 32 versus 136
+ in type defined at t/04_align/source/foo.c:1:
+struct __attribute__((aligned(__alignof__(int)))) foo1
+  {
+    int a;
+    char b;
+  };
+ versus type defined at t/04_align/source/foo.c:1:
+struct __attribute__((aligned(17), aligned(__alignof__(int)))) foo1
+  {
+    int a;
+    char b;
+  };
+
+ABI is not compatible
diff -Nru icheck-0.9.7/t/04_align/original icheck-0.9.7/t/04_align/original
--- icheck-0.9.7/t/04_align/original    2023-06-12 14:32:45.000000000 +0200
+++ icheck-0.9.7/t/04_align/original    2005-08-01 19:28:55.000000000 +0200
@@ -12,7 +12,7 @@
 enum foo12;
 enum foo13;
 # 1 "t/04_align/source/foo.c"
-struct __attribute__((aligned(__alignof__(int)))) foo1
+struct __attribute__((aligned(17))) foo1
   {
     int a;
     char b;

Reply via email to