[Pkg-gourmet-changes] gourmet/debian TODO, 1.4, 1.5 changelog, 1.4,
1.5 control, 1.3, 1.4 dirs, 1.2, 1.3 gourmet.1, NONE,
1.1 manpage.1, 1.1.1.1, NONE menu, 1.1.1.1, 1.2 postinst, NONE,
1.1 postrm, NONE, 1.1 prerm, NONE, 1.1 recbox.xpm, NONE,
1.1 rules, 1.4, 1.5
seanius at haydn.debian.org
seanius at haydn.debian.org
Tue Sep 13 18:46:08 UTC 2005
Update of /cvsroot/pkg-gourmet/gourmet/debian
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv3185/debian
Modified Files:
TODO changelog control dirs menu rules
Added Files:
gourmet.1 postinst postrm prerm recbox.xpm
Removed Files:
manpage.1
Log Message:
just about ready for that first release...
Index: TODO
===================================================================
RCS file: /cvsroot/pkg-gourmet/gourmet/debian/TODO,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- TODO 13 Sep 2005 11:12:51 -0000 1.4
+++ TODO 13 Sep 2005 18:46:05 -0000 1.5
@@ -1,30 +1,16 @@
- upstream doesn't include a copyright file with their code
- it's confirmed by the author this was just an omission, and the next
version will include it.
-- what to do with upstream's ./debian
-- what section?
-- make sure package conforms to python policy. specifically, we need to
- look at 2.5
-- make sure the new dependencies are in-line with the python language.
-- lintian errors:
-W: gourmet: script-not-executable ./usr/share/gourmet/prefs.py
-W: gourmet: script-not-executable ./usr/share/gourmet/reccard.py
-W: gourmet: script-not-executable ./usr/share/gourmet/recindex.py
-W: gourmet: script-not-executable ./usr/share/gourmet/shopgui.py
-W: gourmet: script-not-executable ./usr/share/gourmet/ThumbnailGenerator.py
-W: gourmet: script-not-executable ./usr/share/gourmet/timeEntry.py
-W: gourmet: script-not-executable ./usr/share/gourmet/treeview_extras.py
-W: gourmet: script-not-executable ./usr/share/gourmet/version.py
-W: gourmet: script-not-executable ./usr/share/gourmet/WidgetSaver.py
-W: gourmet: script-not-executable ./usr/share/gourmet/importers/importer.py
-W: gourmet: script-not-executable ./usr/share/gourmet/importers/mastercook_importer.py
-W: gourmet: script-not-executable ./usr/share/gourmet/importers/mealmaster_importer.py
-W: gourmet: script-not-executable ./usr/share/gourmet/exporters/recipe_emailer.py
-
-i don't know python well enough, can we just drop the #!/usr/bin/python?
-yes. haven't done so yet though
-
-E: gourmet: no-copyright-file
+- upstream also ships a debian directory, and probably will continue to
+ do so. how we should coordinate this remains to be determined.
+- byte compiling gives the following errors:
-already mentioned.
+ /usr/share/gourmet/exporters/printer.py:29: SyntaxWarning: name 'RecRenderer' is assigned to before global declaration
+ def load_lprprint ():
+ /usr/share/gourmet/exporters/printer.py:29: SyntaxWarning: name 'SimpleWriter' is assigned to before global declaration
+ def load_lprprint ():
+ /usr/share/gourmet/exporters/printer.py:29: SyntaxWarning: name 'RecRenderer' is assigned to before global declaration
+ def load_lprprint ():
+ /usr/share/gourmet/exporters/printer.py:29: SyntaxWarning: name 'SimpleWriter' is assigned to before global declaration
+ def load_lprprint ():
Index: changelog
===================================================================
RCS file: /cvsroot/pkg-gourmet/gourmet/debian/changelog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- changelog 13 Sep 2005 11:12:51 -0000 1.4
+++ changelog 13 Sep 2005 18:46:05 -0000 1.5
@@ -3,14 +3,24 @@
* New upstream release
* Sean Finney:
- upload closes ITP (closes: #285619).
- - now manually copying files into proper location instead of
- using setup.py. this allows us to avoid unnecessary build-dependencies.
- - removed build-dependencies
- - uncommented dh_installdocs
+ - now manually copying files into proper location instead of using
+ setup.py. this allows us to avoid unnecessary build-dependencies.
+ - removed now unecessary build-dependencies.
+ - updated dependencies to fall in line with debian python packaging
+ guidelines. this means Depends: python (>= 2.3), python (<< 2.4)
+ for right now.
+ - uncommented dh_installdocs.
- include FAQ as a document instead of putting it in /usr/share/gourmet.
- - XXX stil a few missing files compared to the setup.py version.
+ - added postinst, prerm, and postrm scripts to deal with
+ byte-compiling python files, as well as to catch debhelper menu stuff.
+ - updated menufile to use an icon and a more userfriendly name.
+ - i gimped up a 32x32 xpm version of the larger png version of
+ the gourmet recbox icon for menu policy compliance.
+ - changed control file section to 'gnome'.
+ - wrote a new manpage for gourmet.
+ - now lintian clean, w00t!
- -- sean finney <seanius at debian.org> Tue, 13 Sep 2005 13:10:52 +0200
+ -- sean finney <seanius at debian.org> Tue, 13 Sep 2005 20:05:25 +0200
gourmet (0.8.5.11-1) UNRELEASED; urgency=low
Index: control
===================================================================
RCS file: /cvsroot/pkg-gourmet/gourmet/debian/control,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- control 13 Sep 2005 11:12:51 -0000 1.3
+++ control 13 Sep 2005 18:46:05 -0000 1.4
@@ -1,5 +1,5 @@
Source: gourmet
-Section: X11
+Section: gnome
Priority: optional
Maintainer: Debian Gourmet Chefs <pkg-gourmet-devel at lists.alioth.debian.org>
Uploaders: Sean Finney <seanius at debian.org>
@@ -8,7 +8,7 @@
Package: gourmet
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.2), python-gtk2 (>=2.3.92), libmetakit-python, python-imaging, python-glade2
+Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.3), python (<<2.4), python-gtk2 (>=2.3.92), libmetakit-python, python-imaging, python-glade2
Recommends: python-gnome2
Description: A gtk-based recipe organizer and shopping list generator
Gourmet Recipe Manager is a gtk-based recipe organizer and shopping
Index: dirs
===================================================================
RCS file: /cvsroot/pkg-gourmet/gourmet/debian/dirs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dirs 13 Sep 2005 11:12:51 -0000 1.2
+++ dirs 13 Sep 2005 18:46:05 -0000 1.3
@@ -1,3 +1,5 @@
usr/bin
usr/share/gourmet
usr/share/locale
+usr/share/pixmaps
+usr/share/applications
--- NEW FILE: gourmet.1 ---
.\" -*- nroff -*-
.TH gourmet 1 "Tue Sep 13 19:02:08 CEST 2005" "sean finney" "Gourmet Recipe Manager"
.SH NAME
gourmet \- a recipe manager
.SH SYNOPSIS
.B gourmet
.RB [ OPTIONS... ]
.br
.SH DESCRIPTION
Gourmet Recipe Manager is a gtk-based recipe organizer and shopping
list generator intended for the GNOME desktop environment (though it does
not need all the GNOME libraries). Gourmet can import Mealmaster(tm)
files and can export recipes in a number of formats, including text,
RTF and web pages.
.SH OPTIONS
.IP "--force-wxprinter"
.IP "--force-lprprinter"
.IP "--choose-database"
Show Database chooser dialog
.IP "--plugin-directory=HTML_PLUGIN_DIR"
Directory for webpage import filter plugins.
.IP "--use-threads"
Enable threading support.
.IP "--disable-threads"
Disable threading support.
.IP "--sqlite"
Use SQLITE database backend
.IP "--metakit"
Use metakit backend
.IP "--gourmet-directory=GOURMETDIR"
Gourmet configuration directory
.IP "--debug-threading-interval=THREAD_DEBUG_INTERVAL"
Interval for threading debug calls
.IP "--debug-threading"
Print debugging information about threading.
.IP "--debug-file=DEBUG_FILE"
Regular expression that matches filename(s) whose code
we want to display debug messages from.
.IP "-q"
Don't print gourmet error messages
.IP "--showtimes"
Print timestamps on debug statements.
.IP "-v"
Be verbose (extra v's will increase the verbosity level
.IP "--data-directory=DATAD"
Directory for Gourmet data files.
.IP "--image-directory=IMAGED"
Directory for Gourmet image files.
.IP "--glade-directory=GLADED"
Directory for Gourmet glade files.
.IP "--disable-psyco"
Do not use psyco if it is installed.
.IP "--version"
show program's version number and exit
.IP "-h, --help"
show this help message and exit
.SH AUTHOR
.B gourmet
is written by Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>.
This manual page was written by Sean Finney <seanius at debian.org>
for the Debian project (but may be used by others).
--- manpage.1 DELETED ---
Index: menu
===================================================================
RCS file: /cvsroot/pkg-gourmet/gourmet/debian/menu,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- menu 5 Sep 2005 00:19:18 -0000 1.1.1.1
+++ menu 13 Sep 2005 18:46:05 -0000 1.2
@@ -1,2 +1,3 @@
?package(gourmet):needs="X11" section="Apps/Tools" \
- title="gourmet" command="/usr/bin/gourmet"
+ title="Gourmet Recipe Manager" command="/usr/bin/gourmet" \
+ icon="/usr/share/pixmaps/recbox.xpm"
--- NEW FILE: postinst ---
#!/bin/sh
set -e
if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
PYTHON=python2.3
if which $PYTHON >/dev/null 2>&1; then
DIRLIST="/usr/share/gourmet"
for i in $DIRLIST ; do
$PYTHON -E -O /usr/lib/$PYTHON/compileall.py -q $i
$PYTHON -E /usr/lib/$PYTHON/compileall.py -q $i
done
fi
fi
#DEBHELPER#
--- NEW FILE: postrm ---
#!/bin/sh
set -e
#DEBHELPER#
--- NEW FILE: prerm ---
#!/bin/sh
set -e
# remove python cruft
if [ "$1" = "remove" ]; then
find /usr/share/gourmet -type f -name '*.py[co]' -exec rm -f "{}" \;
fi
#DEBHELPER#
--- NEW FILE: recbox.xpm ---
/* XPM */
static char * recbox_xpm[] = {
"32 32 106 2",
" c None",
". c #000000",
"+ c #070009",
"@ c #140C03",
"# c #2C1E05",
"$ c #3F2B06",
"% c #412C09",
"& c #312206",
"* c #2E2205",
"= c #3E2909",
"- c #392607",
"; c #261A0A",
"> c #1B0B1C",
", c #170818",
"' c #140815",
") c #523A0A",
"! c #493409",
"~ c #4D3806",
"{ c #453405",
"] c #493607",
"^ c #4C390A",
"/ c #200E20",
"( c #211122",
"_ c #1E101D",
": c #6C500D",
"< c #63490B",
"[ c #5C420B",
"} c #614609",
"| c #1F1021",
"1 c #422C10",
"2 c #705412",
"3 c #684C0A",
"4 c #56451C",
"5 c #5A4921",
"6 c #473C21",
"7 c #1F1D1A",
"8 c #080808",
"9 c #64593E",
"0 c #C6C6C7",
"a c #D5D5D5",
"b c #C9C9C9",
"c c #3E3E3E",
"d c #281815",
"e c #695F48",
"f c #EDEEEE",
"g c #FFFFFF",
"h c #494949",
"i c #473817",
"j c #706E6A",
"k c #2C1C0C",
"l c #4A3E28",
"m c #8C8C8C",
"n c #E5E5E5",
"o c #F3F3F3",
"p c #331E0D",
"q c #3E2F1E",
"r c #787776",
"s c #828282",
"t c #9C9C9C",
"u c #929292",
"v c #A4A4A4",
"w c #5C5C5C",
"x c #493413",
"y c #4F4135",
"z c #A7A7A8",
"A c #ABABAB",
"B c #2B2B2A",
"C c #1E0E20",
"D c #684F13",
"E c #503B13",
"F c #4B3F32",
"G c #D9D9D9",
"H c #D7D6D8",
"I c #D8D7D8",
"J c #8A8986",
"K c #0C040C",
"L c #6B5213",
"M c #6D5C45",
"N c #83725A",
"O c #7F6F58",
"P c #7D6D55",
"Q c #604E34",
"R c #180F03",
"S c #110512",
"T c #51350F",
"U c #705618",
"V c #785F1B",
"W c #806521",
"X c #7F6420",
"Y c #836823",
"Z c #624A13",
"` c #352010",
" . c #856410",
".. c #85630D",
"+. c #8A6913",
"@. c #73540C",
"#. c #886611",
"$. c #88660F",
"%. c #25141B",
"&. c #674B07",
"*. c #78570E",
"=. c #0D0A02",
"-. c #291714",
";. c #7B5A10",
">. c #79580E",
",. c #1F1703",
" ",
" ",
" ",
" ",
" ",
" . . . . . . . . . . . . . . . . . . . . ",
" + + + + + . @ # $ $ % % % % % $ % & * * * % % = - ; . ",
" > > , > ' ; ) ! ~ { { { { { { { ] ^ ] ^ ! ) ^ ^ ~ * . ",
" / / ( / _ ! : { ) < < < [ } } } < < < < } < < < < $ . ",
" / ( ( ( | 1 2 { ! 3 [ 4 4 4 4 4 4 4 5 5 5 5 5 5 5 6 7 8 . ",
" ( ( ( ( | ; < ~ { < 9 0 a a a a a a a a a a a a a a b c . ",
" ( ( ( ( | d [ < ^ [ e f g g g g g g g g g g g g g g f h . ",
" ( ( ( ( ( d ) ) = i j f g g g g g g g g g g g g g g f h . ",
" ( ( ( ( ( _ k ! - l m n o o o o o o o o o o o o o o n h . ",
" ( ( ( ( ( ( ( ( p q r s t m m m m u u t t t v t t t t w 8 ",
" ( ( ( ( ( ( ( ( = x y s v t t t t v v z z z A A A A A u B . ",
" C ( ( ( ( ( ( ( 1 D E F z G H H G H H a a H a a a I H G J K ",
" > ( ( ( ( ( ( ( = L D x M N N N N O P O P N P N P P P N Q R ",
" S > ( ( ( ( ( ( p } 3 T U V V W V X V W W Y W W V V Y Y Z @ ",
" , ( ( ( ( ( ( ` < : T D ..... . . . ... . .+.+. . . .Z @ ",
" K / / ( ( ( ( ` } 3 T @... . . .#.$...$. .$.#.#.#.#...2 R ",
" , / / / ( %.p [ &.) *. ... .#.#.#.#.#.#. .#.#.#.+.$.D R ",
" + S > / / ( p ) 3 ) : .....#.#.....#. . . .$.#.+...3 =. ",
" + ' > / %.-.) } ) @. ...$. .#.#...#. . . .$.$.+. .3 =. ",
" S > > > ` Z } *.#...#...#.#.#.$... .+. . .+.+.L =. ",
" K > C %.T ) 2 +.#.#...#.$.$.#.$...#.$. ...#.3 =. ",
" + K K @ = 3 @.*.*.*.*.;.*.;.;.*.*.*.*.>.*.< @ ",
" . @ R R R R R R R R R @ @ ,.R R ,.R @ . ",
" ",
" ",
" ",
" "};
Index: rules
===================================================================
RCS file: /cvsroot/pkg-gourmet/gourmet/debian/rules,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rules 13 Sep 2005 11:12:51 -0000 1.4
+++ rules 13 Sep 2005 18:46:05 -0000 1.5
@@ -1,7 +1,9 @@
#!/usr/bin/make -f
-DTMP:=debian/gourmet
-DSHARE:=${DTMP}/usr/share
+DT:=debian/gourmet
+DTUS:=${DT}/usr/share
+DTUSL:=${DTUS}/locale
+DTUSG:=${DTUS}/gourmet
configure: configure-stamp
configure-stamp:
@@ -17,8 +19,6 @@
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- #python setup.py clean
- #rm src/lib/version.pyc tools/*.pyc
dh_clean
install: build
@@ -26,16 +26,18 @@
dh_testroot
dh_clean -k
dh_installdirs
- #python setup.py install --root=$(CURDIR)/debian/gourmet --install-lib /usr/share
- cp -ar src/lib/* ${DSHARE}/gourmet/
- cp -a src/gourmet ${DTMP}/usr/bin/gourmet
- ( cd i18n && find -type f -name '*.mo' -exec install -D '{}' "../${DSHARE}/locale/{}" \; )
- cp -a glade/* ${DSHARE}/gourmet/
- cp -a style/*css ${DSHARE}/gourmet/
+ cp -a src/gourmet ${DT}/usr/bin/gourmet
+ ( cd i18n && find -type f -name '*.mo' -exec install -D '{}' "../${DTUSL}/{}" \; )
+ cp -ar src/lib/* glade/* style/*css data/recipe.dtd images/*png ${DTUSG}
+ cp -a images/recbox.png debian/recbox.xpm ${DTUS}/pixmaps
+ cp -a gourmet.desktop ${DTUS}/applications
# remove any cvs stuff
- find ${DTMP} -type d -name CVS -exec rm -rf "{}" \; -prune
+ find ${DT} -type d -name CVS -exec rm -rf "{}" \; -prune
+ # remove all the #! headers from usr/share files. ph34r my l33t sed.
+ find ${DT} -type f -name '*py' -exec \
+ sed -ni -e '1s/^#!.*$$//;t mylabel; 1p; : mylabel 2,$$p' "{}" \;
# fix some permissions
- #chmod 644 debian/gourmet/usr/share/gourmet/recipe.dtd
+ find ${DTUS} -type f -exec chmod a-x "{}" \;
# Build architecture-independent files here.
binary-indep: build install
@@ -57,7 +59,7 @@
# dh_installinit
# dh_installcron
# dh_installinfo
- dh_installman
+ dh_installman debian/gourmet.1
dh_link
dh_strip
dh_compress
More information about the Pkg-gourmet-changes
mailing list