diff -Nru glee-5.4.0/debian/Makefile glee-5.4.0/debian/Makefile --- glee-5.4.0/debian/Makefile 2013-09-03 16:48:14.000000000 +0000 +++ glee-5.4.0/debian/Makefile 2013-08-27 22:30:01.000000000 +0000 @@ -8,8 +8,9 @@ SHARED_OBJS = $(SOURCES:.c=.shared.o) STATIC_OBJS = $(SOURCES:.c=.static.o) +CFLAGS= -O2 -g -Wall EXTRA_CFLAGS=-I. -STATIC_CFLAGS= -O2 -g -Wall $(EXTRA_CFLAGS) +STATIC_CFLAGS= $(CFLAGS) $(EXTRA_CFLAGS) SHARED_CFLAGS= $(STATIC_CFLAGS) -fPIC LDFLAGS= -Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined @@ -17,6 +18,8 @@ LIBS=-lGL EXTRA_LIBS= +MULTIARCH= + libglee.so.$(MAJOR).$(MINOR): $(SHARED_OBJS) g++ $(LDFLAGS) $(EXTRA_LDFLAGS) -shared \ -Wl,-soname,libglee.so.$(MAJOR) \ @@ -57,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/include/" - cp *.h "$(DESTDIR)/usr/include/" + 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/" diff -Nru glee-5.4.0/debian/changelog glee-5.4.0/debian/changelog --- glee-5.4.0/debian/changelog 2013-09-03 16:48:14.000000000 +0000 +++ glee-5.4.0/debian/changelog 2013-08-27 22:38:55.000000000 +0000 @@ -1,3 +1,18 @@ +glee (5.4.0-2) unstable; urgency=low + + * Upgraded source package to format 3.0 (quilt) + * Upgraded Standards-Version from 3.8.3 to 3.9.4 + * Upgraded compat level to 9 + * Set Debian Games Team as Maintainer + * Changed my email address to miriam@debian.org + * 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 Sun, 25 Aug 2013 19:43:23 +0200 + glee (5.4.0-1) unstable; urgency=low * Initial release. Closes: #569063 diff -Nru glee-5.4.0/debian/compat glee-5.4.0/debian/compat --- glee-5.4.0/debian/compat 2013-09-03 16:48:14.000000000 +0000 +++ glee-5.4.0/debian/compat 2013-08-27 22:30:01.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru glee-5.4.0/debian/control glee-5.4.0/debian/control --- glee-5.4.0/debian/control 2013-09-03 16:48:14.000000000 +0000 +++ glee-5.4.0/debian/control 2013-08-27 22:30:01.000000000 +0000 @@ -1,16 +1,20 @@ Source: glee Priority: optional -Maintainer: Miriam Ruiz -Build-Depends: debhelper (>= 7), dh-buildinfo, +Maintainer: Debian Games Team +Uploaders: Miriam Ruiz +Build-Depends: debhelper (>= 9), dh-exec (>=0.3), dh-buildinfo, mesa-common-dev, libgl1-mesa-dev -Standards-Version: 3.8.3 +Standards-Version: 3.9.4 Section: libs +Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/glee/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/glee/?op=log Homepage: http://elf-stone.com/glee.php 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 @@ -28,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 @@ -40,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 diff -Nru glee-5.4.0/debian/glee-dev.dirs glee-5.4.0/debian/glee-dev.dirs --- glee-5.4.0/debian/glee-dev.dirs 2013-09-03 16:48:14.000000000 +0000 +++ glee-5.4.0/debian/glee-dev.dirs 2013-08-27 22:30:01.000000000 +0000 @@ -1,2 +1,4 @@ -usr/lib +#! /usr/bin/dh-exec + +usr/lib/${DEB_HOST_MULTIARCH}/ usr/include diff -Nru glee-5.4.0/debian/glee-dev.install glee-5.4.0/debian/glee-dev.install --- glee-5.4.0/debian/glee-dev.install 2013-09-03 16:48:14.000000000 +0000 +++ glee-5.4.0/debian/glee-dev.install 2013-08-27 22:30:01.000000000 +0000 @@ -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/ diff -Nru glee-5.4.0/debian/glee-dev.links glee-5.4.0/debian/glee-dev.links --- glee-5.4.0/debian/glee-dev.links 1970-01-01 00:00:00.000000000 +0000 +++ glee-5.4.0/debian/glee-dev.links 2013-08-27 22:30:01.000000000 +0000 @@ -0,0 +1,5 @@ +#! /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 diff -Nru glee-5.4.0/debian/glee.pc glee-5.4.0/debian/glee.pc --- glee-5.4.0/debian/glee.pc 2013-09-03 16:48:14.000000000 +0000 +++ glee-5.4.0/debian/glee.pc 1970-01-01 00:00:00.000000000 +0000 @@ -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} diff -Nru glee-5.4.0/debian/glee.pc.in glee-5.4.0/debian/glee.pc.in --- glee-5.4.0/debian/glee.pc.in 1970-01-01 00:00:00.000000000 +0000 +++ glee-5.4.0/debian/glee.pc.in 2013-08-27 22:30:01.000000000 +0000 @@ -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} diff -Nru glee-5.4.0/debian/libglee0d1.install glee-5.4.0/debian/libglee0d1.install --- glee-5.4.0/debian/libglee0d1.install 2013-09-03 16:48:14.000000000 +0000 +++ glee-5.4.0/debian/libglee0d1.install 2013-08-27 22:30:01.000000000 +0000 @@ -1 +1 @@ -debian/tmp/usr/lib/lib*.so.* +debian/tmp/usr/lib/*/lib*.so.* diff -Nru glee-5.4.0/debian/rules glee-5.4.0/debian/rules --- glee-5.4.0/debian/rules 2013-09-03 16:48:14.000000000 +0000 +++ glee-5.4.0/debian/rules 2013-08-27 22:30:01.000000000 +0000 @@ -3,83 +3,77 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) +LDFLAGS2:=-Wl,-z,defs -Wl,-as-needed -Wl,--no-undefined -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) -CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -else -CROSS= --build $(DEB_BUILD_GNU_TYPE) -endif - - -# shared library versions, option 1 -version=2.0.5 -major=2 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -#version=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -#major=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) config: config-stamp -config-stamp: +config-stamp: dh_testdir + [ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch touch $@ -build: build-stamp -build-stamp: config-stamp +build-stamp: config dh_testdir $(MAKE) -f debian/Makefile \ - CFLAGS="$(CFLAGS)" \ - LDFLAGS="-Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined" + CFLAGS="$(CFLAGS) $(CPPFLAGS)" \ + CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" \ + LDFLAGS="$(LDFLAGS) $(LDFLAGS2)" \ + MULTIARCH="$(DEB_HOST_MULTIARCH)" touch $@ -clean: +build-indep: build-stamp + +build-arch: build-stamp + +build: build-arch build-indep + +clean: config dh_testdir dh_testroot - rm -f config-stamp build-stamp - $(MAKE) -f debian/Makefile clean - dh_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 install: build dh_testdir 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 + dh_installchangelogs dh_installdocs dh_installexamples dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo dh_installman dh_link dh_strip --dbg-package=libglee0d1-dbg dh_compress dh_fixperms -# dh_perl -# dh_python dh_makeshlibs - test -e /usr/bin/dh_buildinfo && dh_buildinfo + [ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo dh_installdeb dh_shlibdeps dh_gencontrol @@ -87,4 +81,4 @@ dh_builddeb binary: binary-indep binary-arch -.PHONY: config build clean binary-indep binary-arch binary install +.PHONY: config build-arch build-indep build clean binary-indep binary-arch binary install diff -Nru glee-5.4.0/debian/source/format glee-5.4.0/debian/source/format --- glee-5.4.0/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ glee-5.4.0/debian/source/format 2013-09-03 16:48:14.672564456 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru glee-5.4.0/debian/source/options glee-5.4.0/debian/source/options --- glee-5.4.0/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ glee-5.4.0/debian/source/options 2013-08-27 22:30:01.000000000 +0000 @@ -0,0 +1,5 @@ +# Bzip2 compression for debian.tar +compression = "bzip2" +compression-level = 7 +# Do not generate diff for changes in config.(sub|guess) +extend-diff-ignore = "(^|/)config.(sub|guess)$"