[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [Outreachy] You can use "Team upload" (Was: r22074 - in trunk/packages/conservation-code/trunk/debian: . tests)



Hi Tanya,

On Thu, Jun 02, 2016 at 10:22:57AM +0300, merlettaia wrote:
> Hi Andreas,
> Thank you for response!
> Yes, I'm running from the conservation_code directory. I'll try to build
> with pdebuild, check if something changed and fix everything we discussed.

Fine.

I'm currently sitting behind a stupid firewall blocking Port 22 and thus
I can't commit to SVN.  

I attached a patch you might like to commit on behalf of mine.  The
d/watch file is just something I forgot to add to svn on my previous
upload and unrelated to our current discussion.

Please try the patch.  It creates a more sensible package.  I think it
will *not* fix the problem that the matirc dir is not found since now
the "current directory" will be /usr/bin.  You can either fix this by
installing a shell wrapper that contains a
   cd /usr/share/conservation-code
and calls the Python script there - or as I suggested in the first place
patching the Python code to set the PATH explicitly.

Hope this helps

    Andreas.

-- 
http://fam-tille.de
Index: changelog
===================================================================
--- changelog	(Revision 22075)
+++ changelog	(Arbeitskopie)
@@ -1,7 +1,13 @@
-conservation-code (20110309.0-4.1) unstable; urgency=medium
+conservation-code (20110309.0-5) UNRELEASED; urgency=medium
 
+  * Team upload
+  [ Tatiana Malygina ]
   * add draft autopkgtest
 
+  [ Andreas Tille ]
+  * install link to /usr/bin rather than copy of Python file
+  * Add dh-python to Build-Depends (and drop unneeded perl)
+
  -- Tatiana Malygina <merlettaia@gmail.com>  Thu, 02 Jun 2016 01:10:35 +0000
 
 conservation-code (20110309.0-4) unstable; urgency=medium
Index: control
===================================================================
--- control	(Revision 22075)
+++ control	(Arbeitskopie)
@@ -6,7 +6,7 @@
 Testsuite: autopkgtest
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               perl,
+               dh-python,
                python
 Standards-Version: 3.9.8
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/conservation-code/trunk/
Index: install
===================================================================
--- install	(Revision 22075)
+++ install	(Arbeitskopie)
@@ -1,3 +1,3 @@
 distributions usr/share/conservation-code/
 matrix usr/share/conservation-code/
-score_conservation usr/bin/
+score_conservation.py usr/share/conservation-code/
Index: links
===================================================================
--- links	(nicht existent)
+++ links	(Arbeitskopie)
@@ -0,0 +1 @@
+usr/share/conservation-code/score_conservation.py	usr/bin/score_conservation
Index: rules
===================================================================
--- rules	(Revision 22075)
+++ rules	(Arbeitskopie)
@@ -4,7 +4,6 @@
 PACKAGE:=$(shell dpkg-parsechangelog --format rfc822|sed --posix -n -e 's/^Source: \(.*\)/\1/p;')
 VERSION:=$(shell dpkg-parsechangelog --format rfc822|sed --posix -n -e 's/^Version: \([0-9.]*\).*/\1/p;')
 
-SCRIPTS=score_conservation
 MANS=debian/score_conservation.1
 prefix?=/usr
 
@@ -30,8 +29,7 @@
 	); \
 	mv $$t/*.tar.?z ./
 
-.PHONY: override_dh_auto_build
-override_dh_auto_build: man scripts
+override_dh_auto_build: man
 
 %:
 	dh $@ --parallel --with python2
@@ -39,12 +37,6 @@
 .PHONY: man
 man: $(MANS)
 
-.PHONY: scripts
-scripts: $(SCRIPTS)
-
-$(SCRIPTS) : % : %.py
-	cp -f $< $@
-
 ChangeLog: score_conservation.py
 	# Courtesy of Jakub Wilk:
 	sed -n -e '/# [0-9/]\{8\}/ { s/# // p }' < $< > $@
@@ -63,4 +55,4 @@
 
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
-	rm -f $(MANS) $(SCRIPTS) ChangeLog
+	rm -f $(MANS) ChangeLog
Index: watch
===================================================================
--- watch	(nicht existent)
+++ watch	(Arbeitskopie)
@@ -0,0 +1 @@
+# upstream does not provide a versioned tarball as download

Reply to: