diff -pruN 35.2/.bzr-builddeb/default.conf 35.2ubuntu1/.bzr-builddeb/default.conf --- 35.2/.bzr-builddeb/default.conf 1970-01-01 00:00:00.000000000 +0000 +++ 35.2ubuntu1/.bzr-builddeb/default.conf 2011-11-07 21:46:32.000000000 +0000 @@ -0,0 +1,2 @@ +[BUILDDEB] +native = True diff -pruN 35.2/debian/changelog 35.2ubuntu1/debian/changelog --- 35.2/debian/changelog 2011-10-27 17:30:01.000000000 +0000 +++ 35.2ubuntu1/debian/changelog 2011-11-07 21:52:02.000000000 +0000 @@ -1,3 +1,14 @@ +emacs-goodies-el (35.2ubuntu1) precise; urgency=low + + * Merge from debian unstable. Remaining changes: + - Add {hardy,jaunty,karmic,lucid,maverick,oneiric,precise}-proposed + distribution targets to dpkg-dev-el. + - Add precise{,-proposed} distribution targets; drop out the oneieric + non-proposed target, since uploads to the release pocket are not + permitted for stable releases. + + -- Reinhard Tartler Mon, 07 Nov 2011 22:47:20 +0100 + emacs-goodies-el (35.2) unstable; urgency=low [ Roland Mas ] @@ -59,6 +70,25 @@ emacs-goodies-el (34.2) unstable; urgenc -- Peter S Galbraith Fri, 24 Jun 2011 12:37:31 -0400 +emacs-goodies-el (34.1ubuntu2) oneiric; urgency=low + + * Add oneiric{,-proposed} distribution targets; drop out the maverick + non-proposed target, since uploads to the release pocket are not + permitted for stable releases. + + -- Reinhard Tartler Sun, 01 May 2011 11:35:28 +0200 + +emacs-goodies-el (34.1ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - Add {hardy,jaunty,karmic,lucid,maverick}-proposed distribution targets + to dpkg-dev-el. + - Add natty{,-proposed} distribution targets; drop out the maverick + non-proposed target, since uploads to the release pocket are not + permitted for stable releases. + + -- Reinhard Tartler Fri, 12 Nov 2010 18:45:23 +0100 + emacs-goodies-el (34.1) unstable; urgency=low * debian/control: @@ -102,6 +132,17 @@ emacs-goodies-el (34.0) unstable; urgenc -- Peter S Galbraith Sun, 27 Jun 2010 22:05:01 -0400 +emacs-goodies-el (33.6ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Remaining changes: LP: #597284 + - Add {hardy,jaunty,karmic,lucid}-proposed distribution targets + to dpkg-dev-el. + - Add maverick{,-proposed} distribution targets; drop out the lucid + non-proposed target, since uploads to the release pocket are not + permitted for stable releases. + + -- Bhavani Shankar Tue, 22 Jun 2010 19:03:03 +0530 + emacs-goodies-el (33.6) unstable; urgency=low * debian-el: @@ -288,6 +329,17 @@ emacs-goodies-el (31.5) unstable; urgenc -- Peter S Galbraith Mon, 22 Feb 2010 20:53:01 -0500 +emacs-goodies-el (31.4ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: + - Add {hardy,intrepid,jaunty,karmic}-proposed distribution targets + to dpkg-dev-el. + - Add lucid{,-proposed} distribution targets; drop out the karmic + non-proposed target, since uploads to the release pocket are not + permitted for stable releases. + + -- Bhavani Shankar Tue, 19 Jan 2010 11:13:40 +0530 + emacs-goodies-el (31.4) unstable; urgency=low * emacs-goodies-el: @@ -394,6 +446,17 @@ emacs-goodies-el (30.9-1) unstable; urge -- Peter S Galbraith Sun, 25 Oct 2009 12:11:31 -0400 +emacs-goodies-el (30.8-1ubuntu1) lucid; urgency=low + + * Merge from Debian testing, remaining changes: + - Add {hardy,intrepid,jaunty,karmic}-proposed distribution targets + to dpkg-dev-el. + * Add lucid{,-proposed} distribution targets; drop out the karmic + non-proposed target, since uploads to the release pocket are not + permitted for stable releases. + + -- Steve Langasek Mon, 09 Nov 2009 12:39:17 +0000 + emacs-goodies-el (30.8-1) unstable; urgency=low * debian-el @@ -496,6 +559,17 @@ emacs-goodies-el (30.4-1) unstable; urge -- Peter S Galbraith Wed, 02 Sep 2009 17:05:19 -0400 +emacs-goodies-el (30.3-1ubuntu1) karmic; urgency=low + + * Resynchronise with Debian. Remaining changes: LP: #400965 + - Add {hardy,intrepid,jaunty}{,-proposed} distribution targets to + dpkg-dev-el. + - Add karmic{,-proposed} distribution targets; drop out the jaunty + non-proposed target, since uploads to the release pocket are not + permitted for stable releases. + + -- Bhavani Shankar Sat, 15 Aug 2009 11:29:09 +0530 + emacs-goodies-el (30.3-1) unstable; urgency=low [ Daniel Moerner ] @@ -555,6 +629,17 @@ emacs-goodies-el (30.0-1) unstable; urge -- Peter S Galbraith Thu, 14 May 2009 21:36:06 -0400 +emacs-goodies-el (29.5-1ubuntu1) karmic; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add {hardy,intrepid,jaunty}{,-proposed} distribution targets to + dpkg-dev-el. + * Add karmic{,-proposed} distribution targets; drop out the jaunty + non-proposed target, since uploads to the release pocket are not + permitted for stable releases. + + -- Colin Watson Mon, 27 Apr 2009 20:52:17 +0100 + emacs-goodies-el (29.5-1) unstable; urgency=low * debian-el: @@ -588,6 +673,25 @@ emacs-goodies-el (29.5-1) unstable; urge -- Peter S Galbraith Mon, 23 Feb 2009 20:11:51 +0000 +emacs-goodies-el (29.4-1ubuntu2) jaunty; urgency=low + + * Capitalization of tag Dm-Upload-Allowed in debian/control + changed to the more commonly used DM-Upload-Allowed (LP: #307920) + Fixed by 99_ubuntu_dm_upload_fix.dpatch. + * Ubuntu maintainer mangling + + -- Morten Kjeldgaard Mon, 23 Feb 2008 15:10:00 +0100 + +emacs-goodies-el (29.4-1ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable, remaining changes: + - add {hardy,intrepid}{,-proposed} distribution targets to dpkg-dev-el. + * add jaunty{,-proposed} distribution targets; drop out the hardy and + intrepid non-proposed targets, since uploads to the release pocket + are not permitted for stable releases. + + -- Steve Langasek Fri, 14 Nov 2008 00:23:50 +0000 + emacs-goodies-el (29.4-1) unstable; urgency=high * debian-el: @@ -603,6 +707,13 @@ emacs-goodies-el (29.4-1) unstable; urge -- Peter S Galbraith Tue, 09 Sep 2008 21:28:31 -0400 +emacs-goodies-el (29.3-2ubuntu1) intrepid; urgency=low + + * add {hardy,intrepid}{,-proposed} distribution targets to dpkg-dev-el. + LP: #267822 + + -- Reinhard Tartler Mon, 08 Sep 2008 18:21:15 +0200 + emacs-goodies-el (29.3-2) unstable; urgency=low * devscripts-el: diff -pruN 35.2/debian/control 35.2ubuntu1/debian/control --- 35.2/debian/control 2011-08-17 03:54:40.000000000 +0000 +++ 35.2ubuntu1/debian/control 2011-11-07 21:43:49.000000000 +0000 @@ -1,7 +1,8 @@ Source: emacs-goodies-el Section: editors Priority: optional -Maintainer: Peter S Galbraith +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Peter S Galbraith Build-Depends: debhelper (>= 7), quilt (>= 0.46-7), texinfo Standards-Version: 3.9.0 Vcs-Cvs: :pserver:anonymous@cvs.alioth.debian.org:/cvsroot/pkg-goodies-el emacs-goodies-el diff -pruN 35.2/elisp/dpkg-dev-el/debian-changelog-mode.el 35.2ubuntu1/elisp/dpkg-dev-el/debian-changelog-mode.el --- 35.2/elisp/dpkg-dev-el/debian-changelog-mode.el 2011-10-27 11:41:58.000000000 +0000 +++ 35.2ubuntu1/elisp/dpkg-dev-el/debian-changelog-mode.el 2011-11-07 21:48:54.000000000 +0000 @@ -394,6 +394,15 @@ This defaults to the value of (in order "stable-security" "oldstable-security" "experimental" + "hardy-proposed" + "jaunty-proposed" + "karmic-proposed" + "lucid-proposed" + "maverick-proposed" + "natty-proposed" + "oneiric-proposed" + "precise-proposed" + "precise" "UNRELEASED" ) "*Allowed values for distribution." :group 'debian-changelog