[SCM] x264 packaging branch, master, updated. debian/0.svn20090621+git364d7d-1-11-g23b5e69

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a80f670c4650dab337d821885adab6ca67c2f086
Merge: 4014a535c8d43c6f9ca9273805e4d63e0d3e15bd 77f178c4e4c9aeda894b9c67f9003183a84f8b14
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jun 26 16:54:50 2009 +0200

    Merge commit 'origin/master'

diff --combined debian/changelog
index 9437b4c,e48679c..c71edd4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,21 +1,42 @@@
 +x264 (1:0.svn20090621+git364d7d-1) unstable; urgency=low
 +
 +  * Target for debian
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 25 Jun 2009 18:18:58 +0200
 +
 +x264 (1:0.svn20090621+git364d7d-0ubuntu2) karmic; urgency=low
 +
 +  * update symbol files with architecture specific symbols.
 +  * remove reference to the now removed bime version, LP: #371786
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 21 Jun 2009 18:18:51 +0200
 +
 +x264 (1:0.svn20090621+git364d7d-0ubuntu1) karmic; urgency=low
 +
 +  * New Upstream Version
 +  * add symbols file
 +  * make dh_makeshlibs less strict
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 21 Jun 2009 11:22:31 +0200
 +
  x264 (1:0.svn20090502-0.0ubuntu2) karmic; urgency=low
  
+   [ Reinhard Tartler ]
    * take over marillats package under the umbrella of pkg-multimedia
  
-  -- Reinhard Tartler <siretart at tauware.de>  Sun, 14 Jun 2009 17:49:13 +0200
+   [ Fabian Greffrath ]
+   * Added myself to uploaders.
+   * Append to CFLAGS/LDFLAGS instead of overriding.
+   * Clean up CFLAGS.
+   * Remove -Wl,--as-needed from LDFLAGS. It has become unnecessary since
+     we don't link against GTK+ anymore. Redundant linking of the
+     frontend against -lX11 and -lm doesn't hurt, because the shared
+     library links against them anyway.
+   * Add one confflag per line, makes it easier to track minor changes.
+   * Repeat the last change for the shared_confflags.
+   * Kill some whitespace from debian/rules to improve readability.
+ 
+  -- Fabian Greffrath <fabian at greffrath.com>  Mon, 15 Jun 2009 12:48:53 +0200
  
  x264 (1:0.svn20090502-0.0ubuntu1) karmic; urgency=low
  
diff --combined debian/rules
index 30f978c,5f42d9e..97f52f4
--- a/debian/rules
+++ b/debian/rules
@@@ -8,29 -8,26 +8,26 @@@ include /usr/share/quilt/quilt.mak
  # This has to be exported to make some magic below work.
  export DH_OPTIONS
  
- DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
- DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
  
  NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
  ifeq ($(NCPUS),-1)
  	NCPUS:=1
  endif
- 
  ifeq ($(NCPUS),0)
  	NCPUS:=1
  endif
  
- confflags = --enable-pthread --prefix=/usr --enable-debug
+ confflags += --enable-debug
+ confflags += --enable-pthread
+ confflags += --prefix=/usr
  
- CFLAGS = -Wall -g
- LDFLAGS = -Wl,--as-needed
+ shared_confflags += --enable-pic
+ shared_confflags += --enable-shared
+ shared_confflags += --enable-visualize
  
- ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- 	CFLAGS += -O0
- else
- 	CFLAGS += -O2
- endif
+ CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
  
  build: build-stamp
  build-stamp: debian/stamp-patched
@@@ -45,10 -42,7 +42,7 @@@
  
  	# Build shared lib
  	$(MAKE) clean
- 
- 	CFLAGS="$(CFLAGS)" ./configure $(confflags) --enable-shared \
- 	--enable-pic --enable-visualize
- 
+ 	CFLAGS="$(CFLAGS)" ./configure $(confflags) $(shared_confflags)
  	$(MAKE) -j $(NCPUS)
  
  	# Restore static lib
@@@ -82,7 -76,7 +76,7 @@@ binary-common
  	dh_strip
  	dh_compress
  	dh_fixperms
 -	dh_makeshlibs -V
 +	dh_makeshlibs
  	dh_installdeb
  	dh_shlibdeps
  	dh_gencontrol

-- 
x264 packaging