[Pkg-sdl-commits] [SCM] Packaging of SDL_net branch, master, updated. debian/1.2.7-3

Sun Dec 4 19:54:23 UTC 2011

The following commit has been merged in the master branch:
commit 10813145ae2052e4acadb44e537293500a382ba6
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sun Dec 4 16:34:31 2011 +0000

    Changes for 1.2.7-3, read debian/changelog for detailed information

diff --git a/debian/changelog b/debian/changelog
index e1693d1..024ae88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+sdl-net1.2 (1.2.7-3) unstable; urgency=low
+
+  * New maintainer
+    - Added as part of SDL team
+    - Add myself to uploaders, and setting DM-Upload-Allowed: yes
+  * Bump Standards-Version to 3.9.2 (no changes needed)
+  * Changed debhelper compat to level 8 (level 4 before):
+    - Updated dependency on debhelper to (>= 8.0.0)
+    - Simplify a lot debian/rules file by leveraging debhelper capabilities,
+      only acting when deviating from auto behaviour
+  * Added 'source/format', with '3.0 (quilt)'
+    - Removed dependency on dpatch
+  * Convert ${pkg}.dirs and ${pkg}.files into ${pkg}.install
+  * Updating 'watch' file to version=3
+  * Added Vcs-Git and Vcs-Browser in 'control' file
+  * Shipping pkg-config files
+  * Modifications to dependencies and build options:
+    - Depending on newer dpkg-dev
+    - Removed Conflict dependencies on libsdl-net1.1. It's very old and not
+      present in any of the last Debian releases, long unsupported.
+  * debian/copyright: updated and converted to DEP-5
+
+ -- Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>  Sun, 04 Dec 2011 13:12:42 +0000
+
 sdl-net1.2 (1.2.7-2) unstable; urgency=low
 
   * Fix the clean rule to check for Makefile first
diff --git a/debian/compat b/debian/compat
index b8626c4..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+8
diff --git a/debian/control b/debian/control
index 35784f7..99cb188 100644
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,42 @@
 Source: sdl-net1.2
 Section: libs
 Priority: optional
-Maintainer: Mike Furr <mfurr at debian.org>
-Build-Depends: debhelper (>> 3.0.0), libsdl1.2-dev (>= 1.2.5), autotools-dev, dpatch
-Standards-Version: 3.7.2
+Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
+Uploaders: Mike Furr <mfurr at debian.org>, Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
+DM-Upload-Allowed: yes
+Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 8.0.0),
+               dh-autoreconf,
+               dpkg-dev (>= 1.16.1~),
+               libsdl1.2-dev (>= 1.2.14),
+Homepage: http://www.libsdl.org/projects/SDL_net/
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-sdl/packages/sdl-net1.2.git
+Vcs-Git: git://anonscm.debian.org/pkg-sdl/packages/sdl-net1.2.git
 
-Package: libsdl-net1.2-dev
-Section: libdevel
-Architecture: any
-Depends: libsdl-net1.2 (= ${binary:Version}), libc6-dev, libsdl1.2-dev (>= 1.2.5)
-Conflicts: libsdl-net1.1-dev
-Replaces: libsdl-net1.1-dev
-Description:  Development files for SDL network library
- Header files and static libraries needed to compile programs
- using libsdl-net.
 
 Package: libsdl-net1.2
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
-Description: network library for Simple DirectMedia Layer
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: Network library for Simple DirectMedia Layer 1.2, libraries
+ This is a small, low-level, cross-platform networking library, that
+ can be used with the Simple DirectMedia Layer library
+ (www.libsdl.org).
+ .
+ This package contains the shared library.
+
+Package: libsdl-net1.2-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends},
+	 libc6-dev,
+	 libsdl-net1.2 (= ${binary:Version}),
+	 libsdl1.2-dev (>= 1.2.14)
+Description: Network library for Simple DirectMedia Layer 1.2, development files
  This is a small, low-level, cross-platform networking library, that
  can be used with the Simple DirectMedia Layer library
  (www.libsdl.org).
+ .
+ This package contains files needed if you wish to use the SDL net
+ library in your own programs.
diff --git a/debian/docs b/debian/docs
index bda4248..e845566 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
-CHANGES
 README
diff --git a/debian/libsdl-net1.2-dev.dirs b/debian/libsdl-net1.2-dev.dirs
deleted file mode 100644
index 4418816..0000000
--- a/debian/libsdl-net1.2-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
diff --git a/debian/libsdl-net1.2-dev.files b/debian/libsdl-net1.2-dev.install
similarity index 77%
rename from debian/libsdl-net1.2-dev.files
rename to debian/libsdl-net1.2-dev.install
index 55f55ea..705b182 100644
--- a/debian/libsdl-net1.2-dev.files
+++ b/debian/libsdl-net1.2-dev.install
@@ -1,4 +1,4 @@
-usr/include/*
+usr/include
 usr/lib/lib*.a
 usr/lib/lib*.la
 usr/lib/lib*.so
diff --git a/debian/libsdl-net1.2.dirs b/debian/libsdl-net1.2.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libsdl-net1.2.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libsdl-net1.2.files b/debian/libsdl-net1.2.install
similarity index 100%
rename from debian/libsdl-net1.2.files
rename to debian/libsdl-net1.2.install
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 899b51b..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-10_arm
-20_endian
-30_UDP_Bind
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..272cd8e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+10_arm.dpatch
+20_endian.dpatch
+30_UDP_Bind.dpatch
diff --git a/debian/rules b/debian/rules
index c38facd..79ccb8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,106 +1,29 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PACKAGE=sdl-net1.2
-include /usr/share/dpatch/dpatch.make
+export DEB_BUILD_MAINT_OPTIONS := hardening=+pie,+bindnow
 
-CFLAGS=-Wall -g -I/usr/include/SDL/
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  CFLAGS+=-O0
-else
-  CFLAGS+=-O2
-endif
-ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-  STRIPARGS= --no-act
-endif
+CFLAGS +=	-pipe -Wall
+LDFLAGS +=	-Wl,--no-undefined -Wl,-Bsymbolic -Wl,--as-needed
+export CFLAGS LDFLAGS
 
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-# FOR AUTOCONF 2.52 AND NEWER ONLY
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  confflags += --build $(DEB_HOST_GNU_TYPE)
-else
-  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
+# according to help: speeds up one-time build
+confflags = --disable-dependency-tracking
 
 
-configure: patch-stamp configure-stamp
-configure-stamp:
-	dh_testdir
-	touch depcomp \
-	&& touch ltmain.sh \
-	&& touch configure.in \
-	&& touch aclocal.m4 \
-	&& touch configure \
-	&& touch Makefile.in
-	./configure --prefix=/usr \
-		$(confflags)
+%:
+	dh $@ --with autoreconf --parallel
 
-	touch configure-stamp
+override_dh_autoreconf:
+	dh_autoreconf ./autogen.sh
 
-build: patch-stamp configure-stamp build-stamp
-build-stamp:
-	dh_testdir
+override_dh_auto_configure:
+	dh_auto_configure -- $(confflags)
 
-	$(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS=-D_REENTRANT
-
-	touch build-stamp
-
-clean: patch clean1 unpatch
-clean1:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	-test -r /usr/share/misc/config.sub && \
-		cp -f /usr/share/misc/config.sub config.sub
-	-test -r /usr/share/misc/config.guess && \
-		cp -f /usr/share/misc/config.guess config.guess
-
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr/
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_movefiles
-
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_installchangelogs CHANGES
-	dh_link
-	dh_strip $(STRIPARGS)
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_auto_installchangelogs:
+	dh_auto_installchangelogs -- CHANGES
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
index e70aa28..39b79a3 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=2
-http://www.libsdl.org/projects/SDL_net/release/SDL_net-([0-9.]*)\.tar\.gz	debian	uupdate
+version=3
+http://www.libsdl.org/projects/SDL_net/release/SDL_net-([\d\.]+)\.tar\..*

-- 
Packaging of SDL_net

