[Gnash-commit] /srv/bzr/gnash/trunk r12139: edit the new distro field to match the host system

[Rob Savoye]

------------------------------------------------------------
revno: 12139
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Thu 2010-04-08 16:50:08 -0600
message:
  edit the new distro field to match the host system
modified:
  packaging/deb.am
  packaging/debian/rules

=== modified file 'packaging/deb.am'
--- a/packaging/deb.am  2010-03-24 22:25:04 +0000
+++ b/packaging/deb.am  2010-04-08 22:50:08 +0000
@@ -160,13 +160,30 @@
 # entry becomes the name of the source directory, the build directory, and
 # the packages. We do it this way so the snapshot matches the branch nickname
 # with the revision.
+# DIST is set in the environment when using pbuilder, so we use that so
+# our distribution matches the repoository. DIST is usually one of lenny,
+# squeeze, lucid, karmic, metad.
 deb-edit-changelog:
        @echo "Editing debian/changelog for snapshot: $(BUILD_VERSION)"
-       @if test -e $(BUILD_DIR)/debian/changelog; then \
+       if test x"$${DIST}" = x; then \
+         if test -e /etc/lsb-release; then \
+            . /etc/lsb-release; \
+           dist=$${DISTRIB_CODENAME}; \
+         else \
+           if test -x /usr/bin/lsb_release; then \
+             dist=`lsb_release -d | cut -d ' ' -f 4 | sed -e "s:(::" -e 
"s:)::"`; \
+           else \
+             dist="lenny"; \
+           fi; \
+         fi; \
+       else \
+         dist=$(DIST); \
+       fi; \
+       if test -e $(BUILD_DIR)/debian/changelog; then \
          mv -f $(BUILD_DIR)/debian/changelog 
$(BUILD_DIR)/debian/changelog.orig; \
-         sed -e "s:trunk:$(BUILD_VERSION):" $(BUILD_DIR)/debian/changelog.orig 
> $(BUILD_DIR)/debian/changelog; \
+         sed -e "s:trunk:$(BUILD_VERSION):" -e "s/distro/$${dist}/" 
$(srcdir)/packaging/debian/changelog > $(BUILD_DIR)/debian/changelog; \
        else \
-         sed -e "s:trunk:$(BUILD_VERSION):" 
$(srcdir)/packaging/debian/changelog > $(BUILD_DIR)/debian/changelog; \
+         sed -e "s:trunk:$(BUILD_VERSION):"  -e "s/distro/$${dist}/" 
$(srcdir)/packaging/debian/changelog > $(BUILD_DIR)/debian/changelog; \
        fi
 
 # Edit the configure scripts, so if somebody reconfigures from this tarball,

=== modified file 'packaging/debian/rules'
--- a/packaging/debian/rules    2010-04-05 01:00:56 +0000
+++ b/packaging/debian/rules    2010-04-08 22:50:08 +0000
@@ -121,7 +121,7 @@
 # Optionally build an VA API enabled package, which is very experimental,
 # so it's not enabled by default.
 ifneq (,$(findstring vaapi,$(DEB_BUILD_OPTIONS)))
-       BUILD_FLAGS += --enable-media=ffmpeg --enable-vaapi
+       BUILD_FLAGS += --enable-media=ffmpeg
        BUILD_DIRECTORY = _build.vaapi
        BUILD_VERSION = $(MAIN_VERSION).vaapi.$(BUILD_VERSION)
        BUILD_DEBUG = -vaapi