[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1023423: bullseye-pu: package pysubnettree/0.33-1



Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: 1005044@bugs.debian.org


[ Reason ]
Package is totally broken in Bullseye (see #1005044) and this fixes it.

[ Impact ]
Package remains unusable

[ Tests ]
None in this version.  For unstable, I wrote an autopkgtest to detect if
this issue happens again, but did not include it here to keep thing
compact.  I did manually replicate the problem on the current bullseye
version of the package and then repeat the process with the update to
verify the problem is corrected.

[ Risks ]
None.  Package can't get more useless than it is currently.  Fix is
pretty trivial anyway.  The problem was that (me being an idiot) managed
to get one file used in the build process from upstream (swig 3) and one
from the Debian build (swig 4) and that did not go well.

[ Checklist ]
  [*] *all* changes are documented in the d/changelog
  [*] I reviewed all changes and I approve them
  [*] attach debdiff against the package in (old)stable
  [*] the issue is verified as fixed in unstable

[ Changes ]
This is a swig package.  To make sure that the package can be built from
source, it has long moved SubnetTree_wrap.cc aside to force a rebuild.
Unfortunately, I then put it back meanging that the pacakge got built
with the upstream SubnetTree_wrap.cc and the SubnetTree.py from the
rebuild.  This was all fine until we switched to Swig 4 and they were no
longer compatible.

The update moves them both aside (and puts them back in clean so we
leave the package like we found it) and doesn't put SubnetTree_wrap.cc
back during the build so that both rebuilt files are used in the build.
Also, fixed a minor error in clean, for completeness.

[ Other info ]
The identical fix is in Unstable in 0.36.1.
diff -Nru pysubnettree-0.33/debian/changelog pysubnettree-0.33/debian/changelog
--- pysubnettree-0.33/debian/changelog	2020-02-15 15:59:24.000000000 -0500
+++ pysubnettree-0.33/debian/changelog	2022-11-03 16:09:00.000000000 -0400
@@ -1,3 +1,11 @@
+pysubnettree (0.33-1+deb11u1) bullseye; urgency=medium
+
+  * Fix moving/copying files in debian/rules so as not to leave a mix of
+    rebuilt and non-rebuilt files in the binary and update clean rule
+    (Closes: #1005044)
+
+ -- Scott Kitterman <scott@kitterman.com>  Thu, 03 Nov 2022 16:09:00 -0400
+
 pysubnettree (0.33-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru pysubnettree-0.33/debian/rules pysubnettree-0.33/debian/rules
--- pysubnettree-0.33/debian/rules	2020-02-15 12:28:51.000000000 -0500
+++ pysubnettree-0.33/debian/rules	2022-11-03 16:07:10.000000000 -0400
@@ -7,9 +7,9 @@
 	dh $@ --with python3
 
 override_dh_auto_build:
-	mv $(CURDIR)/SubnetTree_wrap.cc $(CURDIR)/not.SubnetTree_wrap.cc
+	mv -n $(CURDIR)/SubnetTree_wrap.cc $(CURDIR)/not.SubnetTree_wrap.cc
+	mv -n $(CURDIR)/SubnetTree.py $(CURDIR)/not.SubnetTree.py
 	dh_auto_build
-	mv $(CURDIR)/not.SubnetTree_wrap.cc $(CURDIR)/SubnetTree_wrap.cc
 
 override_dh_auto_install:
 	dh_install -ppython3-subnettree
@@ -20,8 +20,9 @@
 override_dh_clean:
 	dh_clean
 	-cp -f $(CURDIR)/not.SubnetTree_wrap.cc $(CURDIR)/SubnetTree_wrap.cc
-	rm -f $(CURDIR)/not.SubnetTree_wrap.cc
-	rm -rf $(CURDIR)/build
+	-cp -f $(CURDIR)/not.SubnetTree.py $(CURDIR)/SubnetTree.py
+	rm -f $(CURDIR)/not.SubnetTree*
+	rm -rf $(CURDIR)/__pycache__
 
 override_dh_auto_test:
 	:

Reply to: