filler2: fixed packaging error

* it was not as simple as it seems - now should be ok.

debian/packs.files

@@ -110,8 +110,8 @@ Files: opt/szarp/iks/iks-server.ini.sample
 
 Package: szarp-filler2
 Files: opt/szarp/lib/python/filler2/filler2-launcher.py*
-Files: opt/szarp/lib/python/filler2/ipk/*
-Files: opt/szarp/lib/python/filler2/ui/*
+Files: opt/szarp/lib/python/filler2/ipk/{__init__.py*,ipkparser.py*}
+Files: opt/szarp/lib/python/filler2/ui/{__init__.py*,AboutDialog.py*,DatetimeDialog.py*,HistoryDialog.py*,ValueDialogs.py*}
 Files: opt/szarp/resources/locales/qt4/filler2_pl.qm
 Files: opt/szarp/resources/wx/icons/filler2.png
 Files: opt/szarp/resources/qt4/icons/{filler2.png,filler2-big.png,qt4.png,plot-*.png}

qt4/filler2/Makefile.am

@@ -1,38 +1,47 @@
 # Makefile.am for Filler 2 program.
+# Author: Tomasz Pieczerak <tph@newterm.pl>
 
 # No subdirectories
 SUBDIRS =
 
 # Additional files for deleting on 'make maintainer-clean'
 MAINTAINERCLEANFILES = Makefile.in
 
-# Program to create
-filler2_LOCALES = @srcdir@/locales/filler2_pl.qm
-filler2_LOCALES_SRC = locales/filler2_pl.ts
-
+# Filler 2: helper scripts
 filler2_script = @srcdir@/filler2
 szb2filler_script = @srcdir@/szb2filler
 
-filler2dir = @prefix@/lib/python/filler2
+# Filler 2: locales
+filler2_PROJECT = filler2.pro
 
+filler2_LOCALES = @srcdir@/locales/filler2_pl.qm
+filler2_LOCALES_SRC = locales/filler2_pl.ts
+
+# Filler 2: application launcher
+filler2dir = @prefix@/lib/python/filler2
 filler2_PYTHON = \
+		@srcdir@/filler2-launcher.py
+
+# Filler 2: 'ui' package
+filler2uidir = @prefix@/lib/python/filler2/ui
+filler2ui_PYTHON = \
 		@srcdir@/ui/__init__.py \
 		@srcdir@/ui/AboutDialog.py \
 		@srcdir@/ui/DatetimeDialog.py \
 		@srcdir@/ui/HistoryDialog.py \
 		@srcdir@/ui/ValueDialogs.py \
-		@srcdir@/ui/Filler2.py \
-		@srcdir@/ipk/__init__.py \
-		@srcdir@/ipk/ipkparser.py \
-		@srcdir@/filler2-launcher.py
+		@srcdir@/ui/Filler2.py
 
 filler2_UI = ui/Filler2.ui ui/DatetimeDialog.ui ui/AboutDialog.ui ui/HistoryDialog.ui
-
 filler2_GENPYTHON = ui/Filler2.py ui/DatetimeDialog.py ui/AboutDialog.py ui/HistoryDialog.py
 
-filler2_PYC = ui/*.pyc ipk/*.pyc
+# Filler 2: 'ipk' package
+filler2ipkdir = @prefix@/lib/python/filler2/ipk
+filler2ipk_PYTHON = \
+		@srcdir@/ipk/__init__.py \
+		@srcdir@/ipk/ipkparser.py
 
-filler2_PROJECT = filler2.pro
+filler2_PYC = ui/*.pyc ipk/*.pyc
 
 CLEANFILES = $(filler2_GENPYTHON) $(filler2_LOCALES) $(filler2_PYC)
 
@@ -48,14 +57,15 @@ $(filler2_LOCALES): $(filler2_LOCALES_SRC)
 
 all: $(filler2_GENPYTHON) $(filler2_LOCALES)
 
-# Install locales and launcher
+# Install locales and scripts
 install-data-local: $(filler2_LOCALES)
 	$(INSTALL) -d $(DESTDIR)@prefix@/resources/locales/qt4
 	$(INSTALL) $(filler2_LOCALES) \
                 $(DESTDIR)@prefix@/resources/locales/qt4
 	$(INSTALL) $(filler2_script) $(DESTDIR)@prefix@/bin
 	$(INSTALL) $(szb2filler_script) $(DESTDIR)@prefix@/bin
 
+# Update language files
 update-ts:
 	pylupdate4 $(filler2_PROJECT)