massive overhaul of directory to make it work nicer with .deb generation

Kilian · Mar 23, 2010 · 8dcec26 · 8dcec26
1 parent 41672b8
commit 8dcec26
Show file tree

Hide file tree

Showing 31 changed files with 384 additions and 64 deletions.
diff --git a/MIT-LICENSE → COPYING b/MIT-LICENSE → COPYING
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,7 +1,4 @@
-include trimage.py
-include ui.py
-include trimage.desktop
-include MIT-LICENSE
-recursive-include pixmaps *
-recursive-include hurry *
+include COPYING MANIFEST MANIFEST.in README trimage
+recursive-include desktop *.svg *.desktop
+recursive-include src/ *.py *.png
 
diff --git a/README b/README
@@ -0,0 +1,15 @@
+Trimage image compressor
+A cross-platform tool for optimizing PNG and JPG files.
+
+Trimage is a cross-platform GUI and command-line interface to optimize image
+files via "optipng":http://optipng.sourceforge.net/,
+"advpng":http://advancemame.sourceforge.net/comp-readme.html and
+"jpegoptim":http://www.kokkonen.net/tjko/projects.html, depending on the
+filetype (currently, PNG and JPG files are supported). It was inspired by
+"imageoptim":http://imageoptim.pornel.net/. All image files are losslessy
+compressed on the highest available compression levels. Trimage gives you
+various input functions to fit your own workflow: A regular file dialog,
+dragging and dropping and various command line options.
+
+Visit "Trimage.org":http://trimage.org for more information
+
diff --git a/README.textile b/README.textile
diff --git a/debian/changelog b/debian/changelog
@@ -0,0 +1,6 @@
+trimage (1.0.0b-0ubuntu1) jaunty; urgency=low
+
+  * Trimage image compressor
+
+ -- Kilian Valkhof <help@trimage.org>  Tue, 23 Mar 2010 20:18:17 +0100
+
diff --git a/debian/compat b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
@@ -0,0 +1,16 @@
+Source: trimage
+Section: graphics
+Priority: optional
+Maintainer: Kilian Valkhof <kilian@kilianvalkhof.com>
+Build-Depends: cdbs (>=0.4.49), debhelper (>= 5), python-central (>=0.5.6), python
+XS-Python-Version: >=2.6
+Standards-Version: 3.8.0
+Homepage: https://launchpad.net/pyAppTemplate
+
+Package: trimage
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-qt4 (>= 4.4), optipng (>= 0.6.2.1), advancecomp (>=1.15), jpegoptim (>=1.2.2)
+XB-Python-Version: ${python:Versions}
+Description: A cross-platform tool for optimizing PNG and JPG files.
+ Trimage is a cross-platform GUI and command-line interface to optimize image files via optipng, advpng and jpegoptim, depending on the filetype (currently, PNG and JPG files are supported). It was inspired by imageoptim. All image files are losslessy compressed on the highest available compression levels. Trimage gives you various input functions to fit your own workflow: A regular file dialog, dragging and dropping and various command line options.
+
diff --git a/debian/copyright b/debian/copyright
@@ -0,0 +1,41 @@
+This package was debianized by:
+
+    Kilian Valkhof <help@trimage.org> on Tue, 23 Mar 2010 20:18:17 +0100
+
+Upstream Author(s):
+
+    Kilian Valkhof
+
+Copyright:
+
+    Copyright (C) 2010 Kilian Valkhof, Paul Chaplin
+
+License:
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+    OTHER DEALINGS IN THE SOFTWARE.
+
+The Debian packaging is:
+
+    Copyright (C) 2010 Kilian Valkhof, Paul Chaplin
+
+and is licensed under the MIT license, see above.
+
diff --git a/debian/docs b/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/debian/pycompat b/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/debian/rules b/debian/rules
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+
+DEB_PYTHON_SYSTEM=pycentral
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+
+# Add here any variable or target overrides you need.
diff --git a/trimage.desktop → desktop/trimage.desktop b/trimage.desktop → desktop/trimage.desktop
@@ -1,9 +1,8 @@
-
 [Desktop Entry]
 Name=Trimage image compressor
 Comment=A cross-platform tool for optimizing PNG and JPG files.
 Terminal=false
-Icon=/usr/share/trimage/pixmaps/trimage-icon.png
+Icon=trimage
 Type=Application
 Exec=trimage
 Categories=GNOME;GTK;Graphics;

diff --git a/resources/logo-trimage.svg → desktop/trimage.svg b/resources/logo-trimage.svg → desktop/trimage.svg
diff --git a/resources/todo b/resources/todo
@@ -10,9 +10,9 @@ todo app wise
 - make the current verbose be "normal", and make -verbose print the commandline
     app prints as well
 - verify that a *recompressed* file is smaller than the compressed one
+- find a way to specify the version once for everywhere
 
 todo else
-- figure out dependencies for a .deb/how to make a .deb <- via launchpad
 - figure out how to make mac and win versions (someone else :) <- via gui2exe
 
 todo later
@@ -36,3 +36,4 @@ later versions:
         optimised once. Recompressing maximally compresses 90. Recompressing
         again would currently try to recompress all 100, when only 10 would be
         worthy of trying to compress further.
+