From b543054859d748eb3e1825e60ae53a7501273cde Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Sun, 5 Nov 2000 16:47:45 +0000 Subject: [PATCH] debian/rules, debian/origin: add new origin file scripts/dpkg-gencontrol.pl: rename Bugs-Submit-To to Bugs debian/control: add Bugs and Origin entries lib/database.c, parse.c: add Origin and Bugs to fieldinfos table include/dpkg-db.h: add Origin and Bugs to pkginfoperfile struct dpkg-deb/main.c, dpkg-deb/dpkg-deb.h: fix type for compression Makefile.in: install origin file --- ChangeLog | 7 ++ Makefile.in | 2 + debian/changelog | 9 ++- debian/control | 2 + debian/dpkg.conffiles | 1 + debian/rules | 9 ++- dpkg-deb/dpkg-deb.h | 2 +- dpkg-deb/main.c | 2 +- include/dpkg-db.h | 2 +- lib/database.c | 4 +- lib/parse.c | 2 + po/dpkg.pot | 148 +++++++++++++++++-------------------- scripts/dpkg-gencontrol.pl | 10 +-- 13 files changed, 105 insertions(+), 95 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c7156d7..ba6bd0d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,13 @@ Sun Nov 5 16:28:26 CET 2000 Wichert Akkerman * debian/dpkg.conffiles: added missing file * debian/rules, main/main.c: rename dpkg configfile to dpkg.cfg + * debian/rules, debian/origin: add new origin file + * scripts/dpkg-gencontrol.pl: rename Bugs-Submit-To to Bugs + * debian/control: add Bugs and Origin entries + * lib/database.c, parse.c: add Origin and Bugs to fieldinfos table + * include/dpkg-db.h: add Origin and Bugs to pkginfoperfile struct + * dpkg-deb/main.c, dpkg-deb/dpkg-deb.h: fix type for compression + * Makefile.in: install origin file Sun Nov 5 10:00:31 EST 2000 Ben Collins diff --git a/Makefile.in b/Makefile.in index 5120232a..95670820 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,6 +14,8 @@ SUBDIRS = include lib optlib intl dpkg-deb split scripts utils main \ all: version.h all-recursive install: all install-recursive + $(mkinstalldirs) $(dpkgconfdir)/origins + $(INSTALL_DATA) $(srcdir)/origin $(dpkgconfdir)/origins/debian clean: clean-recursive rm -f $(GENFILES) diff --git a/debian/changelog b/debian/changelog index 1e2da83f..13168a6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ dpkg (1.7.0) unstable; urgency=low new dpkg-statoverride tool. * Use objdump instead of ldd in dpkg-shlibdeps * Fix logic in dpkg-shlibdeps so it looks for dependencies as specified - in the documentation + in its documentation * Make update-alternatives update slave links with --config and properly switch the alternative to manual mode * HURD updates, Closes: Bug#57753,#57754,#57755 @@ -18,7 +18,8 @@ dpkg (1.7.0) unstable; urgency=low * dpkg-deb: reorder files when building a package * dpkg-statoverride: new tool to override ownership and modes for files * Check COLUMNS environment for dpkg -l output. Closes: Bug#65536 - * Add Origin, Bugs-Submit-To, Bugs-Submit-Style + * Add Origin and Bugs fields to the control file + * Install new /etc/dpkg/origins/debian file * Corrections and updates to Swedish translation. * Add Galician, German, Dutch and Brazilian translations * archtable: add ia64 and sh; revert sparc64 so that it turns into sparc. @@ -26,7 +27,7 @@ dpkg (1.7.0) unstable; urgency=low * dselect/main.cc: small fixups to get it to compile with gcc-2.96 * Clean up fd handling in some places. Closes: Bug#69359,#69360,#69361 * Document -k option for dpkg-buildpackage. Closes: Bug#71808 - * Install dummy shlibs.default and shlibs.override files + * Install commented dummy shlibs.default and shlibs.override files * Give dpkg a configurationfile * dpkg-scanpackages now uses the most recent version if multiple versions of a package are found. @@ -38,7 +39,7 @@ dpkg (1.7.0) unstable; urgency=low * Update formating of start-stop-daemon manpage. Closes: Bug#75110 * Make a missing package a warning instead of an error in dpkg-genchanges - -- Wichert Akkerman Mon, 8 May 2000 16:08:53 +0200 + -- Wichert Akkerman Sun, 5 Nov 2000 17:28:39 +0100 dpkg (1.6.13) frozen unstable; urgency=low diff --git a/debian/control b/debian/control index ba5ee213..7cdbe8d9 100644 --- a/debian/control +++ b/debian/control @@ -2,6 +2,8 @@ Source: dpkg Section: base Priority: required Maintainer: Wichert Akkerman +Origin: debian +Bugs: debbugs://bugs.debian.org Standards-Version: 3.1.0 Build-Depends: debiandoc-sgml, libncurses-dev diff --git a/debian/dpkg.conffiles b/debian/dpkg.conffiles index 8104e415..88d55e65 100644 --- a/debian/dpkg.conffiles +++ b/debian/dpkg.conffiles @@ -1 +1,2 @@ /etc/dpkg/dpkg.cfg +/etc/dpkg/origins/debian diff --git a/debian/rules b/debian/rules index 2768b229..63798ade 100755 --- a/debian/rules +++ b/debian/rules @@ -134,7 +134,8 @@ binary-dpkg: stamp-binary dpkg-shlibdeps -dPre-Depends -Tdebian/dpkg.substvars \ $(TMP_DPKG)/usr/bin/dpkg $(TMP_DPKG)/usr/bin/dselect \ $(TMP_DPKG)/sbin/start-stop-daemon - dpkg-gencontrol -Tdebian/dpkg.substvars -pdpkg -P$(TMP_DPKG) + perl -I `pwd`/scripts scripts/dpkg-gencontrol.pl -isp \ + -Tdebian/dpkg.substvars -pdpkg -P$(TMP_DPKG) dpkg --build $(TMP_DPKG) .. binary-dpkg-dev: stamp-binary @@ -197,7 +198,8 @@ binary-dpkg-dev: stamp-binary install -p -m 755 -o root -g root debian/dpkg-dev.prerm $(TMP_DPKG_DEV)/DEBIAN/prerm install -p -m 755 -o root -g root debian/dpkg-dev.postinst $(TMP_DPKG_DEV)/DEBIAN/postinst - dpkg-gencontrol -Tdebian/dpkg-dev.substvars -pdpkg-dev -P$(TMP_DPKG_DEV) + perl -I `pwd`/scripts scripts/dpkg-gencontrol.pl -isp \ + -Tdebian/dpkg-dev.substvars -pdpkg-dev -P$(TMP_DPKG_DEV) dpkg --build $(TMP_DPKG_DEV) .. binary-dpkg-doc: stamp-binary @@ -224,7 +226,8 @@ binary-dpkg-doc: stamp-binary install -p -m 755 -o root -g root debian/dpkg-doc.prerm $(TMP_DPKG_DOC)/DEBIAN/prerm install -p -m 755 -o root -g root debian/dpkg-doc.postinst $(TMP_DPKG_DOC)/DEBIAN/postinst - dpkg-gencontrol -Tdebian/dpkg-dev.substvars -pdpkg-doc -P$(TMP_DPKG_DOC) + perl -I `pwd`/scripts scripts/dpkg-gencontrol.pl -isp \ + -Tdebian/dpkg-dev.substvars -pdpkg-doc -P$(TMP_DPKG_DOC) dpkg --build $(TMP_DPKG_DOC) .. binary-arch: binary-dpkg diff --git a/dpkg-deb/dpkg-deb.h b/dpkg-deb/dpkg-deb.h index 589d6f47..a130b475 100644 --- a/dpkg-deb/dpkg-deb.h +++ b/dpkg-deb/dpkg-deb.h @@ -33,7 +33,7 @@ extern dofunction *action; void extracthalf(const char *debar, const char *directory, const char *taroption, int admininfo); -extern char *compression; +extern const char *compression; #define DEBMAGIC "!\ndebian-binary " #define ADMINMEMBER "control.tar.gz " diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c index a26aee56..7da26b19 100644 --- a/dpkg-deb/main.c +++ b/dpkg-deb/main.c @@ -82,7 +82,7 @@ const char printforhelp[]= "Type dpkg --help for help about installing and deinstalling packages."); int debugflag=0, nocheckflag=0, oldformatflag=BUILDOLDPKGFORMAT; -char* compression=NULL; +const char* compression=NULL; const struct cmdinfo *cipaction=0; dofunction *action=0; diff --git a/include/dpkg-db.h b/include/dpkg-db.h index 1820a413..66931f6b 100644 --- a/include/dpkg-db.h +++ b/include/dpkg-db.h @@ -97,7 +97,7 @@ struct pkginfoperfile { /* pif */ struct dependency *depends; struct deppossi *depended; int essential; /* The `essential' flag, 1=yes, 0=no (absent) */ - char *description, *maintainer, *source, *architecture, *installedsize; + char *description, *maintainer, *source, *architecture, *installedsize, *origin, *bugs; struct versionrevision version; struct conffile *conffiles; struct arbitraryfield *arbs; diff --git a/lib/database.c b/lib/database.c index 4fc1e6cf..2d7486f5 100644 --- a/lib/database.c +++ b/lib/database.c @@ -129,7 +129,7 @@ void blankpackageperfile(struct pkginfoperfile *pifp) { pifp->essential= 0; pifp->depends= 0; pifp->depended= 0; - pifp->description= pifp->maintainer= pifp->source= pifp->installedsize= 0; + pifp->description= pifp->maintainer= pifp->source= pifp->installedsize= pifp->bugs= pifp->origin= 0; pifp->architecture= 0; blankversion(&pifp->version); pifp->conffiles= 0; @@ -155,6 +155,8 @@ int informative(struct pkginfo *pkg, struct pkginfoperfile *info) { if (info->depends || nes(info->description) || nes(info->maintainer) || + nes(info->origin) || + nes(info->bugs) || nes(info->installedsize) || nes(info->source) || nes(info->architecture) || diff --git a/lib/parse.c b/lib/parse.c index 85a6d957..14b9337b 100644 --- a/lib/parse.c +++ b/lib/parse.c @@ -37,7 +37,9 @@ const struct fieldinfo fieldinfos[]= { { "Priority", f_priority, w_priority }, { "Section", f_section, w_section }, { "Installed-Size", f_charfield, w_charfield, PKGIFPOFF(installedsize) }, + { "Origin", f_charfield, w_charfield, PKGIFPOFF(origin) }, { "Maintainer", f_charfield, w_charfield, PKGIFPOFF(maintainer) }, + { "Bugs", f_charfield, w_charfield, PKGIFPOFF(bugs) }, { "Architecture", f_charfield, w_charfield, PKGIFPOFF(architecture) }, { "Source", f_charfield, w_charfield, PKGIFPOFF(source) }, { "Version", f_version, w_version }, diff --git a/po/dpkg.pot b/po/dpkg.pot index 7d01a9c6..ae9293fd 100644 --- a/po/dpkg.pot +++ b/po/dpkg.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-10-29 02:26+0200\n" +"POT-Creation-Date: 2000-11-05 17:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -56,12 +56,12 @@ msgstr "" msgid "Signal no.%d" msgstr "" -#: lib/database.c:235 +#: lib/database.c:237 #, c-format msgid "size %7d occurs %5d times\n" msgstr "" -#: lib/database.c:236 +#: lib/database.c:238 msgid "failed write during hashreport" msgstr "" @@ -160,7 +160,7 @@ msgstr "" msgid "failed to open `%s' for writing %s information" msgstr "" -#: lib/dump.c:252 lib/parse.c:95 +#: lib/dump.c:252 lib/parse.c:97 msgid "unable to set buffering on status file" msgstr "" @@ -539,84 +539,84 @@ msgstr "" msgid "-%c option does not take a value" msgstr "" -#: lib/parse.c:91 +#: lib/parse.c:93 #, c-format msgid "failed to open package info file `%.255s' for reading" msgstr "" -#: lib/parse.c:122 +#: lib/parse.c:124 #, c-format msgid "EOF after field name `%.50s'" msgstr "" -#: lib/parse.c:125 +#: lib/parse.c:127 #, c-format msgid "newline in field name `%.50s'" msgstr "" -#: lib/parse.c:128 +#: lib/parse.c:130 #, c-format msgid "MSDOS EOF (^Z) in field name `%.50s'" msgstr "" -#: lib/parse.c:131 +#: lib/parse.c:133 #, c-format msgid "field name `%.50s' must be followed by colon" msgstr "" -#: lib/parse.c:139 +#: lib/parse.c:141 #, c-format msgid "EOF before value of field `%.50s' (missing final newline)" msgstr "" -#: lib/parse.c:143 +#: lib/parse.c:145 #, c-format msgid "MSDOS EOF char in value of field `%.50s' (missing newline?)" msgstr "" -#: lib/parse.c:154 +#: lib/parse.c:156 #, c-format msgid "EOF during value of field `%.50s' (missing final newline)" msgstr "" -#: lib/parse.c:171 +#: lib/parse.c:173 #, c-format msgid "duplicate value for `%s' field" msgstr "" -#: lib/parse.c:176 +#: lib/parse.c:178 #, c-format msgid "user-defined field name `%s' too short" msgstr "" -#: lib/parse.c:181 +#: lib/parse.c:183 #, c-format msgid "duplicate value for user-defined field `%.50s'" msgstr "" -#: lib/parse.c:194 +#: lib/parse.c:196 msgid "several package info entries found, only one allowed" msgstr "" -#: lib/parse.c:222 +#: lib/parse.c:224 msgid "Configured-Version for package with inappropriate Status" msgstr "" -#: lib/parse.c:236 +#: lib/parse.c:238 msgid "Package which in state not-installed has conffiles, forgetting them" msgstr "" -#: lib/parse.c:284 +#: lib/parse.c:286 #, c-format msgid "failed to read from `%.255s'" msgstr "" -#: lib/parse.c:286 +#: lib/parse.c:288 #, c-format msgid "failed to close after read: `%.255s'" msgstr "" -#: lib/parse.c:287 +#: lib/parse.c:289 #, c-format msgid "no package information in `%.255s'" msgstr "" @@ -1325,7 +1325,7 @@ msgstr "" msgid "unable to check for existence of `%.250s'" msgstr "" -#: main/depcon.c:132 main/packages.c:449 +#: main/depcon.c:132 main/packages.c:386 msgid " depends on " msgstr "" @@ -1385,17 +1385,17 @@ msgstr "" msgid " %.250s is %s.\n" msgstr "" -#: main/depcon.c:294 +#: main/depcon.c:297 #, c-format msgid " %.250s provides %.250s but is to be removed.\n" msgstr "" -#: main/depcon.c:298 +#: main/depcon.c:301 #, c-format msgid " %.250s provides %.250s but is to be deconfigured.\n" msgstr "" -#: main/depcon.c:303 +#: main/depcon.c:306 #, c-format msgid " %.250s provides %.250s but is %s.\n" msgstr "" @@ -1403,28 +1403,28 @@ msgstr "" #. If the package wasn't installed at all, and we haven't said #. * yet why this isn't satisfied, we should say so now. #. -#: main/depcon.c:317 +#: main/depcon.c:320 #, c-format msgid " %.250s is not installed.\n" msgstr "" -#: main/depcon.c:347 +#: main/depcon.c:351 #, c-format msgid " %.250s (version %.250s) is to be installed.\n" msgstr "" -#: main/depcon.c:361 +#: main/depcon.c:365 #, c-format msgid " %.250s (version %.250s) is %s.\n" msgstr "" #. conflicts and provides the same -#: main/depcon.c:383 +#: main/depcon.c:390 #, c-format msgid " %.250s provides %.250s and is to be installed.\n" msgstr "" -#: main/depcon.c:414 +#: main/depcon.c:421 #, c-format msgid " %.250s provides %.250s and is %s.\n" msgstr "" @@ -1597,85 +1597,85 @@ msgstr "" msgid "dpkg not recorded as installed, cannot check for epoch support !\n" msgstr "" -#: main/enquiry.c:581 +#: main/enquiry.c:576 msgid "--predep-package does not take any argument" msgstr "" -#: main/enquiry.c:632 +#: main/enquiry.c:628 #, c-format msgid "" "dpkg: cannot see how to satisfy pre-dependency:\n" " %s\n" msgstr "" -#: main/enquiry.c:633 +#: main/enquiry.c:629 #, c-format msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)" msgstr "" -#: main/enquiry.c:653 +#: main/enquiry.c:649 #, c-format msgid "" "dpkg: unexpected output from `%s --print-libgcc-file-name':\n" " `%s'\n" msgstr "" -#: main/enquiry.c:656 +#: main/enquiry.c:652 #, c-format msgid "compiler libgcc filename not understood: %.250s" msgstr "" -#: main/enquiry.c:660 +#: main/enquiry.c:656 msgid "--print-installation-architecture does not take any argument" msgstr "" -#: main/enquiry.c:680 +#: main/enquiry.c:676 msgid "--print-architecture does not take any argument" msgstr "" -#: main/enquiry.c:686 +#: main/enquiry.c:682 msgid "failed to fdopen CC pipe" msgstr "" -#: main/enquiry.c:705 +#: main/enquiry.c:701 msgid "error reading from CC pipe" msgstr "" -#: main/enquiry.c:707 +#: main/enquiry.c:703 msgid "empty output" msgstr "" -#: main/enquiry.c:709 +#: main/enquiry.c:705 msgid "no newline" msgstr "" -#: main/enquiry.c:712 +#: main/enquiry.c:708 msgid "no gcc-lib component" msgstr "" -#: main/enquiry.c:714 +#: main/enquiry.c:710 msgid "no slash after gcc-lib" msgstr "" -#: main/enquiry.c:726 +#: main/enquiry.c:722 #, c-format msgid "dpkg: warning, architecture `%s' not in remapping table\n" msgstr "" -#: main/enquiry.c:768 +#: main/enquiry.c:764 msgid "--cmpversions takes three arguments: " msgstr "" -#: main/enquiry.c:773 +#: main/enquiry.c:769 msgid "--cmpversions bad relation" msgstr "" -#: main/enquiry.c:778 +#: main/enquiry.c:774 #, c-format msgid "version a has bad syntax: %s\n" msgstr "" -#: main/enquiry.c:788 +#: main/enquiry.c:784 #, c-format msgid "version b has bad syntax: %s\n" msgstr "" @@ -2055,9 +2055,7 @@ msgid "" " -x|--extract|-X|--vextract|--fsys-tarfile on archives (type %s --help.)\n" "\n" "For internal use: dpkg --assert-support-predepends | --predep-package |\n" -" --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep " -"|\n" -" --assert-versioned-provides\n" +" --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep\n" "\n" "Options:\n" " --admindir= Use instead of %s\n" @@ -2086,7 +2084,7 @@ msgid "" "Use `dselect' for user-friendly package management.\n" msgstr "" -#: main/main.c:119 +#: main/main.c:118 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2100,12 +2098,12 @@ msgid "" "`more' !" msgstr "" -#: dpkg-deb/main.c:135 main/main.c:180 split/main.c:142 +#: dpkg-deb/main.c:135 main/main.c:179 split/main.c:142 #, c-format msgid "conflicting actions --%s and --%s" msgstr "" -#: main/main.c:189 +#: main/main.c:188 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2126,26 +2124,26 @@ msgid "" "Note that the meanings and values are subject to change.\n" msgstr "" -#: main/main.c:208 +#: main/main.c:207 msgid "--debug requires an octal argument" msgstr "" -#: main/main.c:232 +#: main/main.c:231 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" -#: main/main.c:238 +#: main/main.c:237 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" -#: main/main.c:254 +#: main/main.c:253 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "" -#: main/main.c:264 +#: main/main.c:263 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2183,16 +2181,16 @@ msgid "" "Forcing options marked [*] are enabled by default.\n" msgstr "" -#: main/main.c:303 +#: main/main.c:302 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "" -#: main/main.c:383 +#: main/main.c:381 msgid "failed to exec dpkg-deb" msgstr "" -#: dpkg-deb/main.c:155 main/main.c:420 split/main.c:163 +#: dpkg-deb/main.c:155 main/main.c:418 split/main.c:163 msgid "need an action option" msgstr "" @@ -2219,51 +2217,43 @@ msgid "" " in this run ! Only configuring it once.\n" msgstr "" -#: main/packages.c:265 main/packages.c:333 main/packages.c:346 +#: main/packages.c:264 main/packages.c:308 main/packages.c:321 msgid " Package " msgstr "" -#: main/packages.c:268 main/packages.c:336 main/packages.c:349 +#: main/packages.c:267 main/packages.c:311 main/packages.c:324 msgid " which provides " msgstr "" -#: main/packages.c:271 +#: main/packages.c:270 msgid " is to be removed.\n" msgstr "" -#: main/packages.c:286 main/packages.c:303 +#: main/packages.c:282 msgid " Version of " msgstr "" -#: main/packages.c:288 +#: main/packages.c:284 msgid " on system is " msgstr "" -#: main/packages.c:305 -msgid " on system, provided by " -msgstr "" - -#: main/packages.c:307 -msgid ", is " -msgstr "" - -#: main/packages.c:329 +#: main/packages.c:304 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "" -#: main/packages.c:339 +#: main/packages.c:314 msgid " is not configured yet.\n" msgstr "" -#: main/packages.c:352 +#: main/packages.c:327 msgid " is not installed.\n" msgstr "" #. Don't print the line about the package to be removed if #. * that's the only line. #. -#: main/packages.c:455 +#: main/packages.c:392 msgid "; however:\n" msgstr "" diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl index adf151c8..0d2f1b67 100755 --- a/scripts/dpkg-gencontrol.pl +++ b/scripts/dpkg-gencontrol.pl @@ -45,11 +45,11 @@ Options: -p print control file for package } $i=100;grep($fieldimps{$_}=$i--, - qw(Package Version Origin Section Priority Architecture Essential + qw(Package Version Section Priority Architecture Essential Pre-Depends Depends Recommends Suggests Enhances Optional - Conflicts Replaces Provides Installed-Size Maintainer Source - Description Build-Depends Build-Depends-Indep Build-Conflicts - Build-Conflicts-Indep Source Bugs-Submit-To )); + Conflicts Replaces Provides Installed-Size Origin Maintainer + Bugs Source Description Build-Depends Build-Depends-Indep + Build-Conflicts Build-Conflicts-Indep )); while (@ARGV) { $_=shift(@ARGV); @@ -111,7 +111,7 @@ for $_ (keys %fi) { $v= $fi{$_}; if (s/^C //) { #print STDERR "G key >$_< value >$v<\n"; - if (m/^Origin|Bugs-Submit-To|Maintainer$/) { $f{$_}=$v; } + if (m/^Origin|Bugs|Maintainer$/) { $f{$_}=$v; } elsif (m/^Source$/) { &setsourcepackage; } elsif (s/^X[CS]*B[CS]*-//i) { $f{$_}= $v; } elsif (m/^X[CS]+-|^Standards-Version$|^Build-(Depends|Conflicts)(-Indep)?$/i) { } -- 2.39.5