[X2go-Commits] nx-libs.git - client-only (branch) updated: redist-client/3.5.0.1-6-g13df956

X2go dev team git-admin at x2go.org
Tue Jan 10 15:23:32 CET 2012


The branch, client-only has been updated
       via  13df9565af4ef80872275a2cf2d4cbda40050b18 (commit)
      from  d7fee697e798f9cd45260fb7af918b56ee211ab4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 13df9565af4ef80872275a2cf2d4cbda40050b18
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jan 10 15:23:25 2012 +0100

    Revert "Remove -X autom4te.cache from override_dh_clean in /debian/rules."
    
    This reverts commit eb19e114da385f402de27b59db821c55a546d9a0.
    
    Conflicts:
    
    	debian/changelog
    	debian/rules

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    1 -
 debian/rules     |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4eb3509..f21f3f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ nx-libs (3.5.0.2-2) UNRELEASED; urgency=low
   * Make nxproxy wrapper available via patch, not in /debian/bin folder.
   * Build with source format 3.0 (native) for the NX-redistributed project.
   * Fix nxproxy wrapper installation (dh_install).
-  * Remove -X autom4te.cache from override_dh_clean in /debian/rules.
   * Explicitly use quilt when building the package.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 10 Jan 2012 15:07:39 +0100
diff --git a/debian/rules b/debian/rules
index dd99735..3c6f02f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ endif
 override_dh_clean:
 	rm -f nxcomp/changelog
 	rm -f nxproxy/changelog
-	dh_clean --with quilt
+	dh_clean -X autom4te.cache
 
 override_dh_auto_build:
 	debian/pre-build-nx.sh


hooks/post-receive
-- 
nx-libs.git (NX libraries (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX libraries (redistributed)).




More information about the x2go-commits mailing list