r14526 - in packages/trunk/glee/debian: . source

Mon Aug 26 23:13:23 UTC 2013

Author: miriam
Date: 2013-08-26 23:13:23 +0000 (Mon, 26 Aug 2013)
New Revision: 14526

Added:
   packages/trunk/glee/debian/glee-dev.links
   packages/trunk/glee/debian/source/
   packages/trunk/glee/debian/source/format
   packages/trunk/glee/debian/source/options
Modified:
   packages/trunk/glee/debian/Makefile
   packages/trunk/glee/debian/changelog
   packages/trunk/glee/debian/compat
   packages/trunk/glee/debian/control
   packages/trunk/glee/debian/rules
Log:
Polished package a bit, and moving it to the Games Team



Modified: packages/trunk/glee/debian/Makefile
===================================================================

--- packages/trunk/glee/debian/Makefile	2013-08-26 23:11:50 UTC (rev 14525)
+++ packages/trunk/glee/debian/Makefile	2013-08-26 23:13:23 UTC (rev 14526)
@@ -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
@@ -60,5 +61,5 @@
 	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/include/GL/"
+	cp *.h "$(DESTDIR)/usr/include/GL/"

Modified: packages/trunk/glee/debian/changelog
===================================================================
--- packages/trunk/glee/debian/changelog	2013-08-26 23:11:50 UTC (rev 14525)
+++ packages/trunk/glee/debian/changelog	2013-08-26 23:13:23 UTC (rev 14526)
@@ -1,3 +1,16 @@
+glee (5.4.0-2) UNRELEASED; 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 at 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
+
+ -- Miriam Ruiz <miriam at debian.org>  Sun, 25 Aug 2013 19:43:23 +0200
+
 glee (5.4.0-1) unstable; urgency=low
 
   * Initial release. Closes:  #569063

Modified: packages/trunk/glee/debian/compat
===================================================================
--- packages/trunk/glee/debian/compat	2013-08-26 23:11:50 UTC (rev 14525)
+++ packages/trunk/glee/debian/compat	2013-08-26 23:13:23 UTC (rev 14526)
@@ -1 +1 @@
-7
+9

Modified: packages/trunk/glee/debian/control
===================================================================
--- packages/trunk/glee/debian/control	2013-08-26 23:11:50 UTC (rev 14525)
+++ packages/trunk/glee/debian/control	2013-08-26 23:13:23 UTC (rev 14526)
@@ -1,9 +1,10 @@
 Source: glee
 Priority: optional
-Maintainer: Miriam Ruiz <little_miry at yahoo.es>
-Build-Depends: debhelper (>= 7), dh-buildinfo,
+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,
  mesa-common-dev, libgl1-mesa-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.9.4
 Section: libs
 Homepage: http://elf-stone.com/glee.php
 

Added: packages/trunk/glee/debian/glee-dev.links
===================================================================
--- packages/trunk/glee/debian/glee-dev.links	                        (rev 0)
+++ packages/trunk/glee/debian/glee-dev.links	2013-08-26 23:13:23 UTC (rev 14526)
@@ -0,0 +1,3 @@
+usr/lib/libglee.a usr/lib/libGLee.a
+usr/lib/libglee.so usr/lib/libGLee.so
+usr/include/GL/GLee.h usr/include/GLee.h

Modified: packages/trunk/glee/debian/rules
===================================================================
--- packages/trunk/glee/debian/rules	2013-08-26 23:11:50 UTC (rev 14525)
+++ packages/trunk/glee/debian/rules	2013-08-26 23:13:23 UTC (rev 14526)
@@ -3,46 +3,39 @@
 # 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)}'`
-
 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)"
 	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 
+	rm -f build-stamp config-stamp
 	$(MAKE) -f debian/Makefile clean
-	dh_clean 
+	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
+	dh_clean
 
 install: build
 	dh_testdir
@@ -58,28 +51,17 @@
 binary-arch: install
 	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 +69,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 

Added: packages/trunk/glee/debian/source/format
===================================================================
--- packages/trunk/glee/debian/source/format	                        (rev 0)
+++ packages/trunk/glee/debian/source/format	2013-08-26 23:13:23 UTC (rev 14526)
@@ -0,0 +1 @@
+3.0 (quilt)

Added: packages/trunk/glee/debian/source/options
===================================================================
--- packages/trunk/glee/debian/source/options	                        (rev 0)
+++ packages/trunk/glee/debian/source/options	2013-08-26 23:13:23 UTC (rev 14526)
@@ -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)$"


