summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/README.ubuntu-dev6
-rw-r--r--debian/apt.conf.ubuntu3
-rw-r--r--debian/changelog12
-rw-r--r--debian/copyright23
-rwxr-xr-xdebian/rules2
5 files changed, 12 insertions, 34 deletions
diff --git a/debian/README.ubuntu-dev b/debian/README.ubuntu-dev
deleted file mode 100644
index 9da152556..000000000
--- a/debian/README.ubuntu-dev
+++ /dev/null
@@ -1,6 +0,0 @@
-Build this package with:
-$ debian/rules arch-build
-or
-$ DEB_BUILD_PROG_OPTS="-S" debian/rules arch-build
-
-make sure you have the pre-build-depds in README.arch installed
diff --git a/debian/apt.conf.ubuntu b/debian/apt.conf.ubuntu
deleted file mode 100644
index d295aee25..000000000
--- a/debian/apt.conf.ubuntu
+++ /dev/null
@@ -1,3 +0,0 @@
-APT
-{
-};
diff --git a/debian/changelog b/debian/changelog
index 4da4e86b9..f1e0a97ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+apt (0.7.25.3ubuntu10) maverick; urgency=low
+
+ [ Michael Vogt ]
+ * debian/apt.conf.ubuntu:
+ - no longer install (empty) apt.conf.d/01ubuntu
+
+ [ Matthias G. ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - Fix segmentation fault when /var/log/apt ist missing. LP: #535509
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 09 Jun 2010 10:48:16 +0200
+
apt (0.7.25.3ubuntu9) lucid-proposed; urgency=low
* debian/apt.postinst:
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index c0e89b51a..000000000
--- a/debian/copyright
+++ /dev/null
@@ -1,23 +0,0 @@
-Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others.
-Apt is currently developed by APT Development Team <deity@lists.debian.org>.
-
-License: GPLv2+
-
- 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 2 of the License, or
- (at your option) any later version.
-
- 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-See /usr/share/common-licenses/GPL-2, or
-<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
-of the GNU General Public License.
-
diff --git a/debian/rules b/debian/rules
index 6fc2ec9f0..aa3a4145b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -216,8 +216,6 @@ apt: build build-doc debian/shlibs.local
cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
sed 's/^_//' share/apt-auth-failure.note > debian/$@/usr/share/$@/apt-auth-failure.note
cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
- cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu
-# head -n 500 ChangeLog > debian/ChangeLog
# copy lintian override
cp share/lintian-overrides debian/$@/usr/share/lintian/overrides/apt