[Python-apps-commits] r8329 - in packages/pyneighborhood/trunk/debian (8 files)

[adejong at users.alioth.debian.org]

    Date: Saturday, March 17, 2012 @ 12:43:37
  Author: adejong
Revision: 8329

  * Switch to dh_python2 (Closes: #591989, #616975).
  * Depend on cifs-utils instead of smbfs (Closes: #638160).
  * Switch to using the dh command sequencer.
  * Switch source format to 3.0 (quilt).
  * Switch to using the upstream code to install message catalogs.
  * Bump debhelper compatibility level to 9.

Modified:
  packages/pyneighborhood/trunk/debian/changelog
  packages/pyneighborhood/trunk/debian/compat
  packages/pyneighborhood/trunk/debian/control
  packages/pyneighborhood/trunk/debian/rules
  packages/pyneighborhood/trunk/debian/source/format
Deleted:
  packages/pyneighborhood/trunk/debian/dirs
  packages/pyneighborhood/trunk/debian/pycompat
  packages/pyneighborhood/trunk/debian/pyversions

Modified: packages/pyneighborhood/trunk/debian/changelog
===================================================================
--- packages/pyneighborhood/trunk/debian/changelog	2012-03-17 11:06:22 UTC (rev 8328)
+++ packages/pyneighborhood/trunk/debian/changelog	2012-03-17 12:43:37 UTC (rev 8329)
@@ -1,11 +1,17 @@
 pyneighborhood (0.5.1-1) UNRELEASED; urgency=low
 
-  * Import old changelog entries from previous releases.
   * Orphaning package.
   * Turn into non-native package.
+  * Import old changelog entries from previous releases.
   * Put package in Python Applications Packaging Team repository.
+  * Switch to dh_python2 (Closes: #591989, #616975).
+  * Depend on cifs-utils instead of smbfs (Closes: #638160).
+  * Switch to using the dh command sequencer.
+  * Switch source format to 3.0 (quilt).
+  * Switch to using the upstream code to install message catalogs.
+  * Bump debhelper compatibility level to 9.
 
- -- Arthur de Jong <adejong at debian.org>  Sat, 17 Mar 2012 12:00:52 +0100
+ -- Arthur de Jong <adejong at debian.org>  Sat, 17 Mar 2012 13:43:21 +0100
 
 pyneighborhood (0.5.1) unstable; urgency=low
 

Modified: packages/pyneighborhood/trunk/debian/compat
===================================================================
--- packages/pyneighborhood/trunk/debian/compat	2012-03-17 11:06:22 UTC (rev 8328)
+++ packages/pyneighborhood/trunk/debian/compat	2012-03-17 12:43:37 UTC (rev 8329)
@@ -1 +1 @@
-6
+9

Modified: packages/pyneighborhood/trunk/debian/control
===================================================================
--- packages/pyneighborhood/trunk/debian/control	2012-03-17 11:06:22 UTC (rev 8328)
+++ packages/pyneighborhood/trunk/debian/control	2012-03-17 12:43:37 UTC (rev 8329)
@@ -2,9 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Debian QA Group <packages at qa.debian.org>
-Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-XS-Python-Version: current
-Build-Depends: cdbs, debhelper (>= 6), python, python-central (>=0.5.15), python-support
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~)
 Standards-Version: 3.9.0
 Homepage: https://launchpad.net/pyneighborhood
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/pyneighborhood/trunk/
@@ -12,7 +10,7 @@
 
 Package: pyneighborhood
 Architecture: all
-Depends: smbfs, smbclient, python, python-gtk2, python-glade2, python-pysqlite2, samba-common, ${misc:Depends}
+Depends: cifs-utils, smbclient, python, python-gtk2, python-glade2, python-pysqlite2, samba-common, ${python:Depends}, ${misc:Depends}
 Description: PyGTK2 SAMBA browser
  pyNeighborhood is GTK2 Python rewrite of a well-known gtk1 tool
  "LinNeighborhood". It features group browser, favourite hosts

Deleted: packages/pyneighborhood/trunk/debian/dirs
===================================================================
--- packages/pyneighborhood/trunk/debian/dirs	2012-03-17 11:06:22 UTC (rev 8328)
+++ packages/pyneighborhood/trunk/debian/dirs	2012-03-17 12:43:37 UTC (rev 8329)
@@ -1 +0,0 @@
-usr/bin

Deleted: packages/pyneighborhood/trunk/debian/pycompat
===================================================================
--- packages/pyneighborhood/trunk/debian/pycompat	2012-03-17 11:06:22 UTC (rev 8328)
+++ packages/pyneighborhood/trunk/debian/pycompat	2012-03-17 12:43:37 UTC (rev 8329)
@@ -1 +0,0 @@
-2

Deleted: packages/pyneighborhood/trunk/debian/pyversions
===================================================================
--- packages/pyneighborhood/trunk/debian/pyversions	2012-03-17 11:06:22 UTC (rev 8328)
+++ packages/pyneighborhood/trunk/debian/pyversions	2012-03-17 12:43:37 UTC (rev 8329)
@@ -1 +0,0 @@
-2.5-

Modified: packages/pyneighborhood/trunk/debian/rules
===================================================================
--- packages/pyneighborhood/trunk/debian/rules	2012-03-17 11:06:22 UTC (rev 8328)
+++ packages/pyneighborhood/trunk/debian/rules	2012-03-17 12:43:37 UTC (rev 8329)
@@ -1,16 +1,13 @@
 #!/usr/bin/make -f
-  
-DEB_PYTHON_SYSTEM=pysupport
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
+export DH_VERBOSE=1
 
+%:
+	dh $@ --with python2
 
-
-install/pyneighborhood::
-	@for f in po/*po; do\
-		lang=`basename $$f .po | awk -F"_" '{print $$1}'` ;\
-		echo "  ** MSGFMT ** ($$f) ";\
-		mkdir -p $(CURDIR)/debian/pyneighborhood/usr/share/locale/$$lang/LC_MESSAGES ; \
-		msgfmt $$f -o $(CURDIR)/debian/pyneighborhood/usr/share/locale/$$lang/LC_MESSAGES/pyNeighborhood.mo;\
-	done
+# also install messages files and remove upstream Changelog file which
+# will also be installed by dh_installchangelog
+override_dh_auto_install:
+	dh_auto_install
+	rm -f $(CURDIR)/debian/pyneighborhood/usr/share/doc/pyneighborhood/Changelog
+	make -C po gmo install DESTDIR=$(CURDIR)/debian/pyneighborhood

Modified: packages/pyneighborhood/trunk/debian/source/format
===================================================================
--- packages/pyneighborhood/trunk/debian/source/format	2012-03-17 11:06:22 UTC (rev 8328)
+++ packages/pyneighborhood/trunk/debian/source/format	2012-03-17 12:43:37 UTC (rev 8329)
@@ -1 +1 @@
-1.0
+3.0 (quilt)