[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/libaxc][debian/master] 3 commits: d/patches: 001_makefile_fix-tests.patch fixes an FTBFS (Closes: #983975)

Henry-Nicolas Tourneur (@hntourne) gitlab at salsa.debian.org
Sun Aug 15 12:48:29 BST 2021



Henry-Nicolas Tourneur pushed to branch debian/master at Debian On Mobile / libaxc


Commits:
42d11544 by Henry-Nicolas Tourneur at 2021-08-15T11:44:53+00:00
d/patches: 001_makefile_fix-tests.patch fixes an FTBFS (Closes: #983975)

- - - - -
056c7b89 by Henry-Nicolas Tourneur at 2021-08-15T11:45:21+00:00
d/control: bump Standard-Version (no changes needed)

- - - - -
84435a5c by Henry-Nicolas Tourneur at 2021-08-15T11:46:12+00:00
d/changelog: document changes and release

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/001_makefile_fix-tests.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,11 +1,13 @@
 axc (0.3.4-1) unstable; urgency=medium
 
-  * d/salsa-ci.yml: disable aptly
   * New upstream version 0.3.4
+  * d/salsa-ci.yml: disable aptly
   * d/patches: remove 001_fix_makefile.patch that has been upstreamed
   * d/patches: 001_makefile_fixtest-race.patch
     fixes a potential FTBFS (Closes: #983975)
   * Perform the sofile linking using upstream build infrastructure
+  * Cleanup on d/rules: leftovers from unused patches
+  * d/control: bump Standard-Version (no changes needed)
 
  -- Henry-Nicolas Tourneur <debian at nilux.be>  Sun, 15 Aug 2021 10:33:45 +0000
 


=====================================
debian/control
=====================================
@@ -12,7 +12,7 @@ Build-Depends:
  libsignal-protocol-c-dev,
  libsqlite3-dev,
  pkg-config,
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Rules-Requires-Root: no
 Homepage: https://github.com/gkdr/axc
 Vcs-Git: https://salsa.debian.org/DebianOnMobile-team/libaxc.git


=====================================
debian/patches/001_makefile_fix-tests.patch
=====================================
@@ -0,0 +1,25 @@
+Author: Henry-Nicolas Tourneur <debian at nilux.be>
+Forwarded: https://github.com/gkdr/axc/pull/27
+Description: This patch remove the dependency on the fresco shpinx theme.
+ That theme is not available in Debian so rtd is used instead.
+ The patch also disable a potential privacy violation (see html_theme_options)
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Makefile
++++ b/Makefile
+@@ -144,13 +144,13 @@ endif
+ test_store: $(SDIR)/axc_store.c $(SDIR)/axc_crypto.c $(TDIR)/test_store.c
+ 	$(CC) $(TESTFLAGS) -o $(TDIR)/$@.o  $(TDIR)/test_store.c $(SDIR)/axc_crypto.c $(LDFLAGS_T)
+ 	-$(TDIR)/$@.o
+-	mv *.g* $(TDIR)
++	find . -maxdepth 1 -iname 'test*.g*' -exec mv {} $(TDIR) \;
+ 
+ .PHONY: test_client
+ test_client: $(SDIR)/axc.c $(SDIR)/axc_crypto.c  $(SDIR)/axc_store.c $(TDIR)/test_client.c
+ 	$(CC) $(TESTFLAGS) -o $(TDIR)/$@.o $(SDIR)/axc_crypto.c $(TDIR)/test_client.c $(LDFLAGS_T)
+ 	-$(TDIR)/$@.o
+-	mv *.g* $(TDIR)
++	find . -maxdepth 1 -iname 'test*.g*' -exec mv {} $(TDIR) \;
+ 
+ .PHONY: coverage
+ coverage: test


=====================================
debian/patches/series
=====================================
@@ -0,0 +1,2 @@
+001_makefile_fix-tests.patch
+002_makefile_add-links.patch



View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/libaxc/-/compare/2fb46afc3e4e35d48b7b9b144defc69d2a762f03...84435a5cd4a4ca382355d660385850240a503723

-- 
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/libaxc/-/compare/2fb46afc3e4e35d48b7b9b144defc69d2a762f03...84435a5cd4a4ca382355d660385850240a503723
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-on-mobile-maintainers/attachments/20210815/7cfdf7f7/attachment-0001.htm>


More information about the Debian-on-mobile-maintainers mailing list