[med-svn] [Git][med-team/boxshade][master] 2 commits: Build for correct architecture

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / boxshade


Commits:
06664681 by Andreas Tille at 2019-06-27T11:50:16Z
Build for correct architecture

- - - - -
6476df8d by Andreas Tille at 2019-06-27T11:54:48Z
Standards-Version: 4.3.0, upload to unstable

- - - - -


5 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+boxshade (3.3.1-13) unstable; urgency=medium
+
+  [ Nguyen Hoang Tung ]
+  * Build for correct architecture
+    Closes: #931150
+
+  [ Andreas Tille ]
+  * Standards-Version: 4.3.0
+
+ -- Andreas Tille <tille at debian.org>  Thu, 27 Jun 2019 13:54:24 +0200
+
 boxshade (3.3.1-12) unstable; urgency=medium
 
   [ Steffen Moeller ]


=====================================
debian/control
=====================================
@@ -6,7 +6,7 @@ Uploaders: Steffen Moeller <moeller at debian.org>,
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 11~)
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/med-team/boxshade
 Vcs-Git: https://salsa.debian.org/med-team/boxshade.git
 Homepage: http://www.ch.embnet.org/software/BOX_form.html


=====================================
debian/patches/change_fixed_compiler.patch
=====================================
@@ -0,0 +1,33 @@
+Author: Nguyen Hoang Tung <tung.nguyenhoang at toshiba-tsdv.com>
+Date: Thu, 27 Jun 2019 15:10:33 +0700
+Bug-Debian: https://bugs.debian.org/931150
+Description: build for correct architecture
+
+diff -Nru orig/boxshade-3.3.1/makefile.djp boxshade-3.3.1/makefile.djp
+--- orig/boxshade-3.3.1/makefile.djp	1997-06-06 17:48:13.000000000 +0000
++++ boxshade-3.3.1/makefile.djp	2019-05-20 10:24:41.494373080 +0000
+@@ -23,8 +23,8 @@
+ 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ depend:
+-	gcc -MM $(CSRCbx) >depend
+-	gcc -MM $(CSRCdv) >>depend
++	$(CC) -MM $(CSRCbx) >depend
++	$(CC) -MM $(CSRCdv) >>depend
+ 
+ box$(OBJ):      box.c      bx_types.h bx_read.h dv_all.h version.h
+ bx_read$(OBJ):  bx_read.c  bx_types.h bx_read.h
+diff -Nru orig/boxshade-3.3.1/makefile.unx boxshade-3.3.1/makefile.unx
+--- orig/boxshade-3.3.1/makefile.unx	1997-06-06 17:48:33.000000000 +0000
++++ boxshade-3.3.1/makefile.unx	2019-05-20 10:25:03.658373080 +0000
+@@ -23,8 +23,8 @@
+ 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ depend:
+-	gcc -MM $(CSRCbx) >depend
+-	gcc -MM $(CSRCdv) >>depend
++	$(CC) -MM $(CSRCbx) >depend
++	$(CC) -MM $(CSRCdv) >>depend
+ 
+ box$(OBJ):      box.c      bx_types.h bx_read.h dv_all.h version.h
+ bx_read$(OBJ):  bx_read.c  bx_types.h bx_read.h


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 kickOutGets.patch
 remove-newlines.patch
 spelling.patch
+change_fixed_compiler.patch


=====================================
debian/rules
=====================================
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/buildtools.mk
+
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 export DH_VERBOSE=1
@@ -8,7 +10,7 @@ export DH_VERBOSE=1
 	dh $@
 
 override_dh_auto_build:
-	$(MAKE) -f makefile.unx CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)"
+	$(MAKE) CC="$(CC)" -f makefile.unx CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)"
 
 override_dh_clean:
 	rm -f boxshade *.o



View it on GitLab: https://salsa.debian.org/med-team/boxshade/compare/b05cedc7d835667d9be62bacb1d65bfb41878ca5...6476df8d2faee72239331c4f177ee5521194e0a1

-- 
View it on GitLab: https://salsa.debian.org/med-team/boxshade/compare/b05cedc7d835667d9be62bacb1d65bfb41878ca5...6476df8d2faee72239331c4f177ee5521194e0a1
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/20190627/7993521d/attachment-0001.html>