[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. upstream/2.0.0_beta3-507-g6676be2

[Per Olofsson]

The following commit has been merged in the master branch:
commit 6676be2d64ee3c4bcb4a6478a26e2eecff2e2fc4
Author: Per Olofsson <pelle at dsv.su.se>
Date:   Thu Feb 3 16:52:57 2011 +0100

    Revert "Compress debs with xz instead of bzip2." Doesn't work with dak
    yet.
    
    This reverts commit 3d851a992956a371f9e831d5c9bb389904dba2d3.
    
    Conflicts:
    
    	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index eb16f74..8ced0e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,7 +22,6 @@ lyx (2.0.0~beta3-2) UNRELEASED; urgency=low
     mechanism is available.
   * Switch source format to 3.0 (quilt) and remove quilt references in
     rules and control.
-  * Compress debs with xz instead of bzip2.
   * Use "dh --with autotools_dev" instead of replacing
     config.{sub,guess} manually.
   * Un-version debhelper build dependency.
diff --git a/debian/rules b/debian/rules
index bfd5a11..9ce71b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,4 +94,4 @@ override_dh_install:
 	dh_installdefoma -pttf-lyx
 
 override_dh_builddeb:
-	dh_builddeb -- -Z xz
+	dh_builddeb -- -Z bzip2

-- 
LyX packaging