[SCM] guitarix/master: Revert "Add Multi-Arch support"

viccuad-guest at users.alioth.debian.org viccuad-guest at users.alioth.debian.org
Tue Mar 29 23:24:49 UTC 2016 

The following commit has been merged in the master branch:
commit ed276ac57420b320e7be829314eb34f53fcd4112
Author: Víctor Cuadrado Juan <me at viccuad.me>
Date:   Wed Mar 30 00:44:09 2016 +0200

    Revert "Add Multi-Arch support"
    
    This reverts commit 31721939caa6f46e75707f87edd588706d7ee391.
    
    Taking out Multi-arch support for now, because lv2 plugin hosts don't
    support it and don't find them in /usr/lib/triplet/lv2 .
    
    For more info: https://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/2014-January/036278.html

diff --git a/debian/control b/debian/control
index 253598b..8de76d5 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,6 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/guitarix.git
 
 Package: guitarix
 Architecture: any
-Multi-Arch: foreign
 Depends:
  guitarix-common (= ${source:Version}),
  guitarix-ladspa (>= ${source:Version}),
@@ -54,7 +53,6 @@ Description: Rock guitar amplifier for Jack
 
 Package: guitarix-common
 Architecture: all
-Multi-Arch: foreign
 Breaks: guitarix (<< 0.34.0-1)
 Replaces: guitarix (<< 0.34.0-1)
 Depends:
@@ -70,7 +68,6 @@ Description: Guitarix - Common files
 
 Package: guitarix-ladspa
 Architecture: any
-Multi-Arch: same
 Breaks: guitarix (<< 0.34.0-1)
 Replaces: guitarix (<< 0.34.0-1)
 Provides: ladspa-plugin
@@ -86,7 +83,6 @@ Description: Guitarix - ladspa plugins
 
 Package: guitarix-lv2
 Architecture: any
-Multi-Arch: same
 Breaks: guitarix (<< 0.34.0-1)
 Replaces: guitarix (<< 0.34.0-1)
 Provides: lv2-plugin
@@ -103,7 +99,6 @@ Description: Guitarix - LV2 plugins
 Package: guitarix-doc
 Section: doc
 Architecture: all
-Multi-Arch: foreign
 Priority: optional
 Depends: ${misc:Depends},
  libjs-jquery
@@ -120,10 +115,8 @@ Description: Guitarix - Development documentation
 Package: libgxw0
 Section: libs
 Architecture: any
-Multi-Arch: same
 Breaks: guitarix (<< 0.34.0-1)
 Replaces: guitarix (<< 0.34.0-1)
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Guitarix - GTK+ library
  Guitarix is a rock guitar amplifier for Jack (Jack Audio Connection Kit) with
@@ -136,7 +129,6 @@ Description: Guitarix - GTK+ library
 Package: libgxw-dev
 Section: libdevel
 Architecture: any
-Multi-Arch: same
 Depends: ${misc:Depends}, libgxw0 (= ${binary:Version})
 Recommends: guitarix-doc
 Description: Guitarix - GTK+ library (development files)
@@ -150,10 +142,8 @@ Description: Guitarix - GTK+ library (development files)
 Package: libgxwmm0
 Section: libs
 Architecture: any
-Multi-Arch: same
 Breaks: guitarix (<< 0.34.0-1)
 Replaces: guitarix (<< 0.34.0-1)
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Guitarix - GTK+ C++ widget library
  Guitarix is a rock guitar amplifier for Jack (Jack Audio Connection Kit) with
@@ -166,7 +156,6 @@ Description: Guitarix - GTK+ C++ widget library
 Package: libgxwmm-dev
 Section: libdevel
 Architecture: any
-Multi-Arch: same
 Depends: ${misc:Depends}, libgxwmm0 (= ${binary:Version})
 Recommends: guitarix-doc
 Description: Guitarix - GTK+ C++ widget library (development files)
@@ -180,8 +169,6 @@ Description: Guitarix - GTK+ C++ widget library (development files)
 Package: gxw-glade
 Section: libs
 Architecture: any
-Multi-Arch: foreign
-# Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Guitarix - GTK+ library Glade support
  Guitarix is a rock guitar amplifier for Jack (Jack Audio Connection Kit) with
diff --git a/debian/guitarix-ladspa.install b/debian/guitarix-ladspa.install
index 6008fb1..e400d18 100644
--- a/debian/guitarix-ladspa.install
+++ b/debian/guitarix-ladspa.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/*/ladspa/*
-debian/tmp/usr/share/ladspa/*
+debian/tmp/usr/lib/ladspa/*
+debian/tmp/usr/share/ladspa/*
\ No newline at end of file
diff --git a/debian/guitarix-lv2.install b/debian/guitarix-lv2.install
index 7bfce42..c4a3c9f 100644
--- a/debian/guitarix-lv2.install
+++ b/debian/guitarix-lv2.install
@@ -1 +1 @@
-debian/tmp/usr/lib/*/lv2/*
+debian/tmp/usr/lib/lv2/*
\ No newline at end of file
diff --git a/debian/libgxw-dev.install b/debian/libgxw-dev.install
index 4d0300e..5a37201 100644
--- a/debian/libgxw-dev.install
+++ b/debian/libgxw-dev.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/include/gxw/*
 debian/tmp/usr/include/gxw.h
-debian/tmp/usr/lib/*/pkgconfig/gxw.pc
-debian/tmp/usr/lib/*/libgxw.so
+debian/tmp/usr/lib/pkgconfig/gxw.pc
+debian/tmp/usr/lib/libgxw.so
diff --git a/debian/libgxw-dev.lintian-overrides b/debian/libgxw-dev.lintian-overrides
new file mode 100644
index 0000000..2495bdd
--- /dev/null
+++ b/debian/libgxw-dev.lintian-overrides
@@ -0,0 +1,2 @@
+# Allowed by Policy, I intend to support only one -dev per library:
+libgxw-dev binary: package-name-doesnt-match-sonames libgxw0
\ No newline at end of file
diff --git a/debian/libgxw0.install b/debian/libgxw0.install
index f71d983..0862018 100644
--- a/debian/libgxw0.install
+++ b/debian/libgxw0.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/*/libgxw.so.*
+debian/tmp/usr/lib/libgxw.so.*
 
diff --git a/debian/libgxw0.lintian-overrides b/debian/libgxw0.lintian-overrides
index 44830f5..b46d79e 100644
--- a/debian/libgxw0.lintian-overrides
+++ b/debian/libgxw0.lintian-overrides
@@ -1,2 +1,2 @@
 # Using only shlibs, because it is a minor lib and maintaining C++ symbols files is a bit onerous:
-libgxw0 binary: no-symbols-control-file usr/lib/*/libgxw.so.0.1
+libgxw0 binary: no-symbols-control-file usr/lib/libgxw.so.0.1
diff --git a/debian/libgxwmm-dev.install b/debian/libgxwmm-dev.install
index bf17e83..a311a03 100644
--- a/debian/libgxwmm-dev.install
+++ b/debian/libgxwmm-dev.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/include/gxwmm/*
 debian/tmp/usr/include/gxwmm.h
-debian/tmp/usr/lib/*/pkgconfig/gxwmm.pc
-debian/tmp/usr/lib/*/libgxwmm.so
+debian/tmp/usr/lib/pkgconfig/gxwmm.pc
+debian/tmp/usr/lib/libgxwmm.so
diff --git a/debian/libgxwmm-dev.lintian-overrides b/debian/libgxwmm-dev.lintian-overrides
new file mode 100644
index 0000000..f30d6a7
--- /dev/null
+++ b/debian/libgxwmm-dev.lintian-overrides
@@ -0,0 +1,2 @@
+# Allowed by Policy, I intend to support only one -dev per library:
+libgxwmm-dev binary: package-name-doesnt-match-sonames libgxwmm0
\ No newline at end of file
diff --git a/debian/libgxwmm0.install b/debian/libgxwmm0.install
index 7849675..3622007 100644
--- a/debian/libgxwmm0.install
+++ b/debian/libgxwmm0.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/*/libgxwmm.so.*
+debian/tmp/usr/lib/libgxwmm.so.*
 
diff --git a/debian/libgxwmm0.lintian-overrides b/debian/libgxwmm0.lintian-overrides
index 5699285..e5c07af 100644
--- a/debian/libgxwmm0.lintian-overrides
+++ b/debian/libgxwmm0.lintian-overrides
@@ -1,2 +1,2 @@
 # Using only shlibs, because it is a minor lib and maintaining C++ symbols files is a bit onerous:
-libgxwmm0 binary: no-symbols-control-file usr/lib/*/libgxwmm.so.0.1
+libgxwmm0 binary: no-symbols-control-file usr/lib/libgxwmm.so.0.1
diff --git a/debian/rules b/debian/rules
index 4e44fa4..fb3c12d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
 	dh $@
@@ -11,8 +10,7 @@ override_dh_auto_configure:
 		--cxxflags="$(shell dpkg-buildflags --get CXXFLAGS) \
 			$(shell dpkg-buildflags --get CPPFLAGS)" \
 		--ldflags="$(shell dpkg-buildflags --get LDFLAGS)" -v \
-		--shared-lib --lib-dev --glade-support \
-		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+		--shared-lib --lib-dev --glade-support
 
 override_dh_auto_build-arch:
 	./waf build -v
@@ -35,12 +33,11 @@ override_dh_auto_install:
 	./waf install --destdir=$(CURDIR)/debian/tmp --libdir=$(CURDIR)/debian/tmp
 	rm -f $(CURDIR)/debian/tmp/usr/share/gx_head/sounds/bands/LICENSE
 	rm -f $(CURDIR)/debian/tmp/usr/share/gx_head/sounds/amps/LICENSE
-	rm -rf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/lv2/gx_amp.lv2/modgui
-	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgxwmm.so
-	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgxw.so
-	ln -s $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgxwmm.so.0.1 $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgxwmm.so
-	ln -s $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgxw.so.0.1 $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgxw.so
-
+	rm -rf $(CURDIR)/debian/tmp/usr/lib/lv2/gx_amp.lv2/modgui
+	rm -f $(CURDIR)/debian/tmp/usr/lib/libgxwmm.so
+	rm -f $(CURDIR)/debian/tmp/usr/lib/libgxw.so
+	ln -s $(CURDIR)/debian/tmp/usr/lib/libgxwmm.so.0.1 $(CURDIR)/debian/tmp/usr/lib/libgxwmm.so
+	ln -s $(CURDIR)/debian/tmp/usr/lib/libgxw.so.0.1 $(CURDIR)/debian/tmp/usr/lib/libgxw.so
 override_dh_install:
 	dh_install --fail-missing
 

-- 
guitarix packaging

More information about the pkg-multimedia-commits mailing list