diff -Nru ppa-purge-0.2.6/debian/changelog ppa-purge-0.2.7/debian/changelog --- ppa-purge-0.2.6/debian/changelog 2009-12-05 20:07:35.000000000 +0000 +++ ppa-purge-0.2.7/debian/changelog 2010-07-29 11:52:55.000000000 +0100 @@ -1,49 +1,13 @@ -ppa-purge (0.2.6) lucid; urgency=low +ppa-purge (0.2.7) maverick; urgency=low - * No change version bump to upload for lucid. + * Add option to force the distribution name so it can work on + ubuntu derivatives. (LP: #610376) + * Correctly exit when not invoked with sudo. - -- Robert Hooker Sat, 05 Dec 2009 15:07:00 -0500 + -- Robert Hooker Tue, 27 Jul 2010 23:23:44 -0400 -ppa-purge (0.2.5) karmic; urgency=low +ppa-purge (0+bzr46.1) maverick; urgency=low - * New syntax: ppa-purge [options] (not the other way) - * New option -s for repository server hostname - * Accept the ppa:owner/name URI as well - * use dpkg --print-architecture and drop depends on dpkg-dev - * debian/control: Architecture: all - * debian/control: update to Standards 3.8.3 (no changes needed) + * Initial Ubuntu release (LP: #521449) - -- Tormod Volden Wed, 30 Sep 2009 00:58:31 +0200 - -ppa-purge (0.2.4) karmic; urgency=low - - * Add dpkg-dev to depends for dpkg-architecture. - - -- Robert Hooker Wed, 12 Aug 2009 20:51:48 -0400 - -ppa-purge (0.2.3) karmic; urgency=low - - * Remove -v option, make the script always verbose. - * Minor fixups and warnings added. - - -- Robert Hooker Thu, 06 Aug 2009 14:59:18 -0400 - -ppa-purge (0.2.2) karmic; urgency=low - - * Fix command option parsing errors. - - -- Robert Hooker (Sarvatt) Wed, 05 Aug 2009 09:13:35 -0400 - -ppa-purge (0.2) karmic; urgency=low - - * Don't remove ppa-purge if the package exists in the PPA list. - * Add error message if PPA = xorg-edgers with a notice that libdrm-radeon1 - has to be manually removed afterwards. - - -- Robert Hooker (Sarvatt) Wed, 29 Jul 2009 08:51:35 -0400 - -ppa-purge (0.1) karmic; urgency=low - - * Initial Release. - - -- Robert Hooker (Sarvatt) Wed, 29 Jul 2009 04:01:34 -0400 + -- Lorenzo De Liso Fri, 23 Jul 2010 00:02:50 +0200 diff -Nru ppa-purge-0.2.6/debian/control ppa-purge-0.2.7/debian/control --- ppa-purge-0.2.6/debian/control 2009-12-05 19:13:22.000000000 +0000 +++ ppa-purge-0.2.7/debian/control 2010-07-28 04:04:40.000000000 +0100 @@ -1,16 +1,15 @@ Source: ppa-purge -Section: admin -Priority: extra -Maintainer: Robert Hooker (Sarvatt) -Build-Depends: debhelper (>= 7) -Standards-Version: 3.8.3 -Vcs-Bzr: https://code.launchpad.net/~xorg-edgers/ppa-purge/ubuntu +Section: utils +Priority: optional +Maintainer: Lorenzo De Liso +Build-Depends: debhelper (>= 7.0.50~) +Standards-Version: 3.9.0 +Homepage: https://launchpad.net/ppa-purge Package: ppa-purge Architecture: all Depends: ${misc:Depends} -Description: Disables a PPA and reverts to official packages - This package provides a script capable of automatically downgrading all - packages from a given PPA back to the official Ubuntu versions. - . - Invoke it with ppa-purge -h for complete details. +Description: disables a PPA and reverts to official packages + This program disables a PPA from your Software Sources and reverts your + system back to the official Ubuntu packages. You can use this to return your + system to normal after testing a new version from a PPA. diff -Nru ppa-purge-0.2.6/debian/copyright ppa-purge-0.2.7/debian/copyright --- ppa-purge-0.2.6/debian/copyright 2009-07-30 03:30:19.000000000 +0100 +++ ppa-purge-0.2.7/debian/copyright 2010-07-28 04:04:40.000000000 +0100 @@ -1,31 +1,31 @@ -This package was debianized by: - - Robert Hooker (Sarvatt) on Wed, 29 Jul 2009 04:01:34 -0400 +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: ppa-purge +Maintainer: Robert Hooker +Source: https://launchpad.net/ppa-purge +Files: * Copyright: + 2009, Robert Hooker + 2009, Tormod Volden +License: GPL-3 - - -License: - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This package 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 program. If not, see . - -On Debian systems, the complete text of the GNU General -Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. - -The Debian packaging is: - - Copyright (C) 2009 Robert Hooker (Sarvatt) - -and is licensed under the GPL version 3, see above. +Files: debian/* +Copyright: + 2009, Robert Hooker + 2010, Lorenzo De Liso +License: GPL-3 + +License: GPL-3 + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License version 3 as published by the Free Software Foundation. + . + This program 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. + . + On Debian systems, the full text of the GNU General Public + License version 3 can be found in the file + `/usr/share/common-licenses/GPL-3'. diff -Nru ppa-purge-0.2.6/debian/dirs ppa-purge-0.2.7/debian/dirs --- ppa-purge-0.2.6/debian/dirs 2009-07-30 03:30:19.000000000 +0100 +++ ppa-purge-0.2.7/debian/dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/bin diff -Nru ppa-purge-0.2.6/debian/install ppa-purge-0.2.7/debian/install --- ppa-purge-0.2.6/debian/install 2009-07-30 03:30:19.000000000 +0100 +++ ppa-purge-0.2.7/debian/install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ppa-purge /usr/bin/ diff -Nru ppa-purge-0.2.6/debian/ppa-purge.1 ppa-purge-0.2.7/debian/ppa-purge.1 --- ppa-purge-0.2.6/debian/ppa-purge.1 1970-01-01 01:00:00.000000000 +0100 +++ ppa-purge-0.2.7/debian/ppa-purge.1 2010-07-29 11:57:44.000000000 +0100 @@ -0,0 +1,28 @@ +.TH ppa-purge 1 2010-07-23 "ppa-purge" +.SH NAME +ppa-purge \- disables a PPA and reverts to official packages + +.SH SYNOPSIS +.B ppa-purge \fB-p|-purge\fR \fInameoftheppa\fR [\fB\-s|-server\fR \fIhost\fR] + +.SH DESCRIPTION +This script provides a bash shell script capable of automatically downgrading all packages in a given PPA back to the ubuntu versions. + +.PP +You have to run it using root privileges because of the package manager. + +.SH OPTIONS + +.TP +.B -p, -purge\fR \fIPPA\fR +Name of the PPA to be reset, the default value is ppa. +.TP + +.B -s, -server\fR \fIhost\fR +Name of the repository server, the default value is ppa.launchpad.net. + +.SH COPYRIGHT +This manual page is Copyright 2010 Lorenzo De Liso . +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU General Public License, Version 3 or any later +version published by the Free Software Foundation. diff -Nru ppa-purge-0.2.6/debian/ppa-purge.install ppa-purge-0.2.7/debian/ppa-purge.install --- ppa-purge-0.2.6/debian/ppa-purge.install 1970-01-01 01:00:00.000000000 +0100 +++ ppa-purge-0.2.7/debian/ppa-purge.install 2010-07-29 11:57:50.000000000 +0100 @@ -0,0 +1 @@ +ppa-purge usr/sbin diff -Nru ppa-purge-0.2.6/debian/ppa-purge.manpages ppa-purge-0.2.7/debian/ppa-purge.manpages --- ppa-purge-0.2.6/debian/ppa-purge.manpages 1970-01-01 01:00:00.000000000 +0100 +++ ppa-purge-0.2.7/debian/ppa-purge.manpages 2010-07-29 11:57:55.000000000 +0100 @@ -0,0 +1 @@ +debian/ppa-purge.1 diff -Nru ppa-purge-0.2.6/debian/rules ppa-purge-0.2.7/debian/rules --- ppa-purge-0.2.6/debian/rules 2009-12-05 19:13:22.000000000 +0000 +++ ppa-purge-0.2.7/debian/rules 2010-07-28 04:04:40.000000000 +0100 @@ -1,92 +1,4 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. +%: + dh $@ -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - - - - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - #$(MAKE) - #docbook-to-man debian/ppa-purge.sgml > ppa-purge.1 - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - #$(MAKE) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Add here commands to install the package into debian/ppa-purge. - #$(MAKE) DESTDIR=$(CURDIR)/debian/ppa-purge install - - -# Build architecture-dependent files here. -binary-arch: install -# We have nothing to do by default. - -# Build architecture-independent files here. -binary-indep: install - dh_testdir - dh_testroot - dh_installchangelogs - install --mode=755 -t debian/ppa-purge/usr/bin ppa-purge -# dh_installdocs -# dh_installexamples -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo -# dh_installman - dh_link -# dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb -i -- -Zlzma - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff -Nru ppa-purge-0.2.6/debian/source/format ppa-purge-0.2.7/debian/source/format --- ppa-purge-0.2.6/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ ppa-purge-0.2.7/debian/source/format 2010-07-29 12:50:12.000000000 +0100 @@ -0,0 +1 @@ +3.0 (native) diff -Nru ppa-purge-0.2.6/ppa-purge ppa-purge-0.2.7/ppa-purge --- ppa-purge-0.2.6/ppa-purge 2009-12-05 19:13:22.000000000 +0000 +++ ppa-purge-0.2.7/ppa-purge 2010-07-29 11:54:24.000000000 +0100 @@ -11,6 +11,8 @@ # v0.2.3 - 2009-08-06: Removed verbose option. Also minor fixups # v0.2.4 - 2009-08-13: Package dependencies # v0.2.5 - 2009-09-30: New command syntax, various code rewrites +# v0.2.6 - 2009-12-05: No change version bump to fix packaging problems. +# v0.2.7 - 2010-07-29: Add -d option, minor fixups. # Defaults PPAHOST=ppa.launchpad.net @@ -42,9 +44,10 @@ echo "versions released for your distribution." echo echo "Options:" - echo " -p [ppa] Name of the PPA to be reset (default: ppa)" - echo " -s [host] Repository server (default: ppa.launchpad.net)" - echo " -h Display this help text" + echo " -p [ppa] Name of the PPA to be reset (default: ppa)" + echo " -s [host] Repository server (default: ppa.launchpad.net)" + echo " -d [distribution] Override the default distribution choice." + echo " -h Display this help text" echo echo "Example usage commands:" echo " sudo ppa-purge xorg-edgers" @@ -56,14 +59,19 @@ echo " sudo ppa-purge ppa:ubuntu-x-swat/x-updates" echo " will remove https://launchpad.net/~ubuntu-x-swat/+archive/x-updates" echo + echo "Notice: If ppa-purge fails for some reason and you wish to try again," + echo "(For example: you left synaptic open while attempting to run it) simply" + echo "uncomment the PPA from your sources, run apt-get update and try again." + echo exit $1 } # Command line options -while getopts "p:s:h\?" opt; do +while getopts "p:s:d:h\?" opt; do case "$opt" in p ) PPANAME="$OPTARG" ;; s ) PPAHOST="$OPTARG" ;; + d ) DIST="$OPTARG" ;; h ) usage 0; ;; \?) usage 1; ;; * ) warn "Unknown option '$opt'"; usage 1; ;; @@ -85,6 +93,7 @@ if [ "$(id -u)" != "0" ]; then warn "This script would need superuser privileges, use sudo" + usage 1 fi msg "PPA to be removed: $PPAOWNER $PPANAME"