[Pkg-running-devel] [SCM] Debian package for pytrainer branch, master, updated. debian/1.8.0-4-31-g2da79c9

[Christian Perrier]

The following commit has been merged in the master branch:
commit 6be9a300689d487880a987417261ed01ba8abc51
Author: Christian Perrier <bubulle at debian.org>
Date:   Sun Nov 27 14:54:35 2011 +0100

    Move pytr in /usr/lib/pytrainer as we're using a wrapper. That will also avoid a lintian warning about a missing manpage

diff --git a/debian/changelog b/debian/changelog
index 33798ae..5263df2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ pytrainer (1.9.1-1) UNRELEASED; urgency=low
   * Warn users about the lengthy database migration process, in
     NEWS.Debian
   * Fix synopsis in upstream manpage
+  * Move pytr in /usr/lib/pytrainer as we're using a wrapper. That
+    will also avoid a lintian warning about a missing manpage
 
  -- Christian Perrier <bubulle at debian.org>  Sat, 26 Nov 2011 18:14:40 +0100
 
diff --git a/debian/dirs b/debian/dirs
index 6403518..3efb883 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -2,3 +2,4 @@ usr/bin
 usr/share/applications
 usr/share/pixmaps
 usr/share/mime/packages
+usr/lib/pytrainer
diff --git a/debian/mozpytrainer.sh b/debian/mozpytrainer.sh
index 9c8c7d2..634f8db 100644
--- a/debian/mozpytrainer.sh
+++ b/debian/mozpytrainer.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-LD_LIBRARY_PATH=/usr/lib/firefox MOZILLA_FIVE_HOME=/usr/lib/firefox python /usr/bin/pytr
+LD_LIBRARY_PATH=/usr/lib/firefox MOZILLA_FIVE_HOME=/usr/lib/firefox python /usr/lib/pytrainer/pytr
diff --git a/debian/rules b/debian/rules
index bd4efdb..acc095c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ install:
 	dh_clean -k 
 	dh_installdirs
 	python setup.py install --no-compile --prefix $(CURDIR)/debian/pytrainer/usr --install-layout=deb
-	mv $(CURDIR)/debian/pytrainer/usr/bin/pytrainer $(CURDIR)/debian/pytrainer/usr/bin/pytr
+	mv $(CURDIR)/debian/pytrainer/usr/bin/pytrainer $(CURDIR)/debian/pytrainer/usr/lib/pytrainer/pytr
 	cp $(CURDIR)/debian/mozpytrainer.sh $(CURDIR)/debian/pytrainer/usr/bin/pytrainer 
 	cp man/manpage_pytrainer.src debian/pytrainer.7
 

-- 
Debian package for pytrainer