diff -Nru mydevtools-2.0.3~hardy1ubuntu1/.bzr/branch/last-revision mydevtools-2.0.4~hardy1ubuntu1/.bzr/branch/last-revision --- mydevtools-2.0.3~hardy1ubuntu1/.bzr/branch/last-revision 2010-11-23 13:57:41.000000000 +0000 +++ mydevtools-2.0.4~hardy1ubuntu1/.bzr/branch/last-revision 2011-10-18 10:37:12.000000000 +0000 @@ -1 +1 @@ -22 v.ladeuil+lp@free.fr-20101123135741-w2ykpk4lp3gbluus +23 v.ladeuil+lp@free.fr-20111018103712-4fltynzvpyjec5bk diff -Nru mydevtools-2.0.3~hardy1ubuntu1/.bzr/branch/tiplog mydevtools-2.0.4~hardy1ubuntu1/.bzr/branch/tiplog --- mydevtools-2.0.3~hardy1ubuntu1/.bzr/branch/tiplog 1970-01-01 00:00:00.000000000 +0000 +++ mydevtools-2.0.4~hardy1ubuntu1/.bzr/branch/tiplog 2011-10-18 10:37:12.000000000 +0000 @@ -0,0 +1,2 @@ +20111018T103712 v.ladeuil+lp@free.fr-20111018103712-4fltynzvpyjec5bk init v.ladeuil+lp@free.fr +20111018T103712 v.ladeuil+lp@free.fr-20111018103712-4fltynzvpyjec5bk commit v.ladeuil+lp@free.fr \ No newline at end of file Binary files /tmp/Iw73ktQfpb/mydevtools-2.0.3~hardy1ubuntu1/.bzr/checkout/dirstate and /tmp/KxuMr7YXZd/mydevtools-2.0.4~hardy1ubuntu1/.bzr/checkout/dirstate differ diff -Nru mydevtools-2.0.3~hardy1ubuntu1/.bzr/checkout/merge-hashes mydevtools-2.0.4~hardy1ubuntu1/.bzr/checkout/merge-hashes --- mydevtools-2.0.3~hardy1ubuntu1/.bzr/checkout/merge-hashes 2010-11-23 13:55:55.000000000 +0000 +++ mydevtools-2.0.4~hardy1ubuntu1/.bzr/checkout/merge-hashes 2011-10-18 10:32:44.000000000 +0000 @@ -1,3 +1,3 @@ BZR merge-modified list format 1 -file_id: control-20090311053259-rt5vw82rd0delbh0-5 -hash: eaac37faca1f1954ba3cfe0d4f07dceb5984d4bb +file_id: todo-20090710173843-bgo4f3krtcy56j55-1 +hash: 2883930ce6d6a7c8bf4fd8d845f77dc2f0cb31b3 Binary files /tmp/Iw73ktQfpb/mydevtools-2.0.3~hardy1ubuntu1/.bzr/repository/indices/2b608128fa1b9ca2b20f2b2a8265e0c0.iix and /tmp/KxuMr7YXZd/mydevtools-2.0.4~hardy1ubuntu1/.bzr/repository/indices/2b608128fa1b9ca2b20f2b2a8265e0c0.iix differ Binary files /tmp/Iw73ktQfpb/mydevtools-2.0.3~hardy1ubuntu1/.bzr/repository/indices/2b608128fa1b9ca2b20f2b2a8265e0c0.rix and /tmp/KxuMr7YXZd/mydevtools-2.0.4~hardy1ubuntu1/.bzr/repository/indices/2b608128fa1b9ca2b20f2b2a8265e0c0.rix differ diff -Nru mydevtools-2.0.3~hardy1ubuntu1/.bzr/repository/indices/2b608128fa1b9ca2b20f2b2a8265e0c0.six mydevtools-2.0.4~hardy1ubuntu1/.bzr/repository/indices/2b608128fa1b9ca2b20f2b2a8265e0c0.six --- mydevtools-2.0.3~hardy1ubuntu1/.bzr/repository/indices/2b608128fa1b9ca2b20f2b2a8265e0c0.six 1970-01-01 00:00:00.000000000 +0000 +++ mydevtools-2.0.4~hardy1ubuntu1/.bzr/repository/indices/2b608128fa1b9ca2b20f2b2a8265e0c0.six 2011-10-18 10:32:44.000000000 +0000 @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + Binary files /tmp/Iw73ktQfpb/mydevtools-2.0.3~hardy1ubuntu1/.bzr/repository/indices/2b608128fa1b9ca2b20f2b2a8265e0c0.tix and /tmp/KxuMr7YXZd/mydevtools-2.0.4~hardy1ubuntu1/.bzr/repository/indices/2b608128fa1b9ca2b20f2b2a8265e0c0.tix differ Binary files /tmp/Iw73ktQfpb/mydevtools-2.0.3~hardy1ubuntu1/.bzr/repository/indices/aa66eac2a2e60e9cca73d269b75b1b8b.iix and /tmp/KxuMr7YXZd/mydevtools-2.0.4~hardy1ubuntu1/.bzr/repository/indices/aa66eac2a2e60e9cca73d269b75b1b8b.iix differ Binary files /tmp/Iw73ktQfpb/mydevtools-2.0.3~hardy1ubuntu1/.bzr/repository/indices/aa66eac2a2e60e9cca73d269b75b1b8b.rix and /tmp/KxuMr7YXZd/mydevtools-2.0.4~hardy1ubuntu1/.bzr/repository/indices/aa66eac2a2e60e9cca73d269b75b1b8b.rix differ diff -Nru mydevtools-2.0.3~hardy1ubuntu1/.bzr/repository/indices/aa66eac2a2e60e9cca73d269b75b1b8b.six mydevtools-2.0.4~hardy1ubuntu1/.bzr/repository/indices/aa66eac2a2e60e9cca73d269b75b1b8b.six --- mydevtools-2.0.3~hardy1ubuntu1/.bzr/repository/indices/aa66eac2a2e60e9cca73d269b75b1b8b.six 1970-01-01 00:00:00.000000000 +0000 +++ mydevtools-2.0.4~hardy1ubuntu1/.bzr/repository/indices/aa66eac2a2e60e9cca73d269b75b1b8b.six 2011-10-18 10:37:12.000000000 +0000 @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + Binary files /tmp/Iw73ktQfpb/mydevtools-2.0.3~hardy1ubuntu1/.bzr/repository/indices/aa66eac2a2e60e9cca73d269b75b1b8b.tix and /tmp/KxuMr7YXZd/mydevtools-2.0.4~hardy1ubuntu1/.bzr/repository/indices/aa66eac2a2e60e9cca73d269b75b1b8b.tix differ Binary files /tmp/Iw73ktQfpb/mydevtools-2.0.3~hardy1ubuntu1/.bzr/repository/pack-names and /tmp/KxuMr7YXZd/mydevtools-2.0.4~hardy1ubuntu1/.bzr/repository/pack-names differ Binary files /tmp/Iw73ktQfpb/mydevtools-2.0.3~hardy1ubuntu1/.bzr/repository/packs/2b608128fa1b9ca2b20f2b2a8265e0c0.pack and /tmp/KxuMr7YXZd/mydevtools-2.0.4~hardy1ubuntu1/.bzr/repository/packs/2b608128fa1b9ca2b20f2b2a8265e0c0.pack differ Binary files /tmp/Iw73ktQfpb/mydevtools-2.0.3~hardy1ubuntu1/.bzr/repository/packs/aa66eac2a2e60e9cca73d269b75b1b8b.pack and /tmp/KxuMr7YXZd/mydevtools-2.0.4~hardy1ubuntu1/.bzr/repository/packs/aa66eac2a2e60e9cca73d269b75b1b8b.pack differ diff -Nru mydevtools-2.0.3~hardy1ubuntu1/debian/changelog mydevtools-2.0.4~hardy1ubuntu1/debian/changelog --- mydevtools-2.0.3~hardy1ubuntu1/debian/changelog 2010-11-23 13:57:24.000000000 +0000 +++ mydevtools-2.0.4~hardy1ubuntu1/debian/changelog 2011-10-18 10:36:59.000000000 +0000 @@ -1,3 +1,9 @@ +mydevtools (2.0.4~hardy1ubuntu1) hardy; urgency=low + + * Merge trunk. + + -- Vincent Ladeuil Tue, 18 Oct 2011 12:36:27 +0200 + mydevtools (2.0.3~hardy1ubuntu1) hardy; urgency=low * emacs-goodies-el. Period. diff -Nru mydevtools-2.0.3~hardy1ubuntu1/TODO mydevtools-2.0.4~hardy1ubuntu1/TODO --- mydevtools-2.0.3~hardy1ubuntu1/TODO 2009-08-10 11:53:13.000000000 +0000 +++ mydevtools-2.0.4~hardy1ubuntu1/TODO 2011-10-18 10:32:44.000000000 +0000 @@ -3,7 +3,8 @@ debcommit debuild -S - cd .. - dput ppa:vila/ppa mydevtools_2.0.0ubuntu_source.changes + dput ppa:vila/ppa ../mydevtools_2.0.0ubuntu_source.changes + bzr mark-uploaded + bzr push We need at least a way to better control what is committed/when. \ No newline at end of file