The following commit has been merged in the master branch:
commit 16b4a4052dcb5a8065eff18b764389e334fd385a
Author: Christoph Egger <[EMAIL PROTECTED]>
Date: Sat May 24 11:38:47 2008 +0200
* Changing from cdbs to debhelper
* Changing from simplepatches to quilt
diff --git a/debian/control b/debian/control
index aa28596..f822286 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Games Team <[EMAIL PROTECTED]>
Uploaders: Christoph Egger <[EMAIL PROTECTED]>
Vcs-Git: git://git.debian.org/git/pkg-games/libsfml/
Vcs-Browser: http://git.debian.org/?p=pkg-games/libsfml.git;a=log
-Build-Depends: cdbs, debhelper (>= 5), libgl1-mesa-glx, mesa-common-dev,
libglu1-mesa-dev, libxrandr-dev, libfreetype6-dev, libopenal-dev,
libsndfile1-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libglew1.5-dev,
patchutils
+Build-Depends: debhelper (>= 5), libgl1-mesa-glx, mesa-common-dev,
libglu1-mesa-dev, libxrandr-dev, libfreetype6-dev, libopenal-dev,
libsndfile1-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libglew1.5-dev, quilt
Standards-Version: 3.7.3
Package: libsfml1-dev
diff --git a/debian/patches/10-change-link-to-removed-headers.diff
b/debian/patches/change_source_code_reference_to_removed_stuff.diff
similarity index 60%
rename from debian/patches/10-change-link-to-removed-headers.diff
rename to debian/patches/change_source_code_reference_to_removed_stuff.diff
index 69d6d55..d3b0bfe 100644
--- a/debian/patches/10-change-link-to-removed-headers.diff
+++ b/debian/patches/change_source_code_reference_to_removed_stuff.diff
@@ -1,5 +1,7 @@
---- a/src/SFML/Graphics/ImageLoader.cpp 2008-05-22 22:21:28.000000000
+0200
-+++ s/src/SFML/Graphics/ImageLoader.cpp 2008-05-22 21:41:39.000000000
+0200
+diff --git a/src/SFML/Graphics/ImageLoader.cpp
b/src/SFML/Graphics/ImageLoader.cpp
+index 9e4d4e9..55d91ce 100755
+--- a/src/SFML/Graphics/ImageLoader.cpp
++++ b/src/SFML/Graphics/ImageLoader.cpp
@@ -28,10 +28,10 @@
#include <SFML/Graphics/ImageLoader.hpp>
extern "C"
@@ -13,9 +15,11 @@
+#include <libpng/png.h>
#include <SFML/Graphics/SOIL/SOIL.h>
#include <iostream>
-
---- a/src/SFML/Window/Linux/WindowImplX11.cpp 2007-12-30 08:59:18.000000000
+0100
-+++ s/src/SFML/Window/Linux/WindowImplX11.cpp 2008-05-22 21:39:03.000000000
+0200
+
+diff --git a/src/SFML/Window/Linux/WindowImplX11.cpp
b/src/SFML/Window/Linux/WindowImplX11.cpp
+index 4d8c93f..4e3c063 100755
+--- a/src/SFML/Window/Linux/WindowImplX11.cpp
++++ b/src/SFML/Window/Linux/WindowImplX11.cpp
@@ -27,8 +27,8 @@
////////////////////////////////////////////////////////////
#include <SFML/Window/Linux/WindowImplX11.hpp>
@@ -26,4 +30,4 @@
+#include <GL/glext.h>
#include <X11/keysym.h>
#include <X11/XKBlib.h>
- #include <X11/extensions/Xrandr.h>
+ #include <X11/extensions/Xrandr.h>
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c25f8e0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+change_source_code_reference_to_removed_stuff.diff
diff --git a/debian/rules b/debian/rules
index e304987..1160f3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,79 @@
#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-# Add here any variable or target overrides you need.
-
-DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -C $(DEB_BUILDDIR)
-DEB_MAKE_CLEAN_TARGET = clean
-DEB_MAKE_BUILD_TARGET = all
-DEB_MAKE_INSTALL_TARGET = DESTDIR=$(CURDIR)/debian/tmp/ install
-DEB_DH_INSTALL_SOURCEDIR = debian/tmp
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+
+version=1.2.0
+major=1
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+# Add here commands to configure the package.
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+ touch configure-stamp
+
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+
+# Add here commands to compile the package.
+ $(MAKE) sfml
+
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+# Add here commands to clean up after the build process.
+ $(MAKE) clean
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+# Add here commands to install the package into debian/tmp
+ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+
+
+# 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_installchangelogs
+ dh_installdocs
+ dh_installexamples
+ dh_install --fail-missing --sourcedir=debian/tmp
+# dh_installmenu
+# dh_installdebconf
+# dh_installpam
+# dh_installmime
+# dh_installinfo
+ dh_installman
+ dh_link
+ dh_strip
+ 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
--
Simple and fast multimedia library for C++
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
