--- trash-cli-0.1.10.28/debian/changelog 2011-10-31 15:16:36.000000000 -0400 +++ trash-cli-0.11.3-r315/debian/changelog 2011-10-31 15:16:01.000000000 -0400 @@ -1,3 +1,35 @@ +trash-cli (0.11.3-r315-0.1) unstable; urgency=low + + * Non-Maintainer Upload. + * New upstream release (Closes: #550074). + - Output of 'df' misinterpreted on non-english systems or + systems using long device names (Closes: #493212). + - Debian version of trash-cli contains a serious bug that + could create data loss (Closes: #593104). + * Convert from deprecated python-support to dh_python2. + - Drop pycompat and pyversions files. + - Set X-Python-Version filed in debian/control to >= 2.5 (Closes: #510043). + - Set DEB_PYTHON2_MODULE_PACKAGES in debian/rules. + - Versionize build dependencies on cdbs (>= 0.4.90~) and + python (>= 2.6.6-3~). + * Drop debian/manpages/* in favor of new upstream manpages. + * Convert to source format 3.0 (quilt). This was done even though this is a + NMU as patches are added and CDBS' simple-patchsys is deprecated. + * debian/patches/manpage-typos.patch: + - Fixes typos in empty-trash.1 (Closes: #611689). Thanks to Oohara Yuuma. + - Make sure command names in man pages reflect reality. + * debian/patches/manpage-install-path.patch: + - Install manpages into the correct location. + * Update debian/watch for move from Source Forge to Google Code. + * debian/control: + - Depend on ${misc:Depends}. + - Update homepage field. + - Add new dependency on python-unipath. + - Add build dependency on python-setuptools. + * Add debian/NEWS documenting the change in command names. + + -- Andrew Starr-Bochicchio Mon, 31 Oct 2011 15:15:13 -0400 + trash-cli (0.1.10.28-2) unstable; urgency=low * Removed surplus manpage (Bug: 489423) --- trash-cli-0.1.10.28/debian/control 2011-10-31 15:16:36.000000000 -0400 +++ trash-cli-0.11.3-r315/debian/control 2011-10-31 12:56:58.000000000 -0400 @@ -2,16 +2,19 @@ Section: utils Priority: extra Maintainer: Steve Stalcup -Build-Depends: cdbs (>= 0.4.49), - debhelper (>= 5), - python, - python-support (>= 0.6.4), +Build-Depends: cdbs (>= 0.4.90~), + debhelper (>= 5), + python (>= 2.6.6-3~), + python-setuptools Standards-Version: 3.8.0 -Homepage: http://www.andreafrancia.it/trash/ +X-Python-Version: >= 2.5 +Homepage: http://code.google.com/p/trash-cli/ Package: trash-cli Architecture: all -Depends: ${python:Depends} +Depends: ${python:Depends}, + ${misc:Depends}, + python-unipath Description: command line trashcan utility This package provides a command line interface trashcan utility compliant with the FreeDesktop.org Trash Specification. It remembers --- trash-cli-0.1.10.28/debian/manpage/empty-trash.1 2011-10-31 15:16:36.000000000 -0400 +++ trash-cli-0.11.3-r315/debian/manpage/empty-trash.1 1969-12-31 19:00:00.000000000 -0500 @@ -1,57 +0,0 @@ -.\" Copyright (C) 2008 Steve Stalcup -.\" -.\" This manual page is free software. It is distributed under the -.\" terms of the GNU General Public License as published by the Free -.\" Software Foundation; either version 2 of the License, or (at your -.\" option) any later version. -.\" -.\" This manual page is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License -.\" along with this manual page; if not, write to the Free Software -.\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 -.\" USA -.\" -.TH "EMPTY-TRASH" "1" -.if n .ad l -.nh - -.SH "NAME" -trash \- Command line trash utility. - -.SH "SYNOPSIS" -.B trash -.RI [ arguments ] -\&... - -.SH "DESCRIPTION" -.PP -This package provides a command line interface trashcan utility compliant with -the FreeDesktop.org Trash Specification. It remembers the name, original path, -deletion date, and permissions of each trashed file -.sp - -.SH "ARGUMENTS" - -.TP -To remove all trashed files, use 'emtpy-trash' - -.TP -To remove files that have been in the trash more than a given number of days, use 'empty-trash x', 'x' representing the nuber of days. - -.SH "BUGS" -Report bugs to Andrea Francia - -.SH "AUTHORS" -Trash was written by Andrea Francia and Einar Orn Olason . This manual page was written by Steve Stalcup . - -.SH "SEE ALSO" -list-trash(1), restore-trash(1), list-trash(1), empty-trash(1), and the -FreeDesktop.org Trash Specification at -http://www.ramendik.ru/docs/trashspec.html -.br - -Both are released under the \s-1GNU\s0 General Public License, version 2 or later. --- trash-cli-0.1.10.28/debian/manpage/list-trash.1 2011-10-31 15:16:36.000000000 -0400 +++ trash-cli-0.11.3-r315/debian/manpage/list-trash.1 1969-12-31 19:00:00.000000000 -0500 @@ -1,54 +0,0 @@ -.\" Copyright (C) 2008 Steve Stalcup -.\" -.\" This manual page is free software. It is distributed under the -.\" terms of the GNU General Public License as published by the Free -.\" Software Foundation; either version 2 of the License, or (at your -.\" option) any later version. -.\" -.\" This manual page is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License -.\" along with this manual page; if not, write to the Free Software -.\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 -.\" USA -.\" -.TH "LIST-TRASH" "1" -.if n .ad l -.nh - -.SH "NAME" -trash \- Command line trash utility. - -.SH "SYNOPSIS" -.B trash -.RI [ arguments ] -\&... - -.SH "DESCRIPTION" -.PP -This package provides a command line interface trashcan utility compliant with -the FreeDesktop.org Trash Specification. It remembers the name, original path, -deletion date, and permissions of each trashed file -.sp - -.SH "ARGUMENTS" - -.TP -To list all the contents of the trashcan, use 'list-trash'. - -.SH "BUGS" -Report bugs to Andrea Francia - -.SH "AUTHORS" -Trash was written by Andrea Francia and Einar Orn Olason . This manual page was written by Steve Stalcup . - -.SH "SEE ALSO" -list-trash(1), restore-trash(1), list-trash(1), empty-trash(1), and the -FreeDesktop.org Trash Specification at -http://www.ramendik.ru/docs/trashspec.html -.br - -Both are released under the \s-1GNU\s0 General Public License, version 2 or later. --- trash-cli-0.1.10.28/debian/manpage/restore-trash.1 2011-10-31 15:16:36.000000000 -0400 +++ trash-cli-0.11.3-r315/debian/manpage/restore-trash.1 1969-12-31 19:00:00.000000000 -0500 @@ -1,54 +0,0 @@ -.\" Copyright (C) 2008 Steve Stalcup -.\" -.\" This manual page is free software. It is distributed under the -.\" terms of the GNU General Public License as published by the Free -.\" Software Foundation; either version 2 of the License, or (at your -.\" option) any later version. -.\" -.\" This manual page is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License -.\" along with this manual page; if not, write to the Free Software -.\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 -.\" USA -.\" -.TH "RESTORE-TRASH" "1" -.if n .ad l -.nh - -.SH "NAME" -trash \- Command line trash utility. - -.SH "SYNOPSIS" -.B trash -.RI [ arguments ] -\&... - -.SH "DESCRIPTION" -.PP -This package provides a command line interface trashcan utility compliant with -the FreeDesktop.org Trash Specification. It remembers the name, original path, -deletion date, and permissions of each trashed file -.sp - -.SH "ARGUMENTS" - -.TP -To restore a trashed file 'foo', use 'restore-trash foo' - -.SH "BUGS" -Report bugs to Andrea Francia - -.SH "AUTHORS" -Trash was written by Andrea Francia and Einar Orn Olason . This manual page was written by Steve Stalcup . - -.SH "SEE ALSO" -list-trash(1), restore-trash(1), list-trash(1), empty-trash(1), and the -FreeDesktop.org Trash Specification at -http://www.ramendik.ru/docs/trashspec.html -.br - -Both are released under the \s-1GNU\s0 General Public License, version 2 or later. --- trash-cli-0.1.10.28/debian/manpage/trash.1 2011-10-31 15:16:36.000000000 -0400 +++ trash-cli-0.11.3-r315/debian/manpage/trash.1 1969-12-31 19:00:00.000000000 -0500 @@ -1,54 +0,0 @@ -.\" Copyright (C) 2008 Steve Stalcup -.\" -.\" This manual page is free software. It is distributed under the -.\" terms of the GNU General Public License as published by the Free -.\" Software Foundation; either version 2 of the License, or (at your -.\" option) any later version. -.\" -.\" This manual page is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License -.\" along with this manual page; if not, write to the Free Software -.\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 -.\" USA -.\" -.TH "TRASH" "1" -.if n .ad l -.nh - -.SH "NAME" -trash \- Command line trash utility. - -.SH "SYNOPSIS" -.B trash -.RI [ arguments ] -\&... - -.SH "DESCRIPTION" -.PP -This package provides a command line interface trashcan utility compliant with -the FreeDesktop.org Trash Specification. It remembers the name, original path, -deletion date, and permissions of each trashed file -.sp - -.SH "ARGUMENTS" - -.TP -To remove move 'foo' in the trashcan, use 'trash foo' - -.SH "BUGS" -Report bugs to Andrea Francia - -.SH "AUTHORS" -Trash was written by Andrea Francia and Einar Orn Olason . This manual page was written by Steve Stalcup . - -.SH "SEE ALSO" -list-trash(1), restore-trash(1), list-trash(1), empty-trash(1), and the -FreeDesktop.org Trash Specification at -http://www.ramendik.ru/docs/trashspec.html -.br - -Both are released under the \s-1GNU\s0 General Public License, version 2 or later. --- trash-cli-0.1.10.28/debian/manpages 2011-10-31 15:16:36.000000000 -0400 +++ trash-cli-0.11.3-r315/debian/manpages 1969-12-31 19:00:00.000000000 -0500 @@ -1,4 +0,0 @@ -debian/manpage/empty-trash.1 -debian/manpage/list-trash.1 -debian/manpage/restore-trash.1 -debian/manpage/trash.1 --- trash-cli-0.1.10.28/debian/NEWS 1969-12-31 19:00:00.000000000 -0500 +++ trash-cli-0.11.3-r315/debian/NEWS 2011-10-31 13:12:50.000000000 -0400 @@ -0,0 +1,15 @@ +trash-cli (0.11.3-r315-0.1) unstable; urgency=low + + The names of the binaries provided by this package have + been changed upstream. Both the old command and its + corresponding new command are provided below for your + convenience. Please update any usage in scripts accordingly. + + Old command: New command: + - trash -> trash-put + - empty-trash -> trash-empty + - list-trash -> trash-list + + The restore-trash command remains the same. + + -- Andrew Starr-Bochicchio Mon, 17 Oct 2011 12:46:50 -0400 --- trash-cli-0.1.10.28/debian/patches/manpage-install-path.diff 1969-12-31 19:00:00.000000000 -0500 +++ trash-cli-0.11.3-r315/debian/patches/manpage-install-path.diff 2011-10-31 14:50:47.000000000 -0400 @@ -0,0 +1,18 @@ +Description:Install manpages into the correct location. +Author: Andrew Starr-Bochicchio +Forwarded: yes +Bug: http://code.google.com/p/trash-cli/issues/detail?id=66 + +Index: trash-cli-0.11.3-r315/setup.py +=================================================================== +--- trash-cli-0.11.3-r315.orig/setup.py 2011-10-31 14:29:58.842836388 -0400 ++++ trash-cli-0.11.3-r315/setup.py 2011-10-31 14:29:58.874836703 -0400 +@@ -78,7 +78,7 @@ + 'trash-empty = trashcli.cli.empty:main' + ] + }, +- data_files = [('man/man1', ['man/man1/trash-empty.1', ++ data_files = [('share/man/man1', ['man/man1/trash-empty.1', + 'man/man1/trash-list.1', + 'man/man1/restore-trash.1', + 'man/man1/trash-put.1'])], --- trash-cli-0.1.10.28/debian/patches/manpage-typos.diff 1969-12-31 19:00:00.000000000 -0500 +++ trash-cli-0.11.3-r315/debian/patches/manpage-typos.diff 2011-10-31 14:42:37.000000000 -0400 @@ -0,0 +1,238 @@ +Description: Patch fixes typos in empty-trash.1 (Closes: #611689). Thanks to Oohara Yuuma. + It also makes sure command names in man pages reflect reality. +Author: Andrew Starr-Bochicchio +Forwarded: no, The upstream bug below requests that the help output be updated + and that the manpages be generated at build time with help2man. This patch + is simply a work around for the same issue. +Bug: http://code.google.com/p/trash-cli/issues/detail?id=30 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=611689 + +Index: trash-cli-0.11.3-r315/man/man1/trash-list.1 +=================================================================== +--- trash-cli-0.11.3-r315.orig/man/man1/trash-list.1 2011-10-31 14:23:22.235115227 -0400 ++++ trash-cli-0.11.3-r315/man/man1/trash-list.1 2011-10-31 14:24:39.103831636 -0400 +@@ -51,7 +51,7 @@ + Changes made by Massimo Cavalleri . + + .SH "SEE ALSO" +-trash-put(1), trash-restore(1), trash-empty(1), and the ++trash-put(1), restore-trash(1), trash-empty(1), and the + FreeDesktop.org Trash Specification at + http://www.ramendik.ru/docs/trashspec.html. + .br +Index: trash-cli-0.11.3-r315/man/man1/trash-put.1 +=================================================================== +--- trash-cli-0.11.3-r315.orig/man/man1/trash-put.1 2011-10-31 14:23:22.195114853 -0400 ++++ trash-cli-0.11.3-r315/man/man1/trash-put.1 2011-10-31 14:24:39.103831636 -0400 +@@ -15,13 +15,13 @@ + .\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + .\" USA + .\" +-.TH "TRASH" "1" ++.TH "TRASH-PUT" "1" + + .SH "NAME" +-trash \- Command line trash utility. ++trash-put \- Command line trash utility. + + .SH "SYNOPSIS" +-.B trash ++.B trash-put + .RI [ arguments ] + \&... + +@@ -40,7 +40,7 @@ + .nf + $ cd /home/andrea/ + $ touch foo bar +-$ trash foo bar ++$ trash-put foo bar + .fi + + .SH "BUGS" +@@ -54,7 +54,7 @@ + Changes made by Massimo Cavalleri . + + .SH "SEE ALSO" +-trash-list(1), trash-restore(1), trash-empty(1), and the ++trash-list(1), restore-trash(1), trash-empty(1), and the + FreeDesktop.org Trash Specification at + http://www.ramendik.ru/docs/trashspec.html. + .br +Index: trash-cli-0.11.3-r315/man/man1/trash-restore.1 +=================================================================== +--- trash-cli-0.11.3-r315.orig/man/man1/trash-restore.1 2011-10-31 14:23:22.175114666 -0400 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,65 +0,0 @@ +-.\" Copyright (C) 2008 Steve Stalcup +-.\" +-.\" This manual page is free software. It is distributed under the +-.\" terms of the GNU General Public License as published by the Free +-.\" Software Foundation; either version 2 of the License, or (at your +-.\" option) any later version. +-.\" +-.\" This manual page is distributed in the hope that it will be useful, +-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-.\" GNU General Public License for more details. +-.\" +-.\" You should have received a copy of the GNU General Public License +-.\" along with this manual page; if not, write to the Free Software +-.\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 +-.\" USA +-.\" +-.TH "TRASH-RESTORE" "1" +- +-.SH "NAME" +-trash-restore \- Restore for Command line trash utility. +- +-.SH "SYNOPSIS" +-.B trash-restore +- +-.SH "DESCRIPTION" +-.PP +-Use for restore a trashed file or directory, in the original path. +-This command is a part of trash-cli package that provides a command +-line interface trashcan utility compliant with the FreeDesktop.org +-Trash Specification. +-It remembers the name, original path, deletion date, and permissions of +-each trashed file. +- +-.SH "EXAMPLES" +-.nf +-$ trash-restore +-0 2007-08-30 12:36:00 /home/andrea/foo +-1 2007-08-30 12:39:41 /home/andrea/bar +-2 2007-08-30 12:39:41 /home/andrea/bar2 +-3 2007-08-30 12:39:41 /home/andrea/foo2 +-4 2007-08-30 12:39:41 /home/andrea/foo +-What file to restore [0..4]: 4 +-$ ls foo +-foo +-.fi +- +-.SH "BUGS" +-Report bugs to http://code.google.com/p/trash-cli/issues +- +-.SH "AUTHORS" +-Trash was written by Andrea Francia +- +-and Einar Orn Olason . +-This manual page was written by Steve Stalcup . +-Changes made by Massimo Cavalleri . +- +-.SH "SEE ALSO" +-trash-put(1), trash-list(1), trash-empty(1), and the +-FreeDesktop.org Trash Specification at +-http://www.ramendik.ru/docs/trashspec.html. +-.br +- +-Both are released under the \s-1GNU\s0 General Public License, +-version 2 or later. +Index: trash-cli-0.11.3-r315/man/man1/restore-trash.1 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ trash-cli-0.11.3-r315/man/man1/restore-trash.1 2011-10-31 14:24:39.103831636 -0400 +@@ -0,0 +1,65 @@ ++.\" Copyright (C) 2008 Steve Stalcup ++.\" ++.\" This manual page is free software. It is distributed under the ++.\" terms of the GNU General Public License as published by the Free ++.\" Software Foundation; either version 2 of the License, or (at your ++.\" option) any later version. ++.\" ++.\" This manual page is distributed in the hope that it will be useful, ++.\" but WITHOUT ANY WARRANTY; without even the implied warranty of ++.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++.\" GNU General Public License for more details. ++.\" ++.\" You should have received a copy of the GNU General Public License ++.\" along with this manual page; if not, write to the Free Software ++.\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 ++.\" USA ++.\" ++.TH "RESTORE-TRASH" "1" ++ ++.SH "NAME" ++restore-trash \- Restore for Command line trash utility. ++ ++.SH "SYNOPSIS" ++.B restore-trash ++ ++.SH "DESCRIPTION" ++.PP ++Use for restore a trashed file or directory, in the original path. ++This command is a part of trash-cli package that provides a command ++line interface trashcan utility compliant with the FreeDesktop.org ++Trash Specification. ++It remembers the name, original path, deletion date, and permissions of ++each trashed file. ++ ++.SH "EXAMPLES" ++.nf ++$ restore-trash ++0 2007-08-30 12:36:00 /home/andrea/foo ++1 2007-08-30 12:39:41 /home/andrea/bar ++2 2007-08-30 12:39:41 /home/andrea/bar2 ++3 2007-08-30 12:39:41 /home/andrea/foo2 ++4 2007-08-30 12:39:41 /home/andrea/foo ++What file to restore [0..4]: 4 ++$ ls foo ++foo ++.fi ++ ++.SH "BUGS" ++Report bugs to http://code.google.com/p/trash-cli/issues ++ ++.SH "AUTHORS" ++Trash was written by Andrea Francia ++ ++and Einar Orn Olason . ++This manual page was written by Steve Stalcup . ++Changes made by Massimo Cavalleri . ++ ++.SH "SEE ALSO" ++trash-put(1), trash-list(1), trash-empty(1), and the ++FreeDesktop.org Trash Specification at ++http://www.ramendik.ru/docs/trashspec.html. ++.br ++ ++Both are released under the \s-1GNU\s0 General Public License, ++version 2 or later. +Index: trash-cli-0.11.3-r315/setup.py +=================================================================== +--- trash-cli-0.11.3-r315.orig/setup.py 2011-10-31 14:23:22.255115412 -0400 ++++ trash-cli-0.11.3-r315/setup.py 2011-10-31 14:24:39.103831636 -0400 +@@ -80,7 +80,7 @@ + }, + data_files = [('man/man1', ['man/man1/trash-empty.1', + 'man/man1/trash-list.1', +- 'man/man1/trash-restore.1', ++ 'man/man1/restore-trash.1', + 'man/man1/trash-put.1'])], + cmdclass={'google_upload': google_upload}, + ) +Index: trash-cli-0.11.3-r315/man/man1/trash-empty.1 +=================================================================== +--- trash-cli-0.11.3-r315.orig/man/man1/trash-empty.1 ++++ trash-cli-0.11.3-r315/man/man1/trash-empty.1 +@@ -21,7 +21,7 @@ + trash-empty \- Empty for Command line trash utility. + + .SH "SYNOPSIS" +-.B Trash-empty ++.B trash-empty + .RI [ arguments ] + + .SH "DESCRIPTION" +--- trash-cli-0.11.3-r315.orig/man/man1/trash-empty.1 2011-10-31 14:24:54.823978086 -0400 ++++ trash-cli-0.11.3-r315/man/man1/trash-empty.1 2011-10-31 14:25:37.268373394 -0400 +@@ -71,7 +71,7 @@ + Changes made by Massimo Cavalleri . + + .SH "SEE ALSO" +-trash-put(1), trash-restore(1), trash-list(1), and the ++trash-put(1), restore-trash(1), trash-list(1), and the + FreeDesktop.org Trash Specification at + http://www.ramendik.ru/docs/trashspec.html. + .br --- trash-cli-0.1.10.28/debian/patches/series 1969-12-31 19:00:00.000000000 -0500 +++ trash-cli-0.11.3-r315/debian/patches/series 2011-10-31 14:28:01.000000000 -0400 @@ -0,0 +1,2 @@ +manpage-typos.diff +manpage-install-path.diff --- trash-cli-0.1.10.28/debian/pycompat 2011-10-31 15:16:36.000000000 -0400 +++ trash-cli-0.11.3-r315/debian/pycompat 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -2 --- trash-cli-0.1.10.28/debian/pyversions 2011-10-31 15:16:36.000000000 -0400 +++ trash-cli-0.11.3-r315/debian/pyversions 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -2.3- --- trash-cli-0.1.10.28/debian/rules 2011-10-31 15:16:36.000000000 -0400 +++ trash-cli-0.11.3-r315/debian/rules 2011-10-17 14:19:38.000000000 -0400 @@ -1,8 +1,6 @@ #!/usr/bin/make -f -DEB_PYTHON_SYSTEM=pysupport +DEB_PYTHON2_MODULE_PACKAGES = trash-cli include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/python-distutils.mk - - --- trash-cli-0.1.10.28/debian/source/format 1969-12-31 19:00:00.000000000 -0500 +++ trash-cli-0.11.3-r315/debian/source/format 2011-10-17 14:20:32.000000000 -0400 @@ -0,0 +1 @@ +3.0 (quilt) --- trash-cli-0.1.10.28/debian/watch 2011-10-31 15:16:36.000000000 -0400 +++ trash-cli-0.11.3-r315/debian/watch 2011-10-17 12:46:27.000000000 -0400 @@ -1,5 +1,4 @@ version=3 -http://sf.net/bluetrash/trash-cli-(.*)\.tar\.gz - - +opts="versionmangle=s/\.dev/\~dev/" \ +http://googlecode.debian.net/p/trash-cli/trash-cli-(.+)\.tar\.gz