r338 - in /packages/gnash/trunk/debian: changelog rules

[miriam at users.alioth.debian.org]

Author: miriam
Date: Fri May  1 23:41:43 2009
New Revision: 338

URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=338
Log:
Cleaned debian/rules a bit. Thanks to Felix Salfelder <felix at salfelder.org>


Modified:
    packages/gnash/trunk/debian/changelog
    packages/gnash/trunk/debian/rules

Modified: packages/gnash/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/changelog?rev=338&op=diff
==============================================================================
--- packages/gnash/trunk/debian/changelog (original)
+++ packages/gnash/trunk/debian/changelog Fri May  1 23:41:43 2009
@@ -1,3 +1,9 @@
+gnash (0.8.5-2) UNRELEASED; urgency=low
+
+  * Cleaned debian/rules. Thanks to Felix Salfelder <felix at salfelder.org>
+
+ -- Miriam Ruiz <little_miry at yahoo.es>  Sat, 02 May 2009 01:45:35 +0200
+
 gnash (0.8.5-1) unstable; urgency=low
 
   * New Upstream Release.

Modified: packages/gnash/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/rules?rev=338&op=diff
==============================================================================
--- packages/gnash/trunk/debian/rules (original)
+++ packages/gnash/trunk/debian/rules Fri May  1 23:41:43 2009
@@ -31,11 +31,13 @@
 #major=`ls src/.libs/lib*.so.* | \
 # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
-patch:
+patch: patch-stamp
+patch-stamp:
 	dh_testdir
 	@printf "\n == APPLYING PATCHES ============================================ \n\n"
 	$(MAKE) -f /usr/share/quilt/quilt.make patch
 	@printf "\n ----------------------------------- End of APPLYING PATCHES ---- \n\n"
+	touch $@
 
 # CONFIGURE
 
@@ -61,7 +63,7 @@
 		--without-ming
 
 config: config-stamp
-config-stamp: patch
+config-stamp: patch-stamp
 	dh_testdir
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -77,16 +79,16 @@
 
 	@printf "\n == CONFIGURE / AGG ============================================= \n\n"
 	# In the future, I want to add LDFLAGS="-Wl,-z,defs"
-	if ! test -d tmp.agg; then \
-		mkdir tmp.agg && cd tmp.agg && ../configure VERSION="$(BUILD_VERSION)" $(CONFIGURE_FLAGS) --enable-media=ffmpeg --enable-renderer=agg  --enable-gui='gtk,kde4'; \
-	fi
+	if ! test -d tmp.agg; then printf "\ntmp.agg already exists!!!\n\n"; fi
+	test -d tmp.agg; || mkdir tmp.agg
+	cd tmp.agg && ../configure VERSION="$(BUILD_VERSION)" $(CONFIGURE_FLAGS) --enable-media=ffmpeg --enable-renderer=agg  --enable-gui='gtk,kde4'; \
 	@printf "\n ------------------------------------------- End of CONFIGURE ---- \n\n"
 
 	@printf "\n == CONFIGURE / OPENGL ========================================== \n\n"
 	# In the future, I want to add LDFLAGS="-Wl,-z,defs"
-	if ! test -d tmp.opengl; then \
-		mkdir tmp.opengl && cd tmp.opengl && ../configure VERSION="$(BUILD_VERSION)" $(CONFIGURE_FLAGS)  --enable-media=ffmpeg --enable-renderer=ogl --enable-gui='gtk'; \
-	fi
+	if ! test -d tmp.opengl; then printf "\ntmp.opengl already exists!!!\n\n"; fi
+	test -d tmp.opengl; || mkdir tmp.opengl
+	cd tmp.opengl && ../configure VERSION="$(BUILD_VERSION)" $(CONFIGURE_FLAGS)  --enable-media=ffmpeg --enable-renderer=ogl --enable-gui='gtk'; \
 	@printf "\n ------------------------------------------- End of CONFIGURE ---- \n\n"
 
 	cp libamf/README README.amf
@@ -124,7 +126,7 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f config-stamp build-stamp 
+	rm -f config-stamp build-stamp patch-stamp
 
 #ifeq (Makefile,$(wildcard Makefile))
 #	[ ! -f Makefile ] || $(MAKE) maintainer-clean
@@ -203,7 +205,7 @@
 binary-indep:
 
 # Build architecture-dependent files here.
-binary-arch: install
+binary-arch: install-stamp
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
@@ -225,7 +227,7 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
-	#dh_makeshlibs
+	dh_makeshlibs
 	[ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo
 	dh_installdeb
 	export LD_LIBRARY_PATH="$(CURDIR)/debian/gnash-common-opengl/usr/lib/gnash:$$LD_LIBRARY_PATH" ; \
@@ -265,4 +267,4 @@
 	cd "gnash-$(VERSION_ID)"; dch -v "$(VERSION_ID)-1" "New Upstream Release. Downloaded from Bazaar."
 
 binary: binary-indep binary-arch
-.PHONY: config build clean binary-indep binary-arch binary install get-orig-source
+.PHONY: config build clean binary-indep binary-arch binary install get-bzr-source patch