[Python-apps-commits] r2031 - in packages/subdownloader/trunk/debian (5 files)

[gothicx-guest at users.alioth.debian.org]

    Date: Friday, December 5, 2008 @ 12:09:38
  Author: gothicx-guest
Revision: 2031

Merge packages in one

Modified:
  packages/subdownloader/trunk/debian/changelog
  packages/subdownloader/trunk/debian/control
  packages/subdownloader/trunk/debian/rules
  packages/subdownloader/trunk/debian/subdownloader.install
Deleted:
  packages/subdownloader/trunk/debian/subdownloader-cli.install

Modified: packages/subdownloader/trunk/debian/changelog
===================================================================
--- packages/subdownloader/trunk/debian/changelog	2008-12-04 21:27:37 UTC (rev 2030)
+++ packages/subdownloader/trunk/debian/changelog	2008-12-05 12:09:38 UTC (rev 2031)
@@ -2,4 +2,4 @@
 
   * Initial Release (Closes: #490364).
 
- -- Marco Rodrigues <gothicx at sapo.pt>  Thu, 04 Dec 2008 17:51:13 +0000
+ -- Marco Rodrigues <gothicx at sapo.pt>  Fri, 05 Dec 2008 12:08:45 +0000

Modified: packages/subdownloader/trunk/debian/control
===================================================================
--- packages/subdownloader/trunk/debian/control	2008-12-04 21:27:37 UTC (rev 2030)
+++ packages/subdownloader/trunk/debian/control	2008-12-05 12:09:38 UTC (rev 2031)
@@ -11,20 +11,12 @@
 XS-Python-Version: current
 Homepage: http://www.subdownloader.net/
 
-Package: subdownloader-cli
+Package: subdownloader
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-crypto, python-kaa-metadata
 XB-Python-Version: ${python:Versions}
+Recommends: python-qt4
 Description: automatically downloads/uploads subtitles for video files
- It will retrieve automatically subtitles for
  video files (DIVX, MPEG, AVI, etc.) and DVDs using fast hashing.
  .
- The package includes the common files and a cli interface.
-
-Package: subdownloader
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, subdownloader-cli (= ${source:Version}), python-qt4
-Description: automatically downloads/uploads subtitles for video files
- video files (DIVX, MPEG, AVI, etc.) and DVDs using fast hashing.
- .
- This package contains the GUI frontend.
+ This package contains the GUI frontend, common files and a cli interface.

Modified: packages/subdownloader/trunk/debian/rules
===================================================================
--- packages/subdownloader/trunk/debian/rules	2008-12-04 21:27:37 UTC (rev 2030)
+++ packages/subdownloader/trunk/debian/rules	2008-12-05 12:09:38 UTC (rev 2031)
@@ -12,11 +12,8 @@
 install: build copy-mo-files
 	dh install
 
-	# Make symbolic link executable
-	chmod +x debian/subdownloader-cli/usr/share/subdownloader/run.py
-
 	# Remove mmpython because it's only needed on Windows version.
-	rm -rf debian/subdownloader-cli/usr/share/subdownloader/modules/mmpython
+	rm -rf debian/subdownloader/usr/share/subdownloader/modules/mmpython
 
 binary-indep: build install
 	dh --with python_central binary-indep

Deleted: packages/subdownloader/trunk/debian/subdownloader-cli.install
===================================================================
--- packages/subdownloader/trunk/debian/subdownloader-cli.install	2008-12-04 21:27:37 UTC (rev 2030)
+++ packages/subdownloader/trunk/debian/subdownloader-cli.install	2008-12-05 12:09:38 UTC (rev 2031)
@@ -1,5 +0,0 @@
-languages		/usr/share/subdownloader
-cli			/usr/share/subdownloader
-FileManagement		/usr/share/subdownloader
-modules			/usr/share/subdownloader
-run.py                  /usr/share/subdownloader

Modified: packages/subdownloader/trunk/debian/subdownloader.install
===================================================================
--- packages/subdownloader/trunk/debian/subdownloader.install	2008-12-04 21:27:37 UTC (rev 2030)
+++ packages/subdownloader/trunk/debian/subdownloader.install	2008-12-05 12:09:38 UTC (rev 2031)
@@ -1,3 +1,8 @@
-gui			 /usr/share/subdownloader
+gui                      /usr/share/subdownloader
+languages                /usr/share/subdownloader
+cli                      /usr/share/subdownloader
+FileManagement           /usr/share/subdownloader
+modules                  /usr/share/subdownloader
+run.py                   /usr/share/subdownloader
 subdownloader.desktop	 /usr/share/applications
 debian/subdownloader.xpm /usr/share/pixmaps/