[Python-apps-commits] r9996 - in packages/phatch/trunk/debian (4 files)

piotr at users.alioth.debian.org piotr at users.alioth.debian.org
Sat Aug 31 20:36:02 UTC 2013 

    Date: Saturday, August 31, 2013 @ 20:36:00
  Author: piotr
Revision: 9996

merge with 0.2.7.1-2 upload

Modified:
  packages/phatch/trunk/debian/changelog
  packages/phatch/trunk/debian/compat
  packages/phatch/trunk/debian/control
  packages/phatch/trunk/debian/rules

Modified: packages/phatch/trunk/debian/changelog
===================================================================
--- packages/phatch/trunk/debian/changelog	2013-08-31 20:34:02 UTC (rev 9995)
+++ packages/phatch/trunk/debian/changelog	2013-08-31 20:36:00 UTC (rev 9996)
@@ -10,6 +10,10 @@
   [ Piotr Ożarowski ]
   * do_not_raise_string_exceptions.patch removed (applied upstream)
 
+ -- Barry Warsaw <barry at python.org>  Wed, 22 May 2013 15:39:50 -0400
+
+phatch (0.2.7.1-2) unstable; urgency=low
+
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
@@ -18,8 +22,19 @@
     - Depend on python-imaging-compat since PILcompat.pth is necessary to
       expose the required imports.  (Closes: #709370)
 
- -- Barry Warsaw <barry at python.org>  Wed, 22 May 2013 15:39:50 -0400
+  [ Piotr Ożarowski ]
+  * Replace ttf-thai-tlwg dependency with fonts-thai-tlwg and ttf-freefont
+    with fonts-freefont-ttf (closes: #709763)
+  * Convert from pysupport to dh_python2, add dh-python to Build-Depends
+    (closes: #658852)
+  * Convert from cdbs to dh (and pybuild build system)
+  * python-nautilus removed from Build-Depends (closes: #644979)
+  * Byte-compile Python files in phatch-cli package (closes: #659880)
+  * Bump Standards-Version to 3.9.4 (no changes needed)
+  * Bump debian/compat to 9
 
+ -- Piotr Ożarowski <piotr at debian.org>  Sat, 31 Aug 2013 20:35:18 +0200
+
 phatch (0.2.7.1-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/phatch/trunk/debian/compat
===================================================================
--- packages/phatch/trunk/debian/compat	2013-08-31 20:34:02 UTC (rev 9995)
+++ packages/phatch/trunk/debian/compat	2013-08-31 20:36:00 UTC (rev 9996)
@@ -1 +1 @@
-5
+9

Modified: packages/phatch/trunk/debian/control
===================================================================
--- packages/phatch/trunk/debian/control	2013-08-31 20:34:02 UTC (rev 9995)
+++ packages/phatch/trunk/debian/control	2013-08-31 20:36:00 UTC (rev 9996)
@@ -3,19 +3,18 @@
 Priority: optional
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, 
- Stani M <spe.stani.be at gmail.com>, Piotr Ożarowski <piotr at debian.org>
-Standards-Version: 3.8.4
+ Stani M <spe.stani.be at gmail.com>,
+ Piotr Ożarowski <piotr at debian.org>
+Standards-Version: 3.9.4
 Homepage: http://photobatch.stani.be
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/phatch/trunk/
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/phatch/trunk/
-Build-Depends: debhelper (>= 5.0.51),
-               cdbs (>= 0.4.43),
-               python (>= 2.3.5-11)
-Build-Depends-Indep: python-support (>= 0.5.3),
-                     python-nautilus,
-                     pkg-config,
-                     python-sphinx,
-                     locate
+Build-Depends: debhelper (>= 9),
+ python,
+ dh-python,
+ pkg-config,
+ python-sphinx,
+ locate
 
 Package: phatch
 Architecture: all
@@ -45,10 +44,10 @@
          ${misc:Depends},
          python-imaging, python-imaging-compat,
          python-notify,
-         python-pyexiv2,
+         python-pyexiv2 (>= 0.3),
          libtiff-tools,
-         ttf-freefont,
-         ttf-thai-tlwg,
+         fonts-freefont-ttf,
+         fonts-thai-tlwg,
          locate | mlocate
 # move Recommends to phatch-plugins if we'll decide to split out plugins:
 Recommends: xcftools,
@@ -64,18 +63,18 @@
  .
  This package contains command line interface to Phatch.
 
-Package: phatch-nautilus
-Architecture: all
-Depends: ${misc:Depends}, phatch, nautilus, python-nautilus
-Enhances: nautilus
-Description: simple to use Photo Batch Processor - Nautilus scripts
- Phatch handles all popular image formats and can duplicate (sub)folder
- hierarchies. It can batch resize, rotate, apply perspective, shadows, rounded
- corners, ... and more in minutes instead of hours or days if you do it
- manually. Phatch allows you to use EXIF and IPTC tags for renaming and data
- stamping.
- .
- This package integrates Phatch with Nautilus.
+#Package: phatch-nautilus
+#Architecture: all
+#Depends: ${misc:Depends}, phatch, nautilus, python-nautilus
+#Enhances: nautilus
+#Description: simple to use Photo Batch Processor - Nautilus scripts
+# Phatch handles all popular image formats and can duplicate (sub)folder
+# hierarchies. It can batch resize, rotate, apply perspective, shadows, rounded
+# corners, ... and more in minutes instead of hours or days if you do it
+# manually. Phatch allows you to use EXIF and IPTC tags for renaming and data
+# stamping.
+# .
+# This package integrates Phatch with Nautilus.
 
 Package: phatch-doc
 Architecture: all

Modified: packages/phatch/trunk/debian/rules
===================================================================
--- packages/phatch/trunk/debian/rules	2013-08-31 20:34:02 UTC (rev 9995)
+++ packages/phatch/trunk/debian/rules	2013-08-31 20:36:00 UTC (rev 9996)
@@ -1,39 +1,30 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM := pysupport
-DEB_COMPRESS_EXCLUDE += objects.inv
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
 PKG_P_DIR=$(CURDIR)/debian/phatch
 PKG_C_DIR=$(CURDIR)/debian/phatch-cli
 PKG_D_DIR=$(CURDIR)/debian/phatch-doc
 PKG_N_DIR=$(CURDIR)/debian/phatch-nautilus
 
-# install to phatch-cli by default and move files later
-DEB_PYTHON_INSTALL_ARGS_ALL = --install-lib=/usr/share/phatch --prefix=/usr --root=$(PKG_C_DIR)
+%:
+	dh $@ --with python2 --buildsystem=pybuild 
 
-binary-install/phatch-cli::
+override_dh_auto_install:
+	# install to phatch-cli by default and move files later
+	PYBUILD_INSTALL_ARGS="--install-lib=/usr/share/phatch --prefix=/usr --root=$(PKG_C_DIR)" \
+	dh_auto_install
 	rm -rf $(PKG_C_DIR)/usr/share/phatch/docs # install_data creates it
 	find $(PKG_C_DIR) -name '*.py[co]' -delete
 	sed -i -e "s|import phatch|sys.path.insert(0,'/usr/share/phatch/');import phatch|" $(PKG_C_DIR)/usr/bin/phatch
-
-binary-install/phatch:: binary-install/phatch-cli
-	dh_installdirs
+	
 	mv $(PKG_C_DIR)/usr/share/phatch/phatch/pyWx $(PKG_P_DIR)/usr/share/phatch/phatch
 	mv $(PKG_C_DIR)/usr/share/phatch/phatch/lib/pyWx $(PKG_P_DIR)/usr/share/phatch/phatch/lib
 	mv $(PKG_C_DIR)/usr/share/applications $(PKG_P_DIR)/usr/share
-	dh_icons
 	cp $(CURDIR)/debian/phatch.lintian $(PKG_P_DIR)/usr/share/lintian/overrides/phatch
-
-binary-install/phatch-nautilus:: binary-install/phatch-cli
+	
 	mkdir -p $(PKG_N_DIR)/usr/share/phatch/phatch/lib/linux/
 	mv $(PKG_C_DIR)/usr/share/phatch/phatch/lib/linux/nautilusExtension.py\
 	   $(PKG_N_DIR)/usr/share/phatch/phatch/lib/linux/
-
-binary-install/phatch-doc::
-	dh_installdirs
+	
 	cd docs && python update.py
 	dh_install -p phatch-doc docs/build/html /usr/share/doc/phatch/
 	dh_link -p phatch-doc /usr/share/javascript/jquery/jquery.js \
@@ -42,5 +33,10 @@
 	echo "phatch-doc: extra-license-file usr/share/doc/phatch/html/_sources/data.license.txt" \
 		>> $(PKG_D_DIR)/usr/share/lintian/overrides/phatch-doc
 
-clean::
-	rm -rf docs/build
+override_dh_python2:
+	dh_python2
+	dh_python2 -p phatch-cli /usr/share/phatch/phatch
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build docs/build debian/phatch-nautilus/

More information about the Python-apps-commits mailing list