[Restricted-changes] r164 - in dists/trunk/hot-babe/debian: . patches

[fabian-guest at alioth.debian.org]

Author: fabian-guest
Date: 2008-02-10 18:23:33 +0000 (Sun, 10 Feb 2008)
New Revision: 164

Added:
   dists/trunk/hot-babe/debian/patches/01_cflags-ldflags.patch
Removed:
   dists/trunk/hot-babe/debian/patches/00list
   dists/trunk/hot-babe/debian/patches/01-override-cflags.dpatch
Modified:
   dists/trunk/hot-babe/debian/control
   dists/trunk/hot-babe/debian/rules
Log:
hot-babe:
- no need to depend on dpatch for only one patch
- improved patch to also consider ldflags
- bumped build-depends on cdbs
- defined ldflags in rules


Modified: dists/trunk/hot-babe/debian/control
===================================================================
--- dists/trunk/hot-babe/debian/control	2008-01-15 22:03:08 UTC (rev 163)
+++ dists/trunk/hot-babe/debian/control	2008-02-10 18:23:33 UTC (rev 164)
@@ -6,9 +6,8 @@
            Daniel Baumann <daniel at debian.org>
 Origin: debian-unofficial.org
 Bugs: mailto:restricted-devel at lists.alioth.debian.org
-Build-Depends: cdbs,
+Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
-               dpatch,
                libgtk2.0-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/hot-babe/

Deleted: dists/trunk/hot-babe/debian/patches/00list
===================================================================
--- dists/trunk/hot-babe/debian/patches/00list	2008-01-15 22:03:08 UTC (rev 163)
+++ dists/trunk/hot-babe/debian/patches/00list	2008-02-10 18:23:33 UTC (rev 164)
@@ -1 +0,0 @@
-01-override-cflags

Deleted: dists/trunk/hot-babe/debian/patches/01-override-cflags.dpatch
===================================================================
--- dists/trunk/hot-babe/debian/patches/01-override-cflags.dpatch	2008-01-15 22:03:08 UTC (rev 163)
+++ dists/trunk/hot-babe/debian/patches/01-override-cflags.dpatch	2008-02-10 18:23:33 UTC (rev 164)
@@ -1,30 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-override-cflags.dpatch by Fabian Greffrath <fabian at debian-unofficial.org>
-##
-## DP: Make CFLAGS overridable.
-
- at DPATCH@
-
-diff -Naru hot-babe-0.2.2.orig/Makefile hot-babe-0.2.2/Makefile
---- hot-babe-0.2.2.orig/Makefile	2004-12-05 00:49:30.000000000 +0100
-+++ hot-babe-0.2.2/Makefile	2007-10-26 13:53:54.000000000 +0200
-@@ -3,7 +3,8 @@
- VERSION := 0.2.2
- 
- # optimization cflags
--CFLAGS += -O2 -Wall -g `pkg-config gdk-2.0 gdk-pixbuf-2.0  --cflags` -DPREFIX=\"$(PREFIX)\" -DVERSION=\"$(VERSION)\"
-+CFLAGS += -O2 -Wall -g
-+ALL_CFLAGS += `pkg-config gdk-2.0 gdk-pixbuf-2.0  --cflags` -DPREFIX=\"$(PREFIX)\" -DVERSION=\"$(VERSION)\" $(CFLAGS)
- 
- OBJS = hot-babe.o loader.o
- CC = gcc
-@@ -11,6 +11,9 @@
- 
- DOC = ChangeLog NEWS TODO LICENSE CONTRIBUTORS copyright config.example
- 
-+%.o: %.c
-+	$(CC) $(ALL_CFLAGS) -c $< -o $@
-+
- all: hot-babe
- 
- hot-babe: $(OBJS)

Added: dists/trunk/hot-babe/debian/patches/01_cflags-ldflags.patch
===================================================================
--- dists/trunk/hot-babe/debian/patches/01_cflags-ldflags.patch	                        (rev 0)
+++ dists/trunk/hot-babe/debian/patches/01_cflags-ldflags.patch	2008-02-10 18:23:33 UTC (rev 164)
@@ -0,0 +1,28 @@
+diff -Nur hot-babe-0.2.2/Makefile hot-babe-0.2.2.new/Makefile
+--- hot-babe-0.2.2/Makefile
++++ hot-babe-0.2.2.new/Makefile
+@@ -3,7 +3,8 @@
+ VERSION := 0.2.2
+ 
+ # optimization cflags
+-CFLAGS += -O2 -Wall -g `pkg-config gdk-2.0 gdk-pixbuf-2.0  --cflags` -DPREFIX=\"$(PREFIX)\" -DVERSION=\"$(VERSION)\"
++CFLAGS += -O2 -Wall -g
++ALL_CFLAGS += `pkg-config gdk-2.0 gdk-pixbuf-2.0  --cflags` -DPREFIX=\"$(PREFIX)\" -DVERSION=\"$(VERSION)\" $(CFLAGS)
+ 
+ OBJS = hot-babe.o loader.o
+ CC = gcc
+@@ -11,10 +12,13 @@
+ 
+ DOC = ChangeLog NEWS TODO LICENSE CONTRIBUTORS copyright config.example
+ 
++%.o: %.c
++	$(CC) $(ALL_CFLAGS) -c $< -o $@
++
+ all: hot-babe
+ 
+ hot-babe: $(OBJS)
+-	$(CC) -o hot-babe $(OBJS) $(LIBS)
++	$(CC) -o hot-babe $(OBJS) $(LDFLAGS) $(LIBS)
+ 
+ clean:
+ 	rm -f hot-babe *.o

Modified: dists/trunk/hot-babe/debian/rules
===================================================================
--- dists/trunk/hot-babe/debian/rules	2008-01-15 22:03:08 UTC (rev 163)
+++ dists/trunk/hot-babe/debian/rules	2008-02-10 18:23:33 UTC (rev 164)
@@ -2,8 +2,10 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+
 DEB_MAKE_BUILD_TARGET += PREFIX=/usr
 DEB_MAKE_INSTALL_TARGET += install PREFIX=/usr DESTDIR=$(CURDIR)/debian/hot-babe DOC="NEWS TODO CONTRIBUTORS"