[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg: Changes to 'debian-unstable'



 debian/changelog |    4 ++--
 debian/rules     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f35f44fdf4e933f3078e09d4862155baa03dbe3e
Author: David Nusinow <dnusinow@debian.org>
Date:   Thu Sep 3 20:20:29 2009 -0400

    Revert dh_clean change from last upload but use dh_prep instead

diff --git a/debian/changelog b/debian/changelog
index 77cbb7d..70b0be5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 xorg (1:7.4+5) UNRELEASED; urgency=low
 
   * Update xsfbs to 5693792171d885769e58dcccc053c08b11acd12a
-
+  * Revert dh_clean change from last upload but use dh_prep instead
+  
  -- David Nusinow <dnusinow@debian.org>  Wed, 26 Aug 2009 23:27:18 -0400
 
 xorg (1:7.4+4) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 0e86a55..e0902f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	umask 022
-	dh_clean -k
+	dh_prep
 	chmod 755 debian/local/debian-setup-keyboard
 	touch $@
 

commit c782fddc35aa8632ea22260b70de05dad00b94ef
Author: David Nusinow <dnusinow@debian.org>
Date:   Thu Sep 3 20:19:21 2009 -0400

    Revert "Remove obsolete and misplaced -k flag on a dh_clean"
    
    This reverts commit 554513e48c54e0cd3a2d5dfcae8b770ccfe7b6bd.

diff --git a/debian/changelog b/debian/changelog
index 78978ac..77cbb7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,7 +27,6 @@ xorg (1:7.4+4) unstable; urgency=low
   * Bump debhelper compat to v7. No changes necessary.
   * Rename stamps to take advantage of dh_clean v7 handling them automatically
   * Bump standards version to 3.8.2. No changes necessary.
-  * Remove obsolete and misplaced -k flag on a dh_clean
   
  -- David Nusinow <dnusinow@debian.org>  Thu, 13 Aug 2009 21:19:12 -0400
 
diff --git a/debian/rules b/debian/rules
index 5c26be2..0e86a55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	umask 022
-	dh_clean
+	dh_clean -k
 	chmod 755 debian/local/debian-setup-keyboard
 	touch $@
 


Reply to: