[Python-apps-commits] r6570 - in packages/turnin-ng/trunk/debian (8 files)

ryanakca-guest at users.alioth.debian.org ryanakca-guest at users.alioth.debian.org
Thu Feb 3 12:53:32 UTC 2011


    Date: Thursday, February 3, 2011 @ 12:53:29
  Author: ryanakca-guest
Revision: 6570

Some packaging for Turnin-NG 1.1

Added:
  packages/turnin-ng/trunk/debian/patches/04_manual_info_install.diff
Modified:
  packages/turnin-ng/trunk/debian/README.Debian
  packages/turnin-ng/trunk/debian/changelog
  packages/turnin-ng/trunk/debian/control
  packages/turnin-ng/trunk/debian/patches/01_manual_packaging_symlink.diff
  packages/turnin-ng/trunk/debian/patches/series
Deleted:
  packages/turnin-ng/trunk/debian/patches/02_egg_version.diff
  packages/turnin-ng/trunk/debian/patches/03_infodir.diff

Modified: packages/turnin-ng/trunk/debian/README.Debian
===================================================================
--- packages/turnin-ng/trunk/debian/README.Debian	2011-02-02 23:18:33 UTC (rev 6569)
+++ packages/turnin-ng/trunk/debian/README.Debian	2011-02-03 12:53:29 UTC (rev 6570)
@@ -28,22 +28,24 @@
 professor1 is the account managing it.
 
 % sudo turnincfg --create-course course1
-Username [usually your UNIX login]: professor1
+Managing username [usually your UNIX login]: professor1
 Full path to the course directory: /srv/submit/course1
-Group: professor1
+Managed by a User or Group [U/G]: U
+Student group: students
+Please make sure the account professor1 is a member of the group students.
 Successfully created the course course1.
-% sudo ls -lash . *
-.:
+% sudo ls -lash /srv/submit/*
+/srv/submit/:
 total 12K
-4.0K drwxr-xr-x 3 root root 4.0K 2010-02-15 16:03 ./
-4.0K drwxr-xr-x 4 root root 4.0K 2010-02-15 15:59 ../
-4.0K drwxr-xr-x 2 professor1 professor1 4.0K 2010-02-15 16:03 course1/
+4.0K drwxr-xr-x 3 root       root     4.0K 2010-02-15 16:03 ./
+4.0K drwxr-xr-x 4 root       root     4.0K 2010-02-15 15:59 ../
+4.0K drwxr-xr-x 2 professor1 students 4.0K 2010-02-15 16:03 course1/
 
-course1:
+/sr/submit/course1/:
 total 12K
-4.0K drwxr-xr-x 2 professor1 professor1 4.0K 2010-02-15 16:03 ./
-4.0K drwxr-xr-x 3 root root 4.0K 2010-02-15 16:03 ../
-4.0K -rw-r--r-- 1 professor1 professor1  135 2010-02-15 16:03 turnin-ng.cf
+4.0K drwxr-xr-x 2 professor1 students 4.0K 2010-02-15 16:03 ./
+4.0K drwxr-xr-x 3 root       root     4.0K 2010-02-15 16:03 ../
+4.0K -rw-r--r-- 1 professor1 students 135 2010-02-15 16:03 turnin-ng.cf
 %
 
 If you want to create a course for professor2, substitute professor1 by
@@ -51,4 +53,4 @@
 It is also recommended that you add aliases in /etc/profile for each course, ex:
 alias turnin-course1='turnin -c course1'
 
- -- Ryan Kavanagh <ryanakca at kubuntu.org>  Mon, 15 Feb 2010 15:49:04 -0500
+ -- Ryan Kavanagh <ryanakca at kubuntu.org>  Thu, 02 Sep 2010 12:11:04 -0400

Modified: packages/turnin-ng/trunk/debian/changelog
===================================================================
--- packages/turnin-ng/trunk/debian/changelog	2011-02-02 23:18:33 UTC (rev 6569)
+++ packages/turnin-ng/trunk/debian/changelog	2011-02-03 12:53:29 UTC (rev 6570)
@@ -1,3 +1,19 @@
+turnin-ng (1.1-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Bumped to standards 3.9.1
+  * Refreshed 01_manual_packaging_symlink.diff
+  * Dropped 02_egg_version.diff, applied upstream
+  * Dropped 03_infodir.diff, applied upstream
+  * Don't call install-info from setup.py, 04_manual_info_install.diff
+  * Although section 2.3 of the Python Policy is for modules, we'll switch
+    to X-Python-Version from X{S,B}-Python-Version since it recommends it.
+  * Updated example in README.Debian for new release
+  * Bump to debhelper 8.
+  * Added 'DM-Upload-Allowed: yes' with sponsor's permission
+
+ -- Ryan Kavanagh <ryanakca at kubuntu.org>  Fri, 05 Nov 2010 15:40:12 -0400
+
 turnin-ng (1.0.1-1) unstable; urgency=low
 
   * Initial release (Closes: #540365)

Modified: packages/turnin-ng/trunk/debian/control
===================================================================
--- packages/turnin-ng/trunk/debian/control	2011-02-02 23:18:33 UTC (rev 6569)
+++ packages/turnin-ng/trunk/debian/control	2011-02-03 12:53:29 UTC (rev 6570)
@@ -3,21 +3,21 @@
 Priority: optional
 Maintainer: Ryan Kavanagh <ryanakca at kubuntu.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8),
  python (>= 2.5)
 Build-Depends-Indep: python-support (>= 0.90.5),
  texinfo,
  texlive,
  texi2html
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://github.com/ryanakca/Turnin-NG
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/turnin-ng/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/turnin-ng/trunk
+DM-Upload-Allowed: yes
 
 Package: turnin-ng
 Architecture: all
-XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends}, ${python:Depends},
  python-configobj,
  install-info

Modified: packages/turnin-ng/trunk/debian/patches/01_manual_packaging_symlink.diff
===================================================================
--- packages/turnin-ng/trunk/debian/patches/01_manual_packaging_symlink.diff	2011-02-02 23:18:33 UTC (rev 6569)
+++ packages/turnin-ng/trunk/debian/patches/01_manual_packaging_symlink.diff	2011-02-03 12:53:29 UTC (rev 6570)
@@ -1,13 +1,13 @@
 # 01_manual_packaging_link.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
 # Description: We'll manually take care of the legacy project->turnincfg link so
 #              that out build doesn't fail.
-Index: Turnin-NG/setup.py
+Index: turnin-ng-1.1/setup.py
 ===================================================================
---- Turnin-NG.orig/setup.py	2010-02-12 07:25:10.180107401 -0500
-+++ Turnin-NG/setup.py	2010-02-12 07:26:52.832105086 -0500
-@@ -180,8 +180,9 @@
-         os.symlink(os.path.join(prefix, 'bin/turnincfg'), os.path.join(prefix,
-             'bin/project'))
+--- turnin-ng-1.1.orig/setup.py	2010-09-02 08:29:01.000000000 -0400
++++ turnin-ng-1.1/setup.py	2010-09-02 08:29:51.445178903 -0400
+@@ -183,8 +183,9 @@
+         except:
+             pass
  
 -
 -install.sub_commands.append(('install_legacy', None))
@@ -15,15 +15,14 @@
 +# otherwise the build fails.
 +# install.sub_commands.append(('install_legacy', None))
  
- setup(name='turnin-ng',
-       version='1.0',
-@@ -195,6 +196,7 @@
-       package_dir={'turninng':'src/turninng'},
+ class install_infopage(Command):
+ 
+@@ -225,6 +226,6 @@
        data_files=data_files,
        cmdclass={'build_infopage': build_infopage, 'build_pdf':build_pdf,
--          'build_htmldocs': build_htmldocs, 'build_legacy': build_legacy,
+           'build_htmldocs': build_htmldocs, 'build_legacy': build_legacy,
+-          'install_infopage': install_infopage,
 -          'install_legacy': install_legacy}
-+          'build_htmldocs': build_htmldocs, 'build_legacy': build_legacy#,
-+          #'install_legacy': install_legacy} # Commented out for packaging link
-+          }
++          'install_infopage': install_infopage}
++      #    'install_legacy': install_legacy}
  )

Deleted: packages/turnin-ng/trunk/debian/patches/02_egg_version.diff
===================================================================
--- packages/turnin-ng/trunk/debian/patches/02_egg_version.diff	2011-02-02 23:18:33 UTC (rev 6569)
+++ packages/turnin-ng/trunk/debian/patches/02_egg_version.diff	2011-02-03 12:53:29 UTC (rev 6570)
@@ -1,15 +0,0 @@
-# 02_egg_version.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
-# Description: Upstream forgot to bump the version in setup.py
-Index: turnin-ng-1.0.1/setup.py
-===================================================================
---- turnin-ng-1.0.1.orig/setup.py	2010-02-15 15:04:58.861611533 -0500
-+++ turnin-ng-1.0.1/setup.py	2010-02-15 15:05:04.325613636 -0500
-@@ -185,7 +185,7 @@
- # install.sub_commands.append(('install_legacy', None))
- 
- setup(name='turnin-ng',
--      version='1.0',
-+      version='1.0.1',
-       description='Turn in your assignments with turnin',
-       author='Ryan Kavanagh',
-       author_email='ryanakca at kubuntu.org',

Deleted: packages/turnin-ng/trunk/debian/patches/03_infodir.diff
===================================================================
--- packages/turnin-ng/trunk/debian/patches/03_infodir.diff	2011-02-02 23:18:33 UTC (rev 6569)
+++ packages/turnin-ng/trunk/debian/patches/03_infodir.diff	2011-02-03 12:53:29 UTC (rev 6570)
@@ -1,15 +0,0 @@
-# 03_infodir.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
-# Description: Make Turnin-NG appear as an entry in the dircategory
-Index: turnin-ng-1.0.1/doc/turnin-ng.texi
-===================================================================
---- turnin-ng-1.0.1.orig/doc/turnin-ng.texi	2010-02-12 16:22:01.000000000 -0500
-+++ turnin-ng-1.0.1/doc/turnin-ng.texi	2010-02-16 15:51:39.453611498 -0500
-@@ -23,7 +23,7 @@
- 
- @dircategory Turnin-NG Assignment Submission Suite
- @direntry
--* Turnin-NG:: Turnin-NG
-+* Turnin-NG: (turnin-ng).              The Turnin-NG Assignment Submission Suite
- @end direntry
- 
- @titlepage

Added: packages/turnin-ng/trunk/debian/patches/04_manual_info_install.diff
===================================================================
--- packages/turnin-ng/trunk/debian/patches/04_manual_info_install.diff	                        (rev 0)
+++ packages/turnin-ng/trunk/debian/patches/04_manual_info_install.diff	2011-02-03 12:53:29 UTC (rev 6570)
@@ -0,0 +1,26 @@
+# 04_manual_info_install.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
+# Description: Manually install info page from packaging instead of from
+# setup.py
+Index: turnin-ng-1.1/setup.py
+===================================================================
+--- turnin-ng-1.1.orig/setup.py	2010-09-02 10:06:23.884865662 -0400
++++ turnin-ng-1.1/setup.py	2010-09-02 10:06:49.792863344 -0400
+@@ -211,7 +211,7 @@
+             if retcode < 0:
+                 raise subprocess.CalledProcessError(retcode, ' '.join(cargs))
+ 
+-install.sub_commands.append(('install_infopage', None))
++# install.sub_commands.append(('install_infopage', None))
+ 
+ setup(name='turnin-ng',
+       version='1.1',
+@@ -225,7 +225,7 @@
+       package_dir={'turninng':'src/turninng'},
+       data_files=data_files,
+       cmdclass={'build_infopage': build_infopage, 'build_pdf':build_pdf,
+-          'build_htmldocs': build_htmldocs, 'build_legacy': build_legacy,
+-          'install_infopage': install_infopage}
++          'build_htmldocs': build_htmldocs, 'build_legacy': build_legacy}
++#          'install_infopage': install_infopage}
+       #    'install_legacy': install_legacy}
+ )

Modified: packages/turnin-ng/trunk/debian/patches/series
===================================================================
--- packages/turnin-ng/trunk/debian/patches/series	2011-02-02 23:18:33 UTC (rev 6569)
+++ packages/turnin-ng/trunk/debian/patches/series	2011-02-03 12:53:29 UTC (rev 6570)
@@ -1,4 +1,3 @@
 00_prefix.diff
 01_manual_packaging_symlink.diff
-02_egg_version.diff
-03_infodir.diff
+04_manual_info_install.diff




More information about the Python-apps-commits mailing list