X2Go dev team | 10 Oct 21:38 2012

python-paramiko.git - x2go (branch) updated: 6bc01beb208adaf901ac7ae6e493f09037bb410a

The branch, x2go has been updated
       via  6bc01beb208adaf901ac7ae6e493f09037bb410a (commit)
       via  38bf235ec8e6a5ec194ac2b2455e56f5406c7c5b (commit)
       via  7169501b27e2ceefde40eae8679a5c8af1aa8e5f (commit)
       via  3a6e6b68dcba9721acbb291a9c2f3c4d967b3a5f (commit)
       via  c9a778ef578984871f98732cc14646f8d2f47a7a (commit)
      from  d0835c69a890584b075a08407bd6bc6a871a5a3f (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 6bc01beb208adaf901ac7ae6e493f09037bb410a
Author: Mike Gabriel <mike.gabriel@...>
Date:   Wed Oct 10 21:38:17 2012 +0200

    no upstream Makefile for .deb package building

commit 38bf235ec8e6a5ec194ac2b2455e56f5406c7c5b
Author: Mike Gabriel <mike.gabriel@...>
Date:   Wed Oct 10 21:29:33 2012 +0200

    drop all patches again

commit 7169501b27e2ceefde40eae8679a5c8af1aa8e5f
Author: Mike Gabriel <mike.gabriel@...>
Date:   Wed Oct 10 21:28:52 2012 +0200

    allow non-dh_python2 builds, move epydoc build logic into /debian/rules

commit 3a6e6b68dcba9721acbb291a9c2f3c4d967b3a5f
Author: Mike Gabriel <mike.gabriel@...>
Date:   Wed Oct 10 21:28:12 2012 +0200

    build-depend on debhelper (>= 8.0.0~)

commit c9a778ef578984871f98732cc14646f8d2f47a7a
Author: Mike Gabriel <mike.gabriel@...>
Date:   Wed Oct 10 21:27:46 2012 +0200

    fix upstream version in /debian/changelog

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

Summary of changes:
 debian/changelog                                   |    2 +-
 debian/control                                     |    3 ++-
 debian/patches/001_no-register+upload.patch        |    9 ---------
 debian/patches/001_no-upstream-Makefile            |   18 ++++++++++++++++++
 .../002_no-testing-fails-in-build-chroot.patch     |   10 ----------
 debian/patches/series                              |    3 +--
 debian/rules                                       |   10 ++++++++--
 7 files changed, 30 insertions(+), 25 deletions(-)
 delete mode 100644 debian/patches/001_no-register+upload.patch
 create mode 100644 debian/patches/001_no-upstream-Makefile
 delete mode 100644 debian/patches/002_no-testing-fails-in-build-chroot.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b189f58..9638db5 100644
--- a/debian/changelog
+++ b/debian/changelog
 <at>  <at>  -1,4 +1,4  <at>  <at> 
-paramiko (1.8-0~git20121009) unstable; urgency=low
+paramiko (1.8.0-0~git20121009) unstable; urgency=low

   * Re-use packaging folder from Debian.
   * Package latest Git version on http://github.com/paramiko
diff --git a/debian/control b/debian/control
index 7b1910d..897436f 100644
--- a/debian/control
+++ b/debian/control
 <at>  <at>  -5,7 +5,7  <at>  <at>  Maintainer: Jeremy T. Bouse <jbouse@...>
 Uploaders:
  Guido Guenther <agx@...>,
  Mike Gabriel <mike.gabriel@...>
-Build-Depends: debhelper (> 7.0.50~),
+Build-Depends: debhelper (>= 8.0.0~),
 	python-all (>= 2.6.5-0~),
 	python-crypto (>= 2.1.0-2),
         python-epydoc,
 <at>  <at>  -14,6 +14,7  <at>  <at>  Standards-Version: 3.9.3
 Homepage: http://github.com/paramiko
 Vcs-Git: git://code.x2go.org/python-paramiko.git
 Vcs-Browser: http://code.x2go.org/gitweb?p=python-paramiko.git;a=shortlog;h=refs/heads/x2go
+X-Python-Version: >=2.3

 Package: python-paramiko
 Architecture: all
diff --git a/debian/patches/001_no-register+upload.patch b/debian/patches/001_no-register+upload.patch
deleted file mode 100644
index bce5664..0000000
--- a/debian/patches/001_no-register+upload.patch
+++ /dev/null
 <at>  <at>  -1,9 +0,0  <at>  <at> 
---- a/Makefile
-+++ b/Makefile
- <at>  <at>  -1,5 +1,5  <at>  <at> 
- release: docs
--	python setup.py sdist register upload
-+	python setup.py sdist
- 
- docs:
- 	epydoc --no-private -o docs/ paramiko
diff --git a/debian/patches/001_no-upstream-Makefile b/debian/patches/001_no-upstream-Makefile
new file mode 100644
index 0000000..438897f
--- /dev/null
+++ b/debian/patches/001_no-upstream-Makefile
 <at>  <at>  -0,0 +1,18  <at>  <at> 
+--- a/Makefile
++++ /dev/null
+ <at>  <at>  -1,15 +0,0  <at>  <at> 
+-release: docs
+-	python setup.py sdist register upload
+-
+-docs:
+-	epydoc --no-private -o docs/ paramiko
+-
+-clean:
+-	rm -rf build dist docs
+-	rm -f MANIFEST *.log demos/*.log
+-	rm -f paramiko/*.pyc
+-	rm -f test.log
+-	rm -rf paramiko.egg-info
+-
+-test:
+-	python ./test.py
diff --git a/debian/patches/002_no-testing-fails-in-build-chroot.patch b/debian/patches/002_no-testing-fails-in-build-chroot.patch
deleted file mode 100644
index 4ef61bb..0000000
--- a/debian/patches/002_no-testing-fails-in-build-chroot.patch
+++ /dev/null
 <at>  <at>  -1,10 +0,0  <at>  <at> 
---- a/Makefile
-+++ b/Makefile
- <at>  <at>  -11,5 +11,5  <at>  <at> 
- 	rm -f test.log
- 	rm -rf paramiko.egg-info
- 
--test:
--	python ./test.py
-+#test:
-+#	python ./test.py
diff --git a/debian/patches/series b/debian/patches/series
index 3a3a510..340df87 100644
--- a/debian/patches/series
+++ b/debian/patches/series
 <at>  <at>  -1,2 +1  <at>  <at> 
-001_no-register+upload.patch
-002_no-testing-fails-in-build-chroot.patch
+001_no-upstream-Makefile
diff --git a/debian/rules b/debian/rules
index bfba3cc..21c415c 100755
--- a/debian/rules
+++ b/debian/rules
 <at>  <at>  -1,13 +1,19  <at>  <at> 
 #!/usr/bin/make -f

+WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
+
 %:
-	dh $ <at>  --with python2 --with quilt
+	dh ${ <at> } ${WITH_PYTHON2} --with quilt
+
+override_dh_auto_build:
+	epydoc --no-private -o docs/ paramiko
+	dh_auto_build

 # Commands not to run
+override_dh_auto_test:
 override_dh_installcatalogs override_dh_installcron:
 override_dh_installdebconf override_dh_installemacsen override_dh_installifupdown:
 override_dh_installinfo override_dh_installinit override_dh_installmenu override_dh_installmime:
 override_dh_installmodules override_dh_installlogcheck override_dh_installlogrotate:
 override_dh_installpam override_dh_installppp override_dh_installudev override_dh_installwm:
 override_dh_installxfonts override_dh_gconf override_dh_icons override_dh_perl override_dh_usrlocal:
-override_dh_auto_test:
\ No newline at end of file

hooks/post-receive

Gmane