Merge gallery 1.5.10.dfsg-1 (universe) from Debian testing (main)

Bug #484163 reported by Charlie_Smotherman
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
gallery (Ubuntu)
Fix Released
Wishlist
Unassigned

Bug Description

Please merge gallery 1.5.10.dfsg-1 (universe) from Debian testing (main)

 Merge from debian testing, remaining changes:
    - debian/postrm:
       Delete config.php and htaccess on purge.
    - debian/control:
       Added Homepage field.

Changelog entries since current lucid version 1.5.9-1.2ubuntu1:

gallery (1.5.10.dfsg-1) unstable; urgency=low

  * New upstream release (Closes: #538700)
    + Incorporate NMUs (Thanks to Nico Golde, i18n/l10n teams)
  * Remove jars from source (Closes: #528114)
  * debian/rules:
    + Remove DH_COMPAT
  * debian/gallery.lintian.override
    + Override PHP license lintian error (code is dual licensed under
      GPL and PHP)
  * debian/control:
    + Update to Standards-Version 3.8.2
    + Utilize ${misc:Depends}
    + Bump versioned Build-Depends on debhelper
  * l10n updates:
    + Update Swedish translation of debconf templates (Thanks to Martin
      Bagge. Closes: #504332)
    + Update Vietnamese translation of debconf templates (Thanks to Clytie
      Siddall. Closes: #513355)
    + Update Spanish translation of debconf templates (Thanks to
      Thanks to Francisco Javier Cuadrado. Closes: #533139)
  * Update watch file (Closes: #450132)
  * Fix syntax error in setup/write.inc (Thanks to Eloy A. Paris.
    Closes: #501235)
  * Package is now lintian clean!

 -- Michael C. Schultheiss <email address hidden> Sun, 20 Sep 2009 17:01:18 +0000

Related branches

Changed in gallery (Ubuntu):
importance: Undecided → Wishlist
Revision history for this message
Charlie_Smotherman (cjsmo) wrote :
Revision history for this message
Charlie_Smotherman (cjsmo) wrote :
Changed in gallery (Ubuntu):
assignee: nobody → Fabrice Coutadeur (fabricesp)
status: New → In Progress
Revision history for this message
Fabrice Coutadeur (fabricesp) wrote :

Hi,

Thanks for your work on that merge.

Could you please clean your debian -> ubuntu debdiff ? There is at least one file that does not make sense to modify (debian/po/vi.po).
Otherwise, it looks fine.

Thanks,
Fabrice

Changed in gallery (Ubuntu):
assignee: Fabrice Coutadeur (fabricesp) → nobody
status: In Progress → Incomplete
Changed in gallery (Ubuntu):
status: Incomplete → In Progress
assignee: nobody → Charlie_Smotherman (porthose) (cjsmo)
Revision history for this message
Charlie_Smotherman (cjsmo) wrote :

I have removed the vi.po bits from the debian -> ubuntu diff :)

Changed in gallery (Ubuntu):
assignee: Charlie_Smotherman (porthose) (cjsmo) → nobody
status: In Progress → New
Revision history for this message
Fabrice Coutadeur (fabricesp) wrote :

Hi,

Sorry to bug you about that, but seeing the size of the debdiff, I would say that there are still some unwanted changes in there (from what I've seen, at least po/gallery-config.pot).

Can you please fix, and attach a minimal debdiff?

thanks for your work,
Fabrice

Changed in gallery (Ubuntu):
status: New → In Progress
assignee: nobody → Charlie_Smotherman (porthose) (cjsmo)
Revision history for this message
Charlie_Smotherman (cjsmo) wrote :

Fabrice,

No problem, the new release introduced some updated .po files so I thought they where needed in the diff.
Attached a new diff

Changed in gallery (Ubuntu):
status: In Progress → New
assignee: Charlie_Smotherman (porthose) (cjsmo) → nobody
Changed in gallery (Ubuntu):
status: New → In Progress
Revision history for this message
Fabrice Coutadeur (fabricesp) wrote :

Uploaded. Thank you very much for your work!

Fabrice

Changed in gallery (Ubuntu):
status: In Progress → Fix Committed
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package gallery - 1.5.10.dfsg-1ubuntu1

---------------
gallery (1.5.10.dfsg-1ubuntu1) lucid; urgency=low

  * Merge from debian testing, remaining changes: (LP: #484163)
    - - debian/postrm:
      + Delete config.php and htaccess on purge.
    - debian/control:
      + Added Homepage field.
 -- Charlie Smotherman <email address hidden> Tue, 17 Nov 2009 06:05:27 -0500

Changed in gallery (Ubuntu):
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.