Mon Nov 7 06:40:01 UTC 2005

Update of /cvsroot/pkg-gourmet/gourmet/debian
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv20349

Modified Files:
	changelog control copyright dirs docs menu rules 
Removed Files:
	conffiles.ex cron.d.ex emacsen-install.ex emacsen-remove.ex 
	emacsen-startup.ex files gourmet.doc-base.EX init.d.ex 
	manpage.1 manpage.1.ex manpage.sgml.ex manpage.xml.ex menu.ex 
	package-default.ex postinst.ex postrm.ex preinst.ex prerm.ex 
	watch.ex 
Log Message:
removing unneded files

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-gourmet/gourmet/debian/changelog,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2

--- changelog	6 Nov 2005 18:30:30 -0000	1.1.1.1
+++ changelog	7 Nov 2005 06:39:37 -0000	1.2
@@ -1,419 +1,49 @@
-gourmet (0.8.6.5-1) breezy; urgency=low
-
-  * Fixed bug in recipe card editing that caused changes made in card
-    view not to save properly.
-  * Fix epicurious import.
-  * Fix trash / deletion.
-  * Fix Forward button (desensitize when there are no more pages).
-  * Properly register newly added ingredients in display tab of recipe card.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Sunday, 18 Sep 2005 10:30:17 -0400
-
-gourmet (0.8.6.4-1) unstable; urgency=low
-
-  * Improved encoding dialog.
-  * Fixed handling of webpages with screwy encoding.
-	
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Tuesday, 07 September 2005 07:01:00 -0400
-	
-gourmet (0.8.6.3-1) unstable; urgency=low
-  * Added fast add-ingredient box
-  * Fixed some broken stuff
-  * Changed code underlying pageable model so it is much more stable
-  (got rid of nasty error messages and many of the segfaults)
+gourmet (0.8.6.5.1-1) UNRELEASED; urgency=low
 
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Tuesday, 06 September 2005 07:23:00 -0400
+  * New upstream release
+  * Sean Finney:
+    - since we haven't done one yet, upload still closes ITP (closes: #285619).
+    - added documentation on how to maintain this package wrt the upstream
+      package in README.Maintainer.
+  * Roberto C. Sanchez:
+    - Added a patch to comment out some global declarations that were causing
+      warnings.
 
-gourmet (0.8.6.2-1) unstable; urgency=low
-  * Display recipe in pages (first 25, next 25, so on) to speed up
-  Gourmet. This makes just about everything "feel" faster -- startup,
-  search, etc.
-  * Continue optimization of database.
-  * Properly handle multiple categories.
+ -- Roberto C. Sanchez <roberto at familiasanchez.net>  Sat, 29 Oct 2005 18:13:15 -0400
 
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Monday, 22 August 2005 07:23:00 -0400
-	
-gourmet (0.8.6.1-1) unstable; urgency=low
-  * Database normalized; hopefully this will mean performance improvements
-  * Oodles of magic added to aid normalization of DB
-  * Key lookup improved / interface on recipe card should be less sluggish.
-  * ComboBoxEntry's changed so that one TAB moves focus out of them -- this
-    should improve e.g. recipe entry though it does break consistency with
-    other GTK apps.
-  * DB self-updater tinkered with to support new DB changes.	
+gourmet (0.8.5.12-1) UNRELEASED; urgency=low
 
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Monday, 01 August 2005 17:00:00 -0400
+  * 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 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.
+    - 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!
 
-gourmet (0.8.6.0-1) unstable; urgency=low
-  * Use integers for indices in databases (this should be faster)
-  * Times (cook/prep) are now stored internally as numbers of seconds,
-  which means sorting just works
-  * Ratings are now done one a star-system, which means sorting just
-  works.
-  * since ratings are done on a star system, we've introduced a dialog
-  to let the user select how they'd like to translate textual ratings
-  into stars
+ -- sean finney <seanius at debian.org>  Tue, 13 Sep 2005 20:05:25 +0200
 
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Tuesday, 06 August 2005 22:20:00 -0400
+gourmet (0.8.5.11-1) UNRELEASED; urgency=low
 
-gourmet (0.8.5.11-1) unstable; urgency=low
-  * Fixed menus in shopping list so they work without GNOME libraries.
-  * Fixed unit conversion (typo that resulted in e.g. "23 TBS flour"
-  showing up.
-  * Behave better when locales are behaving badly.
-    editor
-   
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Sunday, 21 August 2005 16:30:00 -0400
-	
-gourmet (0.8.5.10-1) unstable; urgency=low
-  * Improved/Fixed lag when adding ingredients with the ingredient
-    editor
-   
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 04 August 2005 09:36:00 -0400
-	
-gourmet (0.8.5.9-1) unstable; urgency=low
-  * Fixed segfault when closing and not saving new recipe.
-  * Stopped markup from showing up in dialogs
-  * Changed button order in recipe wastebasket.
+  * Sean Finney:
+    - initial version of official debian package.  based largely on the
+      packaging already done by the upstream maintainer, Thomas Hinkle.
+      thanks Thomas!
+    - updated Build-Depends to include python-gtk2-dev.
+    - updated Maintainer and Uploaders fields.
+    - changed Architecture to "all".
+    - various other lintian fixes.
    
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Monday, 01 August 2005 11:34:00 -0400
-	
-gourmet (0.8.5.8-1) unstable; urgency=low
-  * Fixed bug in deletion of new recipe and improved interface for
-  deleting recipes that are already open
-  * Made search interface in select-recipe-as-ingredient dialog and
-  recipe-wastebasket dialog consistent with new main search interface
-  * Removed default serving size of 4 from new recipes.
-  * Fixed mnemonic-activation of preptime and cooktime entries in recipe
-    card view.
-  * Added shortcuts for deletion and printing.
-  * Added extra Control-O shortcut to open recipes, since it's pretty
-  intuitive for a user to hit Control-O
-  * Fixed search-as-you-type in ingredient view of recipe card so that
-  it properly finds group names as well as ingredients
-  * Got rid of some of the many gtk error messages spouted from time to
-  time.
-  * Fixed bug that made recipe trash disappear forever if you closed it
-  by closing the window
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Sunday, 31 July 2005 11:00:00 -0400
-	
-gourmet (0.8.5.7-1) unstable; urgency=low
-	
-  * Improved automatic mnemonic conflict-resolution.
-  * Fixed hang in import from recipezaar website.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Saturday, 30 July 2005 03:30:00 -0400
-
-gourmet (0.8.5.6-1) unstable; urgency=low
-	
-  * Fixed bug in MM import that was causing instructions to be read as ingredients
-  * Changed look/feel of search interface on index page
-  * Split out HTML import stuff into separate "plugin" files and set up plugin interface for local user plugins.
-  * Added programmatic assignment of mnemonics to reduce mnemonic conflicts w/o increasing translator burden :)
-  * Set minimum width of image column to 0 so that it doesn't take up lots of space when there are no images
-  * Fixed bug in converter that caused conversion errors/inconsistency with mass-to-volume conversions.
-  * Fixed unit conversion in shopping so that we don't display things like 21 tbs. butter (even if all butter units we're combining were originally in tbs.)
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 28 July 2005 00:30:00 -0400
-	
-gourmet (0.8.5.5-1) unstable; urgency=low
-
-  * Upgrade search interface.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 7 July 2005 00:12:00 -0400
-	
-gourmet (0.8.5.4-1) unstable; urgency=low
-
-  * Fixed some recently introduced bugs that broke export
-  * Made updating search-by button automatically update search in search-as-you-type mode.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Wednesday, 29 June 2005 07:30:00 -0400
-	
-gourmet (0.8.5.3-1) unstable; urgency=low
-
-  * Fix typo in MealMaster import
-  * Fix krecipes import (import instructions!)
-  * Improved handling of recipe references.
-	
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Wednesday, 22 June 2005 08:00:00 -0400
-	
-
-gourmet (0.8.5.2-1) unstable; urgency=low
-
-  * Fixed RTF export
-  * Added image support to RTF export
-  * Added support for unicode fraction characters
-  * Made export from index view export selected recipes rather than all recipes.
-	
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Sunday, 12 June 2005 21:00:00 -0400
-	
-gourmet (0.8.5.1-1) unstable; urgency=low
-
-  * Fixed compatability problem with pygtk2.4
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Sunday, 6 June 2005 12:58:00 -0400
-
-gourmet (0.8.5.0-1) unstable; urgency=low
-
-  * New web-page-importing architecture with support for three basic html templates as well as support for importing already
-  supported formats directly from URLs.
-  * Added support for rezkonv import (German mealmaster clone)
-  * Fixed line-wrapping code in mealmaster/rezkonv import
-  * Improved UI of shopping list -- added explicit buttons for moving items between shopping and pantry list.
-  * Added support for importing gzipped, zipped, and tarred files from "Import file" or from "Import Webpage"
-  * Fixed defaults focus on dialogs (e.g. dialogs with Entry's put default focus on the Entry now).
-  * Made mealmaster import do a better job when handling malformed ingredient lists
-  * Added FAQ-style help from menus
-  * Fixed bug in Gourmet XML import.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 3 June 2005 20:40:00 -0400
-
-gourmet (0.8.4.4-1) unstable; urgency=low
-
-  * Made new recipes appear immediately again in index view.
-  * Fixed undo for combobox entries is recipe card view.
-  * Made changes in recipe index instantly reflected in reccard.
-  * Fixed alignment of widgets in recipe card "Details" view.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 12 May 2005 20:45:00 -0400
-
-gourmet (0.8.4.3-1) unstable; urgency=low
-
-  * Fixed typo in gglobals in tarball
-  * Fixed bug that broke multiplication in shopping list.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 12 May 2005 20:45:00 -0400
-
-gourmet (0.8.4.2-1) unstable; urgency=low
-
-  * Fixed bug that prevented adding nested recipes to shopping list.
-  * Fixed export bug that failed on unusual servings values.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 12 May 2005 20:45:00 -0400
-
-gourmet (0.8.4.1-1) unstable; urgency=low
-
-  * Fixed silly bug that broke on fresh install
-  * Fixed extraneous print calls.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Tuesday, 10 May 2005 07:10:00 -0400
-
-
-gourmet (0.8.4.0-1) unstable; urgency=low
-
-  * Fixed export from recipe card to properly handle multiplying
-  ingredients and following user preferences for changing unit.
-  * Consolidated preferences dialogs in one dialog with multiple tabs.
-  * Allow user to save choices about optional ingredients (and to forget
-    saved settings).
-  * Added preference to allow user to always include (or always ignore)
-    ingredients.
-  * Change order on exports so ingredients precede instructions.
-  * Properly handle ranges of ingredients throughout Gourmet!
-  * Moved "Preferences" to "Edit" menu where they are in most applications.
-  * Fixed window-position-saving so we don't remember size of maximized
-    position as if they were the window-size coordinates.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Monday, 09 May 2005 22:02:00 -0400
-
-	
-gourmet (0.8.3.5-1) unstable; urgency=low
-
-  * Fixed typo in rtfexporter.
-  * Fixed line-wrapping for splash screen.
-  * Added translation of defaults for Dutch.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 28 April 2005 22:56:00 -0400
-
-	
-gourmet (0.8.3.4-1) unstable; urgency=low
-
-  * Fixed bug that threw an error when opening recipe card.
-  * Made mealmaster import slighlty more flexible in recognition of groups
-  * Fix bug in mastercook import of recipes with optional ingredients
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Wednesday, 22 April 2005 12:45:00 -0400
-
-
-
-gourmet (0.8.3.3-1) unstable; urgency=low
-
-  * Fixed bug that broke renaming of ingredient groups.
-  * Fixed windows directory nonsense
-  * Use psyco if available to speed things up.
-  * Twiddled with sqlite to no end (still needs fix).
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Wednesday, 13 April 2005 20:30:00 -0400
-
-
-gourmet (0.8.3.2-1) unstable; urgency=low
-
-  * Fixed bug that failed on fresh install.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Saturday, 9 April 2005 16:34:00 -0500
-
-gourmet (0.8.3.1-1) unstable; urgency=low
-
-  * Fixed showstopping, data-endangering bug in transition to new database tables.
-  * Fixed bug that prevented images from saving.
-  * Fixed bug with groups.
-  * Fixed bug in Image preview in file selector.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Saturday, 9 April 2005 16:34:00 -0500
-
-gourmet (0.8.3-1) unstable; urgency=low
-
-  * Added windows printing support using wx. 
-  * Fixed bug in which cooking time wasn't exported in Gourmet format. 
-  * Fixed bug which made gourmet not recognize it's own .grmt extension
-  * Fixed a bug preventing HTML E-mail from working.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Sunday, 5 April 2005 22:20:00 -0500
-
-gourmet (0.8.2.1-1) unstable; urgency=low
-
-  * Fixed bug preventing saving shopping list.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Sunday, 20 March 2005 15:28:00 -0500
-
-gourmet (0.8.2-2) unstable; urgency=low
-
-  * Fixed manifest so this package actually works.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Sunday, 20 March 2005 15:28:00 -0500
-
-gourmet (0.8.2-1) unstable; urgency=low
-
-  * Added krecipe import
-  * Added new, simplified gourmet XML format
-  * Added support for import/export of images in Gourmet XML format
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Wednesday, 16 March 2005 07:10:00 -0500
-
-gourmet (0.8.1.2-1) unstable; urgency=low
-
-  * Fixed alignment of "Add to shopping list" button
-  * Applied patch from __ to make mealmaster import more flexible.
-  * Fixed "print" on Windows to show dialog explaining we don't have printing on Windows.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Wednesday, 16 March 2005 07:10:00 -0500
-
-gourmet (0.8.1.1-1) unstable; urgency=low
-
-  * Fix handling of "^T" characters in mealmaster/mastercook import.
-  * Fix misaligned icon.
-  * Get rid of "save" calls in metakit, opting for autosave on a timer instead.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Tuesday, 15 March 2005 07:02:00 -0500
-
-gourmet (0.8.1-1) unstable; urgency=low
-
-  * Fix minor mealmaster import glitches.
-  * Fix Windows APPLICATION DATA directory path.
-  * A few other minor bugfixes.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 9 March 2005 21:50:00 -0500
-
-gourmet (0.8.0-4) unstable; urgency=low
-
-  * Fix broken shopping window. This is the first stable 0.8.0 release.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 24 Feb 2005 13:00:00 -0500
-
-gourmet (0.8.0-3) unstable; urgency=low
-
-  * Fix mastercook import and add progress bar to our own xml import.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 24 Feb 2005 13:00:00 -0500
-	
-gourmet (0.8.0-2) unstable; urgency=low
-
-  * Fix typos that caused import bugs in previous version.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 23 Feb 2005 22:30:00 -0500
-	
-gourmet (0.8.0-1) unstable; urgency=low
-
-  * Major changes. Experimental support for mysql and sqlite backends. New tabbed recipe card interface. Improved import/export.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 22 Feb 2005 22:30:00 -0500
-
-gourmet (0.7.1-3) unstable; urgency=low
-
-  * Fixed bug in HTML export. Made all dialog text selectable.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 20 Jan 2005 22:30:00 -0500
-
-gourmet (0.7.1-2) unstable; urgency=low
-
-  * Fixed bug that caused database to be loaded twice on startup.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Monday, 17 Jan 2005 10:50:00 -0500
-	
-gourmet (0.7.1-1) unstable; urgency=low
-
-  * Improved converter interface. Also made add-item-to-shopping-list dialog properly register shopping categories. Finally, fixed bug that made the recipe card view ask to save changes on imported recipes w/o serving information.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Sunday, 16 Jan 2005 16:00:00 -0500
-
-gourmet (0.7.0-2) unstable; urgency=low
-
-  * Slight changes to dialogs for Windows.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Sunday, 13 Jan 2005 10:40:00 -0500
-
-gourmet (0.7.0-1) unstable; urgency=low
-
-  * mastercook import added; some UI bugs fixed in shopgui; windows support added.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 02 Jan 2005 07:45:48 -0500
-
- gourmet (0.6.7-2) unstable; urgency=low
-
-  * Mealmaster import improved; workaround around pygtk 2.5 bug and properly handle encoding. -2 fixes a number of stupid problems that should never have made the previous release.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 02 Dec 2004 07:45:48 -0500
-
-
-gourmet (0.6.7-1) unstable; urgency=low
-
-  * Mealmaster import improved; workaround around pygtk 2.5 bug and properly handle encoding.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 02 Dec 2004 07:45:48 -0500
-
-gourmet (0.6.6-2) unstable; urgency=low
-
-  * E-mail recipe feature added. Can now print selected recipes from the index window. Fixed bug in import code.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 02 Dec 2004 07:45:48 -0500
-
-gourmet (0.6.6-1) unstable; urgency=low
-
-  * E-mail recipe feature added. Can now print selected recipes from the index window.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Thursday, 02 Dec 2004 07:45:48 -0500
-
-gourmet (0.6.5-1) unstable; urgency=low
-
-  * Threading improvements.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Sunday, 07 Nov 2004 17:45:26 -0500
-
-gourmet (0.6.4-1) unstable; urgency=low
-
-  * Minor UI improvements; Spanish translation fix; bugfixes (0.6.3 went out without gnomeprinter.py)
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Friday, 05 Nov 2004 18:07:43 -0500
-
-gourmet (0.6.3-1) unstable; urgency=low
-
-  * UI improvements; major threading improvements; new printing implementation.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Sat, 23 Oct 2004 20:33:11 -0400
-
-gourmet (0.6.2-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>  Sat, 21 Aug 2004 10:33:11 -0400
+ -- sean finney <seanius at debian.org>  Mon, 05 Sep 2005 00:55:27 +0200

--- conffiles.ex DELETED ---

Index: control
===================================================================
RCS file: /cvsroot/pkg-gourmet/gourmet/debian/control,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- control	6 Nov 2005 18:30:30 -0000	1.1.1.1
+++ control	7 Nov 2005 06:39:54 -0000	1.2
@@ -1,17 +1,18 @@
-Send-To: calvin at debian.org
 Source: gourmet
-Section: unknown
+Section: gnome
 Priority: optional
-Maintainer: Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu>
-Build-Depends: debhelper (>= 4.0.0), python-dev
-Standards-Version: 3.6.0
+Maintainer: Debian Gourmet Chefs <pkg-gourmet-devel at lists.alioth.debian.org>
+Uploaders: Sean Finney <seanius at debian.org>, Roberto C. Sanchez <roberto at familiasanchez.net>
+Build-Depends: debhelper (>= 4.0.0), dpatch
+Standards-Version: 3.6.2
 
 Package: gourmet
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.2), python-gtk2 (>=2.3.92), libmetakit-python, python-imaging, python-glade2
+Architecture: all
+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 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.
+ 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.

Index: copyright
===================================================================
RCS file: /cvsroot/pkg-gourmet/gourmet/debian/copyright,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- copyright	6 Nov 2005 18:30:30 -0000	1.1.1.1
+++ copyright	7 Nov 2005 06:39:54 -0000	1.2
@@ -1,10 +1,15 @@
-This package was debianized by Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu> on
+This package was originally debianized by:
+Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu> on 
 Sat, 21 Aug 2004 10:33:11 -0400.
 
-It was downloaded from <fill in ftp site>
+Later packaging work was done by the Debian gourmet "chefs" Sean Finney and 
+Roberto Sanchez :)
 
-Upstream Author(s): <put author(s) name and email here>
+It was downloaded from http://sourceforge.net/project/showfiles.php?group_id=108118
 
-Copyright:
+Upstream Author: Thomas Mills Hinkle <Thomas_Hinkle at alumni.brown.edu> 
 
-<Must follow here>
+Copyright: GPL
+
+On Debian GNU/Linux systems, the complete text of the GNU General Public 
+License can be found in the `/usr/share/common-licenses' directory.

--- cron.d.ex DELETED ---

Index: dirs
===================================================================
RCS file: /cvsroot/pkg-gourmet/gourmet/debian/dirs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- dirs	6 Nov 2005 18:30:30 -0000	1.1.1.1
+++ dirs	7 Nov 2005 06:39:54 -0000	1.2
@@ -1,2 +1,5 @@
 usr/bin
-usr/sbin
+usr/share/gourmet
+usr/share/locale
+usr/share/pixmaps
+usr/share/applications

Index: docs
===================================================================
RCS file: /cvsroot/pkg-gourmet/gourmet/debian/docs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- docs	6 Nov 2005 18:30:30 -0000	1.1.1.1
+++ docs	7 Nov 2005 06:39:54 -0000	1.2
@@ -1,3 +1,3 @@
 README
 TODO
-CHANGES
+FAQ

--- emacsen-install.ex DELETED ---

--- emacsen-remove.ex DELETED ---

--- emacsen-startup.ex DELETED ---

--- files DELETED ---

--- gourmet.doc-base.EX DELETED ---

--- init.d.ex DELETED ---

--- manpage.1 DELETED ---

--- manpage.1.ex DELETED ---

--- manpage.sgml.ex DELETED ---

--- manpage.xml.ex 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	6 Nov 2005 18:30:30 -0000	1.1.1.1
+++ menu	7 Nov 2005 06:39:54 -0000	1.2
@@ -1,2 +1,3 @@
-?package(gourmet):needs=X11 section=Apps/see-menu-manual\
-  title="gourmet" command="/usr/bin/gourmet"
+?package(gourmet):needs="X11" section="Apps/Tools" \
+  title="Gourmet Recipe Manager" command="/usr/bin/gourmet" \
+  icon="/usr/share/pixmaps/recbox.xpm"

--- menu.ex DELETED ---

--- package-default.ex DELETED ---

--- postinst.ex DELETED ---

--- postrm.ex DELETED ---

--- preinst.ex DELETED ---

--- prerm.ex DELETED ---

Index: rules
===================================================================
RCS file: /cvsroot/pkg-gourmet/gourmet/debian/rules,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- rules	6 Nov 2005 18:30:30 -0000	1.1.1.1
+++ rules	7 Nov 2005 06:39:54 -0000	1.2
@@ -1,85 +1,74 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-CFLAGS = -Wall -g
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+DT:=debian/gourmet
+DTUS:=${DT}/usr/share
+DTUSL:=${DTUS}/locale
+DTUSG:=${DTUS}/gourmet
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
 	dh_testdir
-	# Add here commands to configure the package.
-
 	touch configure-stamp
 
-
 build: build-stamp
-
 build-stamp: configure-stamp 
 	dh_testdir
-
-	# Add here commands to compile the package.
-	python setup.py build
-	#/usr/bin/docbook-to-man debian/gourmet.sgml > gourmet.1
-
 	touch build-stamp
 
-clean:
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
+	dh_clean 
 
-	# Add here commands to clean up after the build process.
-	python setup.py clean
+patch: patch-stamp
+patch-stamp:
+	dpatch apply-all
 
-	dh_clean 
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-
-	# Add here commands to install the package into debian/gourmet.
-	python setup.py install --root=$(CURDIR)/debian/gourmet --install-lib /usr/share
-
+	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 debian/recbox.xpm ${DTUS}/pixmaps
+	cp -a gourmet.desktop ${DTUS}/applications
+	# remove any cvs stuff
+	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
+	find ${DTUS} -type f -exec chmod a-x "{}" \;
 
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
 
-
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs CHANGES
-#	dh_installdocs
+	dh_installdocs
 #	dh_installexamples
 #	dh_install
-#	dh_installmenu
+	dh_installmenu
 #	dh_installdebconf
 #	dh_installlogrotate
 #	dh_installemacsen
-#	dh_installpam
 #	dh_installmime
 #	dh_installinit
 #	dh_installcron
 #	dh_installinfo
-	dh_installman
+	dh_installman debian/gourmet.1
 	dh_link
 	dh_strip
 	dh_compress

--- watch.ex DELETED ---


