Package: gcompris
Version: 9.3-1
Severity: normal
Tags: patch pending

Dear maintainer,

I've prepared an NMU for gcompris (versioned as 9.3-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Cheers

Luk
diff -u gcompris-9.3/debian/rules gcompris-9.3/debian/rules
--- gcompris-9.3/debian/rules
+++ gcompris-9.3/debian/rules
@@ -27,7 +27,7 @@
 
  # --datadir=\$${prefix}/share/games causes problems to /usr/share/gnome/
 
-	./configure CFLAGS="-g -O2" LDFLAGS="-g" \
+	./configure CFLAGS="-g -O2" LDFLAGS="-g -lX11" \
 	  --prefix=/usr --mandir=/usr/share/man \
 	  --infodir=/usr/share/info --sysconfdir=/etc \
 	  --x-libraries=/usr/lib \
@@ -63,6 +63,7 @@
 	rm -f debian/tmp/usr/share/info/dir* debian/tmp/usr/lib/menu/*
  # this license text has been copied to debian/copyright
 	rm debian/tmp/usr/share/gcompris/boards/memory/Licence.txt
+	rm `find debian/tmp -name '*.la'`
 
 	cd debian/tmp/usr && mkdir -p games && mv bin/gcompris* games/
 	dh_movefiles
diff -u gcompris-9.3/debian/changelog gcompris-9.3/debian/changelog
--- gcompris-9.3/debian/changelog
+++ gcompris-9.3/debian/changelog
@@ -1,3 +1,12 @@
+gcompris (9.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop -DG{T,D}K_DISABLE_DEPRECATED (Closes: #622033).
+  * Add -lX11 to LDFLAGS (Closes: #554419).
+  * Don't ship .la files (Closes: #621261).
+
+ -- Luk Claes <l...@debian.org>  Fri, 17 Jun 2011 08:01:23 +0200
+
 gcompris (9.3-1) unstable; urgency=low
 
   * New upstream release.
only in patch2:
unchanged:
--- gcompris-9.3.orig/src/goocanvas/src/Makefile.am
+++ gcompris-9.3/src/goocanvas/src/Makefile.am
@@ -2,8 +2,7 @@
 
 INCLUDES = \
 	-DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED \
-	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
-	-DGTK_DISABLE_DEPRECATED \
+	-DGDK_PIXBUF_DISABLE_DEPRECATED \
 	-DG_LOG_DOMAIN=\"GooCanvas\" \
 	@GCOMPRIS_CFLAGS@
 
only in patch2:
unchanged:
--- gcompris-9.3.orig/src/goocanvas/src/Makefile.in
+++ gcompris-9.3/src/goocanvas/src/Makefile.in
@@ -312,8 +312,7 @@
 top_srcdir = @top_srcdir@
 INCLUDES = \
 	-DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED \
-	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
-	-DGTK_DISABLE_DEPRECATED \
+	-DGDK_PIXBUF_DISABLE_DEPRECATED \
 	-DG_LOG_DOMAIN=\"GooCanvas\" \
 	@GCOMPRIS_CFLAGS@
 

Reply via email to