r14528 - packages/trunk/glee/debian

Miriam Ruiz miriam at alioth.debian.org
Tue Aug 27 17:28:41 UTC 2013 

Author: miriam
Date: 2013-08-27 17:28:41 +0000 (Tue, 27 Aug 2013)
New Revision: 14528

Added:
   packages/trunk/glee/debian/glee.pc.in
Removed:
   packages/trunk/glee/debian/glee.pc
Modified:
   packages/trunk/glee/debian/Makefile
   packages/trunk/glee/debian/changelog
   packages/trunk/glee/debian/control
   packages/trunk/glee/debian/glee-dev.dirs
   packages/trunk/glee/debian/glee-dev.install
   packages/trunk/glee/debian/glee-dev.links
   packages/trunk/glee/debian/libglee0d1.install
   packages/trunk/glee/debian/rules
Log:
Converted for multiarch



Modified: packages/trunk/glee/debian/Makefile
===================================================================
--- packages/trunk/glee/debian/Makefile	2013-08-26 23:17:46 UTC (rev 14527)
+++ packages/trunk/glee/debian/Makefile	2013-08-27 17:28:41 UTC (rev 14528)
@@ -18,6 +18,8 @@
 LIBS=-lGL
 EXTRA_LIBS=
 
+MULTIARCH=
+
 libglee.so.$(MAJOR).$(MINOR): $(SHARED_OBJS)
 	g++ $(LDFLAGS) $(EXTRA_LDFLAGS) -shared \
 		-Wl,-soname,libglee.so.$(MAJOR) \
@@ -58,8 +60,8 @@
 DESTDIR=
 
 install: libglee.a libglee.so
-	mkdir -p "$(DESTDIR)/usr/lib/"
-	cp -a *.a "$(DESTDIR)/usr/lib/"
-	cp -a *.so* "$(DESTDIR)/usr/lib/"
+	mkdir -p "$(DESTDIR)/usr/lib/$(MULTIARCH)/"
+	cp -a *.a "$(DESTDIR)/usr/lib/$(MULTIARCH)/"
+	cp -a *.so* "$(DESTDIR)/usr/lib/$(MULTIARCH)/"
 	mkdir -p "$(DESTDIR)/usr/include/GL/"
 	cp *.h "$(DESTDIR)/usr/include/GL/"

Modified: packages/trunk/glee/debian/changelog
===================================================================
--- packages/trunk/glee/debian/changelog	2013-08-26 23:17:46 UTC (rev 14527)
+++ packages/trunk/glee/debian/changelog	2013-08-27 17:28:41 UTC (rev 14528)
@@ -8,6 +8,8 @@
   * Added links to provide compatibility with other distros. Closes: #579281
   * Using hardening options for building the package.
     See: https://wiki.debian.org/Hardening
+  * Converted for multiarch.
+    See: https://wiki.debian.org/Multiarch/Implementation
 
  -- Miriam Ruiz <miriam at debian.org>  Sun, 25 Aug 2013 19:43:23 +0200
 

Modified: packages/trunk/glee/debian/control
===================================================================
--- packages/trunk/glee/debian/control	2013-08-26 23:17:46 UTC (rev 14527)
+++ packages/trunk/glee/debian/control	2013-08-27 17:28:41 UTC (rev 14528)
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <miriam at debian.org>
-Build-Depends: debhelper (>= 9), dh-buildinfo,
+Build-Depends: debhelper (>= 9), dh-exec (>=0.3), dh-buildinfo,
  mesa-common-dev, libgl1-mesa-dev
 Standards-Version: 3.9.4
 Section: libs
@@ -12,8 +12,9 @@
 
 Package: glee-dev
 Section: libdevel
+Multi-Arch: same
 Architecture: any
-Depends: libglee0d1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libglee0d1 (= ${binary:Version}), ${misc:Depends}
 Suggests: libglee0d1-dbg
 Description: extension loading library for OpenGL - development
  GLee (GL Easy Extension library) is a free cross-platform extension loading
@@ -31,6 +32,8 @@
 Package: libglee0d1
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: extension loading library for OpenGL
  GLee (GL Easy Extension library) is a free cross-platform extension loading
@@ -43,7 +46,8 @@
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libglee0d1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Depends: libglee0d1 (= ${binary:Version}), ${misc:Depends}
 Description: extension loading library for OpenGL - debugging
  GLee (GL Easy Extension library) is a free cross-platform extension loading
  library for OpenGL. It provides seamless support for OpenGL functions up to

Modified: packages/trunk/glee/debian/glee-dev.dirs
===================================================================
--- packages/trunk/glee/debian/glee-dev.dirs	2013-08-26 23:17:46 UTC (rev 14527)
+++ packages/trunk/glee/debian/glee-dev.dirs	2013-08-27 17:28:41 UTC (rev 14528)
@@ -1,2 +1,4 @@
-usr/lib
+#! /usr/bin/dh-exec
+
+usr/lib/${DEB_HOST_MULTIARCH}/
 usr/include

Modified: packages/trunk/glee/debian/glee-dev.install
===================================================================
--- packages/trunk/glee/debian/glee-dev.install	2013-08-26 23:17:46 UTC (rev 14527)
+++ packages/trunk/glee/debian/glee-dev.install	2013-08-27 17:28:41 UTC (rev 14528)
@@ -1,4 +1,6 @@
+#! /usr/bin/dh-exec
+
 debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.a
-debian/tmp/usr/lib/lib*.so
-debian/*.pc usr/lib/pkgconfig/
+debian/tmp/usr/lib/*/lib*.a
+debian/tmp/usr/lib/*/lib*.so
+debian/*.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/

Modified: packages/trunk/glee/debian/glee-dev.links
===================================================================
--- packages/trunk/glee/debian/glee-dev.links	2013-08-26 23:17:46 UTC (rev 14527)
+++ packages/trunk/glee/debian/glee-dev.links	2013-08-27 17:28:41 UTC (rev 14528)
@@ -1,3 +1,5 @@
-usr/lib/libglee.a usr/lib/libGLee.a
-usr/lib/libglee.so usr/lib/libGLee.so
+#! /usr/bin/dh-exec
+
+usr/lib/${DEB_HOST_MULTIARCH}/libglee.a usr/lib/${DEB_HOST_MULTIARCH}/libGLee.a
+usr/lib/${DEB_HOST_MULTIARCH}/libglee.so usr/lib/${DEB_HOST_MULTIARCH}/libGLee.so
 usr/include/GL/GLee.h usr/include/GLee.h

Deleted: packages/trunk/glee/debian/glee.pc
===================================================================
--- packages/trunk/glee/debian/glee.pc	2013-08-26 23:17:46 UTC (rev 14527)
+++ packages/trunk/glee/debian/glee.pc	2013-08-27 17:28:41 UTC (rev 14528)
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: GLee
-Description: GL Easy Extension library
-Version: 5.4.0
-Requires: 
-Conflicts: 
-Libs: -L${libdir} -lglee
-Cflags: -I${includedir}

Added: packages/trunk/glee/debian/glee.pc.in
===================================================================
--- packages/trunk/glee/debian/glee.pc.in	                        (rev 0)
+++ packages/trunk/glee/debian/glee.pc.in	2013-08-27 17:28:41 UTC (rev 14528)
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib/@DEB_HOST_MULTIARCH@
+includedir=${prefix}/include
+
+Name: GLee
+Description: GL Easy Extension library
+Version: 5.4.0
+Requires: 
+Conflicts: 
+Libs: -L${libdir} -lglee
+Cflags: -I${includedir}

Modified: packages/trunk/glee/debian/libglee0d1.install
===================================================================
--- packages/trunk/glee/debian/libglee0d1.install	2013-08-26 23:17:46 UTC (rev 14527)
+++ packages/trunk/glee/debian/libglee0d1.install	2013-08-27 17:28:41 UTC (rev 14528)
@@ -1 +1 @@
-debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/lib/*/lib*.so.*

Modified: packages/trunk/glee/debian/rules
===================================================================
--- packages/trunk/glee/debian/rules	2013-08-26 23:17:46 UTC (rev 14527)
+++ packages/trunk/glee/debian/rules	2013-08-27 17:28:41 UTC (rev 14528)
@@ -9,6 +9,8 @@
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 LDFLAGS2:=-Wl,-z,defs  -Wl,-as-needed -Wl,--no-undefined
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 config: config-stamp
 config-stamp: 
 	dh_testdir
@@ -20,7 +22,8 @@
 	$(MAKE) -f debian/Makefile \
 		CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
 		CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
-		LDFLAGS="$(LDFLAGS) $(LDFLAGS2)"
+		LDFLAGS="$(LDFLAGS) $(LDFLAGS2)" \
+		MULTIARCH="$(DEB_HOST_MULTIARCH)"
 	touch $@
 
 build-indep: build-stamp
@@ -32,8 +35,11 @@
 clean: config
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp config-stamp
-	$(MAKE) -f debian/Makefile clean
+	rm -fv build-stamp config-stamp
+	$(MAKE) -f debian/Makefile \
+		MULTIARCH="$(DEB_HOST_MULTIARCH)" \
+		clean
+	rm -fv debian/glee.pc
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean
 
@@ -42,13 +48,19 @@
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	$(MAKE) -f debian/Makefile DESTDIR=$(CURDIR)/debian/tmp install
+	$(MAKE) -f debian/Makefile \
+		MULTIARCH="$(DEB_HOST_MULTIARCH)" \
+		DESTDIR=$(CURDIR)/debian/tmp \
+		install
 
+%.pc: %.pc.in
+	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
+
 # Build architecture-independent files here.
-binary-indep: install
+binary-indep: install debian/glee.pc
 
 # Build architecture-dependent files here.
-binary-arch: install
+binary-arch: install debian/glee.pc
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs

More information about the Pkg-games-commits mailing list