[Python-apps-commits] r3547 - in packages/phatch/trunk/debian (7 files)

piotr at users.alioth.debian.org piotr at users.alioth.debian.org
Wed Aug 26 19:37:55 UTC 2009 

    Date: Wednesday, August 26, 2009 @ 19:37:55
  Author: piotr
Revision: 3547

* Spliting out the package, new binary packages:
  - phatch-cli (command line interface)
  - phatch-nautilus (Python nautilus integration)
* debian/patches/phatch_use_correct_lang.patch:
  - removed, no longer needed
* Add blender and inkscape to phatch's Suggests
* Add imagemagick, libjpeg-progs, exiftran, xcftools and dcraw to
  phatch-cli's Recommends (new actions will use them)
* Add ttf-freefont and ttf-thai-tlwg to phatch-cli Depends (and add symlinks
  to use fonts from these packages instead of local copies)
* Bump Standards-Version to 3.8.3 (no changes needed)

Added:
  packages/phatch/trunk/debian/phatch-cli.links
  packages/phatch/trunk/debian/phatch-cli.menu
Modified:
  packages/phatch/trunk/debian/changelog
  packages/phatch/trunk/debian/control
  packages/phatch/trunk/debian/rules
Deleted:
  packages/phatch/trunk/debian/menu
  packages/phatch/trunk/debian/patches/

Modified: packages/phatch/trunk/debian/changelog
===================================================================
--- packages/phatch/trunk/debian/changelog	2009-08-26 17:11:26 UTC (rev 3546)
+++ packages/phatch/trunk/debian/changelog	2009-08-26 19:37:55 UTC (rev 3547)
@@ -1,7 +1,8 @@
-phatch (0.1.7-1) UNRELEASED; urgency=low
+phatch (0.2-1) UNRELEASED; urgency=low
 
   [ Stani M ]
-  * New upstream release (Closes LP: #198365, #252949, #270478, #297241, #304132, #311646, #352009, #378889)
+  * New upstream release (LP: #198365, #252949, #270478, #297241, #304132,
+    #311646, #352009, #378889)
   * debian/copyright:
     - Added copyrights for the new contributions.
   * debian/control:
@@ -25,10 +26,19 @@
     - Wrap depends.
 
   [ Piotr Ożarowski ]
-  * debian/patches/add_path_to_private_directory.patch:
-    - needed since we're using private directory for Phatch now
+  * debian/patches/phatch_use_correct_lang.patch:
+    - removed, no longer needed
+  * Spliting out the package, new binary packages:
+    - phatch-cli (command line interface)
+    - phatch-nautilus (Python nautilus integration)
+  * Add blender and inkscape to phatch's Suggests
+  * Add imagemagick, libjpeg-progs, exiftran, xcftools and dcraw to
+    phatch-cli's Recommends (new actions will use them)
+  * Add ttf-freefont and ttf-thai-tlwg to phatch-cli Depends (and add symlinks
+    to use fonts from these packages instead of local copies)
+  * Bump Standards-Version to 3.8.3 (no changes needed)
 
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Fri, 05 Dec 2008 11:17:43 +0100
+ -- Piotr Ożarowski <piotr at debian.org>  Tue, 25 Aug 2009 20:41:45 +0200
 
 phatch (0.1.6-1) unstable; urgency=low
 

Modified: packages/phatch/trunk/debian/control
===================================================================
--- packages/phatch/trunk/debian/control	2009-08-26 17:11:26 UTC (rev 3546)
+++ packages/phatch/trunk/debian/control	2009-08-26 19:37:55 UTC (rev 3547)
@@ -4,7 +4,7 @@
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Emilio Pozuelo Monfort <pochu at ubuntu.com>, Bernd Zeimetz <bzed at debian.org>,
  Stani M <spe.stani.be at gmail.com>, Piotr Ożarowski <piotr at debian.org>
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 Homepage: http://photobatch.stani.be
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/phatch/trunk/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/phatch/trunk/
@@ -19,18 +19,53 @@
 Architecture: all
 Depends: ${python:Depends},
          ${misc:Depends},
-         python-imaging,
+         python-cli,
+# move these to phatch-wx in the future:
          python-wxgtk2.8 | python-wxgtk2.6,
          python-wxversion,
+Suggests: blender, inkscape
+Enhances: thunar
+Description: simple to use Photo Batch Processor - GUI
+ 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.
+
+Package: phatch-cli
+Architecture: all
+Depends: ${python:Depends},
+         ${misc:Depends},
+         python-imaging,
+         python-notify,
          python-pyexiv2,
-         python-notify,
-         libtiff-tools
-Suggests: python-nautilus
-Enhances: nautilus, thunar
-Description: simple to use cross-platform GUI Photo Batch Processor
+         libtiff-tools,
+         ttf-freefont,
+         ttf-thai-tlwg
+# move Recommends to phatch-plugins if we'll decide to split out plugins:
+Recommends: xcftools,
+         dcraw,
+         imagemagick,
+         libjpeg-progs,
+         exiftran
+Description: simple to use Photo Batch Processor - command line interface
  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. Phatch also supports a console version to batch photos on
- web servers.
+ stamping.
+ .
+ This package contains command line interface to Phatch.
+
+Package: phatch-nautilus
+Architecture: all
+Depends: ${misc:Depends}, phatch, 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.

Deleted: packages/phatch/trunk/debian/menu
===================================================================
--- packages/phatch/trunk/debian/menu	2009-08-26 17:11:26 UTC (rev 3546)
+++ packages/phatch/trunk/debian/menu	2009-08-26 19:37:55 UTC (rev 3547)
@@ -1,5 +0,0 @@
-?package(phatch):needs="X11"\
- section="Applications/Graphics"\
- title="phatch"\
- description="Photo Batch Processor"\
- command="/usr/bin/phatch"

Added: packages/phatch/trunk/debian/phatch-cli.links
===================================================================
--- packages/phatch/trunk/debian/phatch-cli.links	                        (rev 0)
+++ packages/phatch/trunk/debian/phatch-cli.links	2009-08-26 19:37:55 UTC (rev 3547)
@@ -0,0 +1,2 @@
+/usr/share/fonts/truetype/freefont/FreeSans.ttf /usr/share/phatch/data/fonts/FreeSans.ttf
+/usr/share/fonts/truetype/thai/Purisa.ttf /usr/share/phatch/data/fonts/Purisa.ttf

Added: packages/phatch/trunk/debian/phatch-cli.menu
===================================================================
--- packages/phatch/trunk/debian/phatch-cli.menu	                        (rev 0)
+++ packages/phatch/trunk/debian/phatch-cli.menu	2009-08-26 19:37:55 UTC (rev 3547)
@@ -0,0 +1,5 @@
+?package(phatch-cli):needs="X11"\
+ section="Applications/Graphics"\
+ title="phatch"\
+ description="Photo Batch Processor"\
+ command="/usr/bin/phatch"

Modified: packages/phatch/trunk/debian/rules
===================================================================
--- packages/phatch/trunk/debian/rules	2009-08-26 17:11:26 UTC (rev 3546)
+++ packages/phatch/trunk/debian/rules	2009-08-26 19:37:55 UTC (rev 3547)
@@ -2,15 +2,26 @@
 
 DEB_PYTHON_SYSTEM := pysupport
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
-DEB_PYTHON_INSTALL_ARGS_ALL = --install-lib=usr/share/phatch
+PKG_P_DIR=$(CURDIR)/debian/phatch
+PKG_C_DIR=$(CURDIR)/debian/phatch-cli
+PKG_N_DIR=$(CURDIR)/debian/phatch-nautilus
 
-install/phatch::
-	install -m755 $(CURDIR)/debian/phatch-launcher $(CURDIR)/debian/phatch/usr/bin/phatch
+# install to phatch-cli by default and move files later
+DEB_PYTHON_INSTALL_ARGS_ALL = --install-lib=/usr/share/phatch --root=$(PKG_C_DIR)
 
-binary-install/phatch::
-	dh_desktop
+binary-install/phatch-cli::
+	find $(PKG_C_DIR) -name '*.py[co]' -delete
+
+binary-install/phatch:: binary-install/phatch-cli
+	mkdir -p $(PKG_P_DIR)/usr/share/phatch/phatch/phatch/lib
+	mv $(PKG_C_DIR)/usr/share/phatch/phatch/pyWx $(PKG_P_DIR)/usr/share/phatch/phatch/phatch
+	mv $(PKG_C_DIR)/usr/share/phatch/phatch/lib/pyWx $(PKG_P_DIR)/usr/share/phatch/phatch/phatch/lib
 	dh_icons
+
+binary-install/phatch-nautilus:: binary-install/phatch-cli
+	mkdir -p $(PKG_N_DIR)/usr/share/phatch/phatch/lib/linux/
+	mv $(PKG_C_DIR)/usr/lib $(PKG_N_DIR)/usr/
+	mv $(PKG_C_DIR)/usr/share/phatch/phatch/lib/linux/nautilusExtension.py $(PKG_N_DIR)/usr/share/phatch/phatch/lib/linux/

More information about the Python-apps-commits mailing list