[med-svn] [Git][med-team/sprai][master] 2 commits: Migrate from WAF to plain Makefile

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / sprai


Commits:
59eac1a1 by Antoni Villalonga at 2020-04-10T06:54:19+02:00
Migrate from WAF to plain Makefile

- - - - -
ea3b9da2 by Andreas Tille at 2020-04-10T07:57:48+00:00
Merge branch 'fix-943280-makefile' into 'master'

Migrate from WAF to plain Makefile

See merge request med-team/sprai!2
- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/makefile.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,27 +1,16 @@
 sprai (0.9.9.23+dfsg-3) UNRELEASED; urgency=medium
 
+  [ Andreas Tille ]
   * Afif removed himself from Uploaders
   * Added myself to Uploaders
-  * Use 2to3 to port from Python2 to Python3
-    Closes: #943280
   * debhelper-compat 12
   * Standards-Version: 4.4.1
   * debian/copyright: use spaces rather than tabs to start continuation
     lines.
-  TODO:
-    ./waf -vvv distclean
-    Waf: The wscript in '/home/andreas/debian-maintain/salsa/med-team/build-area/sprai-0.9.9.23+dfsg' is unreadable
-    Traceback (most recent call last):
-      File "/home/andreas/debian-maintain/salsa/med-team/build-area/sprai-0.9.9.23+dfsg/waflib/Scripting.py", line 87, in waf_entry_point
-        set_main_module(Context.run_dir+os.sep+Context.WSCRIPT_FILE)
-      File "/home/andreas/debian-maintain/salsa/med-team/build-area/sprai-0.9.9.23+dfsg/waflib/Scripting.py", line 112, in set_main_module
-        Context.g_module=Context.load_module(file_path)
-      File "/home/andreas/debian-maintain/salsa/med-team/build-area/sprai-0.9.9.23+dfsg/waflib/Context.py", line 281, in load_module
-        exec(compile(code,path,'exec'),module.__dict__)
-      File "/home/andreas/debian-maintain/salsa/med-team/build-area/sprai-0.9.9.23+dfsg/wscript", line 56
-        ], chmod=0755)
-                    ^
-    SyntaxError: invalid token
+
+  [ Antoni Villalonga ]
+  * Migrate from WAF to plain Makefile
+    Closes: #943280
 
  -- Andreas Tille <tille at debian.org>  Wed, 25 Dec 2019 08:31:51 +0100
 


=====================================
debian/control
=====================================
@@ -3,8 +3,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper-compat (= 12),
-               python3
+Build-Depends: debhelper-compat (= 12)
 Standards-Version: 4.4.1
 Vcs-Browser: https://salsa.debian.org/med-team/sprai
 Vcs-Git: https://salsa.debian.org/med-team/sprai.git


=====================================
debian/patches/makefile.patch
=====================================
@@ -0,0 +1,18 @@
+--- a/makefile
++++ b/makefile
+@@ -1,7 +1,7 @@
+ APPNAME = 'sprai'
+ VERSION = '0.9.9.23'
+ 
+-PREFIX=$(PWD)
++PREFIX=$(PWD)/debian/sprai/usr
+ COMPILED= \
+ bfmt72s \
+ nss2v_v3 \
+@@ -52,5 +52,6 @@
+ 
+ install: $(COMPILED) $(SCRIPTS)
+ 	chmod 766 $^
++	mkdir -vp $(PREFIX)/bin/
+ 	cp -p $^ $(PREFIX)/bin/
+ 


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 libexec.patch
 example-specs.patch
 2to3.patch
+makefile.patch


=====================================
debian/rules
=====================================
@@ -1,21 +1,10 @@
 #!/usr/bin/make -f
 
-#DH_VERBOSE = 1
-#include /usr/share/dpkg/default.mk
-
-WAF = ./waf -vvv
-
 %:
 	dh $@
 
 override_dh_auto_configure:
-	$(WAF) configure --prefix=/usr
-
-override_dh_auto_build:
-	$(WAF) build
-
-override_dh_auto_install:
-	$(WAF) install --destdir=$(CURDIR)/debian/sprai
+	echo Skip
 
 override_dh_install:
 	mkdir -p $(CURDIR)/debian/sprai/usr/lib/sprai
@@ -39,7 +28,3 @@ override_dh_installman:
 
 override_dh_installchangelogs:
 	dh_installchangelogs doc/_build/html/_sources/index.txt
-
-override_dh_auto_clean:
-	$(WAF) distclean
-	find waflib -name "*.pyc" -delete



View it on GitLab: https://salsa.debian.org/med-team/sprai/-/compare/ed433f2f3c46abc2df753bf9704f9bd6eb6ecdbd...ea3b9da27b652c04f73104e0377fe9240ce762fc

-- 
View it on GitLab: https://salsa.debian.org/med-team/sprai/-/compare/ed433f2f3c46abc2df753bf9704f9bd6eb6ecdbd...ea3b9da27b652c04f73104e0377fe9240ce762fc
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200410/c8852449/attachment-0001.html>