summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/apt-utils.install2
-rw-r--r--debian/apt.install1
-rw-r--r--debian/changelog11
-rw-r--r--debian/control18
-rw-r--r--debian/libapt-inst1.2.install1
-rw-r--r--debian/libapt-inst1.2.symbols (renamed from debian/apt-utils.symbols)1
-rw-r--r--debian/libapt-pkg4.10.install1
-rw-r--r--debian/libapt-pkg4.10.symbols (renamed from debian/apt.symbols)1
-rwxr-xr-xdebian/rules61
9 files changed, 77 insertions, 20 deletions
diff --git a/debian/apt-utils.install b/debian/apt-utils.install
index d947f26d4..8b1378917 100644
--- a/debian/apt-utils.install
+++ b/debian/apt-utils.install
@@ -1 +1 @@
-bin/libapt-inst*.so.* usr/lib/
+
diff --git a/debian/apt.install b/debian/apt.install
index 979e04ce2..ba57f7efa 100644
--- a/debian/apt.install
+++ b/debian/apt.install
@@ -1,5 +1,4 @@
bin/apt-* usr/bin/
-bin/libapt-pkg*.so.* usr/lib/
bin/methods/* usr/lib/apt/methods/
scripts/dselect/* usr/lib/dpkg/methods/apt/
locale usr/share/
diff --git a/debian/changelog b/debian/changelog
index bb072a15b..0b81acb01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.8.15) UNRELEASED; urgency=low
+apt (0.8.15~exp1) UNRELEASED; urgency=low
[ Julian Andres Klode ]
* apt-pkg/depcache.cc:
@@ -75,6 +75,15 @@ apt (0.8.15) UNRELEASED; urgency=low
- ensure for Multi-Arch:same packages that they are unpacked in
lock step even in immediate configuration (Closes: #618288)
+ [ Michael Vogt ]
+ * methods/mirror.cc:
+ - ignore lines starting with "#" in the mirror file
+ - ignore non http urls in the mirrors
+ - append the dist (e.g. sid, wheezy) as a query string when
+ asking for a suitable mirror
+ * debian/control:
+ - add libapt-pkg4.10 and libapt-inst1.2 library packages
+
-- Michael Vogt <mvo@debian.org> Mon, 16 May 2011 14:57:52 +0200
apt (0.8.14.1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6d0f16b70..9aefcde8d 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Architecture: any
Pre-Depends: ${shlibs:Depends}
Depends: debian-archive-keyring, ${misc:Depends}, gnupg
Replaces: manpages-pl (<< 20060617-3~)
-Provides: ${libapt-pkg:provides}
Conflicts: python-apt (<< 0.7.93.2~)
Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
Description: Advanced front-end for dpkg
@@ -27,6 +26,20 @@ Description: Advanced front-end for dpkg
APT features complete installation ordering, multiple source capability
and several other unique features, see the Users Guide in apt-doc.
+Package: libapt-pkg4.10
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: apt (<< 0.8.15)
+Description: Library for apt
+ This package contains the library used by apt.
+
+Package: libapt-inst1.2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: apt-utils (<< 0.8.15)
+Description: Install library for apt
+ This package contains the inst library used by apt.
+
Package: apt-doc
Architecture: all
Priority: optional
@@ -39,7 +52,7 @@ Description: Documentation for APT
Package: libapt-pkg-dev
Architecture: any
Priority: optional
-Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends}, zlib1g-dev | zlib-dev
+Depends: libapt-pkg4.10 (= ${binary:Version}), libapt-inst1.2 (= ${binary:Version}), ${misc:Depends}, zlib1g-dev | zlib-dev
Section: libdevel
Description: Development files for APT's libapt-pkg and libapt-inst
This package contains the header files and libraries for
@@ -61,7 +74,6 @@ Description: Documentation for APT development
Package: apt-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: ${libapt-inst:provides}
Description: APT utility programs
This package contains some APT utility programs such as apt-ftparchive,
apt-sortpkgs and apt-extracttemplates.
diff --git a/debian/libapt-inst1.2.install b/debian/libapt-inst1.2.install
new file mode 100644
index 000000000..575199b53
--- /dev/null
+++ b/debian/libapt-inst1.2.install
@@ -0,0 +1 @@
+bin/libapt-inst*.so.* usr/lib/ \ No newline at end of file
diff --git a/debian/apt-utils.symbols b/debian/libapt-inst1.2.symbols
index 9ba283a51..73e6c8928 100644
--- a/debian/apt-utils.symbols
+++ b/debian/libapt-inst1.2.symbols
@@ -1,5 +1,4 @@
libapt-inst.so.1.2 libapt-inst1.2
-| apt-utils #MINVER#
* Build-Depends-Package: libapt-pkg-dev
(c++)"ExtractTar::Done(bool)@Base" 0.8.0
(c++)"ExtractTar::Go(pkgDirStream&)@Base" 0.8.0
diff --git a/debian/libapt-pkg4.10.install b/debian/libapt-pkg4.10.install
new file mode 100644
index 000000000..571dc8478
--- /dev/null
+++ b/debian/libapt-pkg4.10.install
@@ -0,0 +1 @@
+bin/libapt-pkg*.so.* usr/lib/ \ No newline at end of file
diff --git a/debian/apt.symbols b/debian/libapt-pkg4.10.symbols
index bb60c22be..039535cf9 100644
--- a/debian/apt.symbols
+++ b/debian/libapt-pkg4.10.symbols
@@ -1,5 +1,4 @@
libapt-pkg.so.4.10 libapt-pkg4.10
-| apt #MINVER#
* Build-Depends-Package: libapt-pkg-dev
TFRewritePackageOrder@Base 0.8.0
TFRewriteSourceOrder@Base 0.8.0
diff --git a/debian/rules b/debian/rules
index 0544b2b8e..fd894b73b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,9 +70,9 @@ APT_UTILS=ftparchive sortpkgs extracttemplates
# Find the libapt-pkg major version for use in other control files
include buildlib/libversion.mak
-# Determine which package we should provide in the control files
-LIBAPTPKG_PROVIDE=libapt-pkg$(LIBAPTPKG_MAJOR)
-LIBAPTINST_PROVIDE=libapt-inst$(LIBAPTINST_MAJOR)
+# Determine which library package names to use
+LIBAPT_PKG=libapt-pkg$(LIBAPTPKG_MAJOR)
+LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR)
# do not fail as we are just experimenting with symbol files for now
export DPKG_GENSYMBOLS_CHECK_LEVEL=0
@@ -137,7 +137,7 @@ libapt-pkg-doc: build-doc
dh_compress -p$@
dh_fixperms -p$@
dh_installdeb -p$@
- dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE)
+ dh_gencontrol -p$@
dh_md5sums -p$@
dh_builddeb -p$@
@@ -165,7 +165,7 @@ apt-doc: build-doc
# Build architecture-dependent files here.
-binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https
+binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https
apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list
apt: build build-doc
dh_testdir -p$@
@@ -205,10 +205,9 @@ apt: build build-doc
dh_strip -p$@
dh_compress -p$@
dh_fixperms -p$@
- dh_makeshlibs -p$@
dh_installdeb -p$@
- dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
- dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE)
+ dh_shlibdeps -p$@
+ dh_gencontrol -p$@
dh_md5sums -p$@
dh_builddeb -p$@
@@ -227,7 +226,7 @@ libapt-pkg-dev: build
dh_compress -p$@
dh_fixperms -p$@
dh_installdeb -p$@
- dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
+ dh_gencontrol -p$@
dh_md5sums -p$@
dh_builddeb -p$@
@@ -253,8 +252,46 @@ apt-utils: build
dh_fixperms -p$@
dh_makeshlibs -p$@
dh_installdeb -p$@
- dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
- dh_gencontrol -p$@ -- -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
+ dh_shlibdeps -p$@
+ dh_gencontrol -p$@
+ dh_md5sums -p$@
+ dh_builddeb -p$@
+
+$(LIBAPT_PKG): build
+ dh_testdir -p$@
+ dh_testroot -p$@
+ dh_prep -p$@
+ dh_installdirs -p$@
+
+ dh_install -p$@ --sourcedir=$(BLD)
+ dh_installdocs -p$@
+ dh_installchangelogs -p$@
+ dh_strip -p$@
+ dh_compress -p$@
+ dh_fixperms -p$@
+ dh_makeshlibs -p$@
+ dh_installdeb -p$@
+ dh_shlibdeps -p$@
+ dh_gencontrol -p$@
+ dh_md5sums -p$@
+ dh_builddeb -p$@
+
+$(LIBAPT_INST): build
+ dh_testdir -p$@
+ dh_testroot -p$@
+ dh_prep -p$@
+ dh_installdirs -p$@
+
+ dh_install -p$@ --sourcedir=$(BLD)
+ dh_installdocs -p$@
+ dh_installchangelogs -p$@
+ dh_strip -p$@
+ dh_compress -p$@
+ dh_fixperms -p$@
+ dh_makeshlibs -p$@
+ dh_installdeb -p$@
+ dh_shlibdeps -p$@
+ dh_gencontrol -p$@
dh_md5sums -p$@
dh_builddeb -p$@
@@ -276,7 +313,7 @@ apt-transport-https: build libapt-pkg-dev
dh_compress -p$@
dh_fixperms -p$@
dh_installdeb -p$@
- dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
+ dh_shlibdeps -p$@
dh_gencontrol -p$@
dh_md5sums -p$@
dh_builddeb -p$@