How does svn get updated after an NMU?

[Elliot Murphy]

Hi!

I'm slowly learning more about contributing to debian, and I'd like some
advice.

I saw a FTBFS problem in python-mechanize, highlighted by this report:
http://udd.debian.org/cgi-bin/ubuntu_ftbfs.cgi

So, I started investigating, identified a fix, and found that there was
already an upload in Debian which solved the problem. Yay! I've requested
that the fixed package be synced to Ubuntu. But then I noticed that this
package is maintained by pkg-zope and I wondered whether this fix made it
into svn. I see that it didn't.

Whats the normal process for getting changes synced back into svn after a
NMU upload? Should I commit this to svn to get it caught up with whats
currently in the archive?

=== modified file 'debian/changelog'
--- debian/changelog 2009-09-22 00:14:06 +0000
+++ debian/changelog 2010-01-10 06:29:12 +0000
@@ -1,3 +1,10 @@
+python-mechanize (0.1.11-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Be less selective when renaming *.egg-info files (closes: #552912).
+
+ -- Jakub Wilk <ubanus at users.sf.net>  Mon, 21 Dec 2009 20:35:08 +0100
+
 python-mechanize (0.1.11-1) unstable; urgency=low

   * New upstream release, uploaded to unstable.

=== modified file 'debian/rules'
--- debian/rules 2009-03-01 18:17:43 +0000
+++ debian/rules 2010-01-10 06:29:12 +0000
@@ -6,8 +6,6 @@
 PYVERS=$(shell pyversions -vr debian/control)
 PYMOD=mechanize
 PACKAGE=python-$(PYMOD)
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \
-             | grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)

 include /usr/share/dpatch/dpatch.make

@@ -45,7 +43,7 @@
  # Remove python and module version from .egg-info
  echo python:Provides=$(foreach pv,$(shell pyversions
-s),$(pv)-mechanize)|sed 's/ /, /g' >> debian/python-mechanize.substvars
  (cd debian/$(PACKAGE)/usr/lib/python$*/*-packages/; \
- mv $(PYMOD)-$(DEB_UPSTREAM_VERSION)-py$*.egg-info $(PYMOD).egg-info)
+ mv $(PYMOD)-*.egg-info $(PYMOD).egg-info)

 .PHONY: binary-common
 binary-common:


-- 
Elliot Murphy | https://launchpad.net/~statik/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-zope-developers/attachments/20100110/830ca00c/attachment.htm>